vmassol 2003/11/23 09:03:59
Modified:
integration/ant/src/java/org/apache/cactus/integration/ant/container/tomcat
AbstractCatalinaContainer.java
documentation/docs/xdocs changes.xml
Log:
Custom tomcat config files specified through the use of <conf> in the Ant
integration should now correctly override the default cactus-provided conf files.
Revision Changes Path
1.6 +12 -7
jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/tomcat/AbstractCatalinaContainer.java
Index: AbstractCatalinaContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/tomcat/AbstractCatalinaContainer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractCatalinaContainer.java 7 Sep 2003 19:54:37 -0000 1.5
+++ AbstractCatalinaContainer.java 23 Nov 2003 17:03:59 -0000 1.6
@@ -79,7 +79,6 @@
*/
public abstract class AbstractCatalinaContainer extends AbstractTomcatContainer
{
-
// Instance Variables ------------------------------------------------------
/**
@@ -236,23 +235,29 @@
this.tmpDir = createTempDirectory(theDirName);
}
- // copy configuration files into the temporary container directory
File confDir = createDirectory(tmpDir, "conf");
- copyConfFiles(confDir);
+
+ // Copy first the default configuration files so that they can be
+ // overriden by the user-provided ones.
+
if (getServerXml() == null)
{
ResourceUtils.copyResource(getProject(),
RESOURCE_PATH + theResourcePrefix + "/server.xml",
new File(confDir, "server.xml"), filterChain);
}
- // TODO: only copy these files if they haven't been provided by the
- // user as a conf fileset
+
ResourceUtils.copyResource(getProject(),
RESOURCE_PATH + theResourcePrefix + "/tomcat-users.xml",
new File(confDir, "tomcat-users.xml"));
fileUtils.copyFile(new File(getDir(), "conf/web.xml"),
new File(confDir, "web.xml"));
-
+
+ // Copy user-provided configuration files into the temporary container
+ // directory
+
+ copyConfFiles(confDir);
+
// deploy the web-app by copying the WAR file into the webapps
// directory
File webappsDir = createDirectory(tmpDir, "webapps");
1.144 +6 -0 jakarta-cactus/documentation/docs/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/changes.xml,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- changes.xml 1 Nov 2003 16:21:54 -0000 1.143
+++ changes.xml 23 Nov 2003 17:03:59 -0000 1.144
@@ -68,6 +68,12 @@
</devs>
<release version="1.6dev" date="in CVS">
+ <action dev="VMA" type="fix">
+ In the Cactus/Ant integration, user-defined <code>tomcat-users</code>
+ and <code>web.xml</code> are now correctly replacing the default
+ version provided by Cactus. This is for the Tomcat 4.x and 5.x
+ containers.
+ </action>
<action dev="VMA" type="add">
Added the Maven plugin. It was formerly hosted in the Maven project's
own CVS. It is now in the Cactus CVS and is part of the Cactus
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
