vmassol 2003/11/23 09:17:16
Modified:
integration/ant/src/java/org/apache/cactus/integration/ant/container/tomcat
Tag: CACTUS_15_BRANCH
AbstractCatalinaContainer.java
AbstractTomcatContainer.java
documentation/docs/xdocs Tag: CACTUS_15_BRANCH 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
No revision
No revision
1.4.2.3 +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.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- AbstractCatalinaContainer.java 23 Oct 2003 18:20:44 -0000 1.4.2.2
+++ AbstractCatalinaContainer.java 23 Nov 2003 17:17:16 -0000 1.4.2.3
@@ -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.3.2.3 +6 -3
jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/tomcat/AbstractTomcatContainer.java
Index: AbstractTomcatContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/tomcat/AbstractTomcatContainer.java,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- AbstractTomcatContainer.java 23 Oct 2003 18:20:44 -0000 1.3.2.2
+++ AbstractTomcatContainer.java 23 Nov 2003 17:17:16 -0000 1.3.2.3
@@ -111,8 +111,11 @@
*/
public final void addConf(FileSet theConf)
{
- theConf.createExclude().setName("**/server.xml");
- this.confFileSets.add(theConf);
+ // Exclude the server.xml file as there is a "serverXml" specific
+ // property for it.
+ theConf.createExclude().setName("**/server.xml");
+
+ this.confFileSets.add(theConf);
}
/**
No revision
No revision
1.120.2.11 +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.120.2.10
retrieving revision 1.120.2.11
diff -u -r1.120.2.10 -r1.120.2.11
--- changes.xml 28 Oct 2003 06:59:24 -0000 1.120.2.10
+++ changes.xml 23 Nov 2003 17:17:16 -0000 1.120.2.11
@@ -68,6 +68,12 @@
</devs>
<release version="1.5-rc2" 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="fix" fixes-bug="24072" due-to="James Stangler"
due-to-email="[EMAIL PROTECTED]">
The Jetty Test Setup was not shutting Jetty down if an error ocurred
during setUp.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
