You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2004/01/15 19:15:19 UTC
cvs commit: jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/tomcat AbstractTomcatContainer.java AbstractCatalinaContainer.java
vmassol 2004/01/15 10:15:19
Modified: documentation/docs/xdocs/integration/ant task_cactus.xml
documentation/docs/xdocs sitemap.xml changes.xml
integration/ant/src/java/org/apache/cactus/integration/ant/container/tomcat
AbstractTomcatContainer.java
AbstractCatalinaContainer.java
Log:
<action dev="VMA" type="add">
In the Ant integration, added new <code>contextxml</code> attributes
to the <code><tomcat4x></code> and <code><tomcat5x></code>
nested elements of the <code><cactus></code> task. This is to
support the new context xml configuration file that appeared with
Tomcat 4.1.x.
</action>
Revision Changes Path
1.16 +17 -0 jakarta-cactus/documentation/docs/xdocs/integration/ant/task_cactus.xml
Index: task_cactus.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/integration/ant/task_cactus.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- task_cactus.xml 30 Dec 2003 09:03:52 -0000 1.15
+++ task_cactus.xml 15 Jan 2004 18:15:19 -0000 1.16
@@ -814,6 +814,15 @@
<td>No</td>
</tr>
<tr>
+ <td>contextxml</td>
+ <td>
+ An optional <a href="ext:tomcat4_context_xml">context xml</a>
+ file to use. This feature is only supported by Tomcat versions
+ 4.1.x and above.
+ </td>
+ <td>No</td>
+ </tr>
+ <tr>
<td>port</td>
<td>
The TCP port that the container should listen to
@@ -924,6 +933,14 @@
<td>serverxml</td>
<td>
The server configuration file to use instead of the default one
+ </td>
+ <td>No</td>
+ </tr>
+ <tr>
+ <td>contextxml</td>
+ <td>
+ An optional <a href="ext:tomcat5_context_xml">context xml</a>
+ file to use.
</td>
<td>No</td>
</tr>
1.65 +2 -0 jakarta-cactus/documentation/docs/xdocs/sitemap.xml
Index: sitemap.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/sitemap.xml,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sitemap.xml 13 Nov 2003 10:54:56 -0000 1.64
+++ sitemap.xml 15 Jan 2004 18:15:19 -0000 1.65
@@ -466,6 +466,8 @@
<external id="sun_j2ee_downloads" url="http://java.sun.com/j2ee/download.html"/>
<external id="sun_servlet_downloads" url="http://java.sun.com/products/servlet/download.html"/>
<external id="taglibs_standard" url="http://jakarta.apache.org/taglibs/doc/standard-doc/intro.html"/>
+ <external id="tomcat4_context_xml" url="http://jakarta.apache.org/tomcat/tomcat-4.1-doc/config/context.html"/>
+ <external id="tomcat5_context_xml" url="http://jakarta.apache.org/tomcat/tomcat-5.0-doc/config/context.html"/>
<external id="velocity" url="http://jakarta.apache.org/velocity/"/>
<external id="xalanj" url="http://xml.apache.org/xalan-j/"/>
1.151 +7 -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.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- changes.xml 10 Jan 2004 20:57:16 -0000 1.150
+++ changes.xml 15 Jan 2004 18:15:19 -0000 1.151
@@ -68,6 +68,13 @@
</devs>
<release version="1.6dev" date="in CVS">
+ <action dev="VMA" type="add">
+ In the Ant integration, added new <code>contextxml</code> attributes
+ to the <code><tomcat4x></code> and <code><tomcat5x></code>
+ nested elements of the <code><cactus></code> task. This is to
+ support the new context xml configuration file that appeared with
+ Tomcat 4.1.x.
+ </action>
<action dev="VMA" type="fix" fixes-bug="25859" due-to="Brian Topping" due-to-email="topping@digidemic.com">
In the Ant integration, added support for web contexts defined in
JBoss's <code>jboss-web.xml</code>.
1.6 +4 -7 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractTomcatContainer.java 23 Nov 2003 17:16:41 -0000 1.5
+++ AbstractTomcatContainer.java 15 Jan 2004 18:15:19 -0000 1.6
@@ -3,7 +3,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2003-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -139,10 +139,7 @@
}
/**
- * Sets the server configuration file to use for the test installation of
- * Tomcat.
- *
- * @return The server.xml file, if set
+ * @return The server.xml file, if set or null otherwise
*/
public final File getServerXml()
{
@@ -203,7 +200,7 @@
/**
* Copies the configuration files specified by nested <conf> filesets
- * to the conf directory.
+ * to the conf/ directory.
*
* @param theConfDir The Tomcat configuration directory
*/
1.8 +39 -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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractCatalinaContainer.java 7 Dec 2003 09:46:54 -0000 1.7
+++ AbstractCatalinaContainer.java 15 Jan 2004 18:15:19 -0000 1.8
@@ -3,7 +3,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2003-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -91,6 +91,11 @@
*/
private String version;
+ /**
+ * A user-specific context xml configuration file.
+ */
+ private File contextXml;
+
// Public Methods ----------------------------------------------------------
/**
@@ -103,6 +108,25 @@
this.tmpDir = theTmpDir;
}
+ /**
+ * @return The context xml file, if set or null otherwise
+ */
+ public final File getContextXml()
+ {
+ return this.contextXml;
+ }
+
+ /**
+ * Sets a user-custom context xml configuration file to use for the test
+ * installation of Tomcat.
+ *
+ * @param theContextXml the custom context xml file to use
+ */
+ public final void setContextXml(File theContextXml)
+ {
+ this.contextXml = theContextXml;
+ }
+
// AbstractContainer Implementation ----------------------------------------
/**
@@ -243,18 +267,26 @@
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");
fileUtils.copyFile(getDeployableFile().getFile(),
new File(webappsDir, getDeployableFile().getFile().getName()),
null, true);
+
+ // Copy user-provided configuration files into the temporary conf/
+ // container directory.
+ copyConfFiles(confDir);
+
+ // Copy user-provided context xml file into the temporary webapp/
+ // container directory
+ if (getContextXml() != null)
+ {
+ fileUtils.copyFile(getContextXml(),
+ new File(webappsDir, getContextXml().getName()));
+ }
+
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org
RE: cvs commit: jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/tomcat AbstractTomcatContainer.java AbstractCatalinaContainer.java
Posted by Vincent Massol <vm...@pivolis.com>.
Arg! You're right, I should have read
http://jakarta.apache.org/tomcat/tomcat-5.0-doc/config/context.html...
Ok, we already support a nested <conf> element so that should be fine
for Tomcat 5.x. So I just need to make the contextxml attribute
available for Tomcat 4.x. Will do this now.
Thanks
-Vincent
> -----Original Message-----
> From: Christopher Lenz [mailto:cmlenz@gmx.de]
> Sent: 16 January 2004 09:17
> To: Cactus Developers List
> Subject: Re: cvs commit: jakarta-
>
cactus/integration/ant/src/java/org/apache/cactus/integration/ant/contai
ne
> r/tomcat AbstractTomcatContainer.java AbstractCatalinaContainer.java
>
> Hi Vincent,
>
> I believe the support for context XML files in the webapps directory
> has been removed from Tomcat 5, although I'm not sure. In Tomcat 5 the
> context definition can go in META-INF/context.xml of the
> web-application or in a Host/Engine directory hierarchy inside of the
> Tomcat conf directory. Yeah, sounds like fun :-P
>
> Cheers,
> Chris
> --
> /=/ cmlenz at gmx.de
>
> Am 15.01.2004 um 19:15 schrieb vmassol@apache.org:
> > vmassol 2004/01/15 10:15:19
> >
> > Modified: documentation/docs/xdocs/integration/ant
task_cactus.xml
> > documentation/docs/xdocs sitemap.xml changes.xml
> >
> >
integration/ant/src/java/org/apache/cactus/integration/ant/container/
> > tomcat
> > AbstractTomcatContainer.java
> > AbstractCatalinaContainer.java
> > Log:
> > <action dev="VMA" type="add">
> >
> > In the Ant integration, added new
<code>contextxml</code>
> > attributes
> >
> > to the <code><tomcat4x></code> and
> > <code><tomcat5x></code>
> >
> > nested elements of the <code><cactus></code> task.
> > This is to
> >
> > support the new context xml configuration file that
> > appeared with
> >
> > Tomcat 4.1.x.
> >
> > </action>
> >
> > Revision Changes Path
> > 1.16 +17 -0
> > jakarta-cactus/documentation/docs/xdocs/integration/ant/
> > task_cactus.xml
> >
> > Index: task_cactus.xml
> >
===================================================================
> > RCS file:
> > /home/cvs/jakarta-cactus/documentation/docs/xdocs/integration/ant/
> > task_cactus.xml,v
> > retrieving revision 1.15
> > retrieving revision 1.16
> > diff -u -r1.15 -r1.16
> > --- task_cactus.xml 30 Dec 2003 09:03:52 -0000 1.15
> > +++ task_cactus.xml 15 Jan 2004 18:15:19 -0000 1.16
> > @@ -814,6 +814,15 @@
> > <td>No</td>
> > </tr>
> > <tr>
> > + <td>contextxml</td>
> > + <td>
> > + An optional <a
> > href="ext:tomcat4_context_xml">context xml</a>
> > + file to use. This feature is only supported by
> > Tomcat versions
> > + 4.1.x and above.
> > + </td>
> > + <td>No</td>
> > + </tr>
> > + <tr>
> > <td>port</td>
> > <td>
> > The TCP port that the container should listen to
> > @@ -924,6 +933,14 @@
> > <td>serverxml</td>
> > <td>
> > The server configuration file to use instead of
the
> > default one
> > + </td>
> > + <td>No</td>
> > + </tr>
> > + <tr>
> > + <td>contextxml</td>
> > + <td>
> > + An optional <a
> > href="ext:tomcat5_context_xml">context xml</a>
> > + file to use.
> > </td>
> > <td>No</td>
> > </tr>
> >
> >
> >
> > 1.65 +2 -0
> > jakarta-cactus/documentation/docs/xdocs/sitemap.xml
> >
> > Index: sitemap.xml
> >
===================================================================
> > RCS file:
> > /home/cvs/jakarta-cactus/documentation/docs/xdocs/sitemap.xml,v
> > retrieving revision 1.64
> > retrieving revision 1.65
> > diff -u -r1.64 -r1.65
> > --- sitemap.xml 13 Nov 2003 10:54:56 -0000 1.64
> > +++ sitemap.xml 15 Jan 2004 18:15:19 -0000 1.65
> > @@ -466,6 +466,8 @@
> > <external id="sun_j2ee_downloads"
> > url="http://java.sun.com/j2ee/download.html"/>
> > <external id="sun_servlet_downloads"
> > url="http://java.sun.com/products/servlet/download.html"/>
> > <external id="taglibs_standard"
> >
url="http://jakarta.apache.org/taglibs/doc/standard-doc/intro.html"/>
> > + <external id="tomcat4_context_xml"
> > url="http://jakarta.apache.org/tomcat/tomcat-4.1-doc/config/
> > context.html"/>
> > + <external id="tomcat5_context_xml"
> > url="http://jakarta.apache.org/tomcat/tomcat-5.0-doc/config/
> > context.html"/>
> > <external id="velocity"
> > url="http://jakarta.apache.org/velocity/"/>
> > <external id="xalanj" url="http://xml.apache.org/xalan-j/"/>
> >
> >
> >
> >
> > 1.151 +7 -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.150
> > retrieving revision 1.151
> > diff -u -r1.150 -r1.151
> > --- changes.xml 10 Jan 2004 20:57:16 -0000 1.150
> > +++ changes.xml 15 Jan 2004 18:15:19 -0000 1.151
> > @@ -68,6 +68,13 @@
> > </devs>
> >
> > <release version="1.6dev" date="in CVS">
> > + <action dev="VMA" type="add">
> > + In the Ant integration, added new
<code>contextxml</code>
> > attributes
> > + to the <code><tomcat4x></code> and
> > <code><tomcat5x></code>
> > + nested elements of the <code><cactus></code>
task.
> > This is to
> > + support the new context xml configuration file that
> > appeared with
> > + Tomcat 4.1.x.
> > + </action>
> > <action dev="VMA" type="fix" fixes-bug="25859"
> > due-to="Brian Topping" due-to-email="topping@digidemic.com">
> > In the Ant integration, added support for web contexts
> > defined in
> > JBoss's <code>jboss-web.xml</code>.
> >
> >
> >
> > 1.6 +4 -7
> >
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.5
> > retrieving revision 1.6
> > diff -u -r1.5 -r1.6
> > --- AbstractTomcatContainer.java 23 Nov 2003 17:16:41 -0000
> 1.5
> > +++ AbstractTomcatContainer.java 15 Jan 2004 18:15:19 -0000
> 1.6
> > @@ -3,7 +3,7 @@
> > *
> > * The Apache Software License, Version 1.1
> > *
> > - * Copyright (c) 2003 The Apache Software Foundation. All rights
> > + * Copyright (c) 2003-2004 The Apache Software Foundation. All
> > rights
> > * reserved.
> > *
> > * Redistribution and use in source and binary forms, with or
> > without
> > @@ -139,10 +139,7 @@
> > }
> >
> > /**
> > - * Sets the server configuration file to use for the test
> > installation of
> > - * Tomcat.
> > - *
> > - * @return The server.xml file, if set
> > + * @return The server.xml file, if set or null otherwise
> > */
> > public final File getServerXml()
> > {
> > @@ -203,7 +200,7 @@
> >
> > /**
> > * Copies the configuration files specified by nested
> > <conf> filesets
> > - * to the conf directory.
> > + * to the conf/ directory.
> > *
> > * @param theConfDir The Tomcat configuration directory
> > */
> >
> >
> >
> > 1.8 +39 -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.7
> > retrieving revision 1.8
> > diff -u -r1.7 -r1.8
> > --- AbstractCatalinaContainer.java 7 Dec 2003 09:46:54
-0000
> 1.7
> > +++ AbstractCatalinaContainer.java 15 Jan 2004 18:15:19
-0000
> 1.8
> > @@ -3,7 +3,7 @@
> > *
> > * The Apache Software License, Version 1.1
> > *
> > - * Copyright (c) 2003 The Apache Software Foundation. All rights
> > + * Copyright (c) 2003-2004 The Apache Software Foundation. All
> > rights
> > * reserved.
> > *
> > * Redistribution and use in source and binary forms, with or
> > without
> > @@ -91,6 +91,11 @@
> > */
> > private String version;
> >
> > + /**
> > + * A user-specific context xml configuration file.
> > + */
> > + private File contextXml;
> > +
> > // Public Methods
> > ----------------------------------------------------------
> >
> > /**
> > @@ -103,6 +108,25 @@
> > this.tmpDir = theTmpDir;
> > }
> >
> > + /**
> > + * @return The context xml file, if set or null otherwise
> > + */
> > + public final File getContextXml()
> > + {
> > + return this.contextXml;
> > + }
> > +
> > + /**
> > + * Sets a user-custom context xml configuration file to use
for
> > the test
> > + * installation of Tomcat.
> > + *
> > + * @param theContextXml the custom context xml file to use
> > + */
> > + public final void setContextXml(File theContextXml)
> > + {
> > + this.contextXml = theContextXml;
> > + }
> > +
> > // AbstractContainer Implementation
> > ----------------------------------------
> >
> > /**
> > @@ -243,18 +267,26 @@
> > 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");
> > fileUtils.copyFile(getDeployableFile().getFile(),
> > new File(webappsDir,
> > getDeployableFile().getFile().getName()),
> > null, true);
> > +
> > + // Copy user-provided configuration files into the
> > temporary conf/
> > + // container directory.
> > + copyConfFiles(confDir);
> > +
> > + // Copy user-provided context xml file into the temporary
> > webapp/
> > + // container directory
> > + if (getContextXml() != null)
> > + {
> > + fileUtils.copyFile(getContextXml(),
> > + new File(webappsDir, getContextXml().getName()));
> > + }
> > +
> > }
> >
> > }
> >
> >
> >
> >
> >
---------------------------------------------------------------------
> > To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
> > For additional commands, e-mail: cactus-dev-help@jakarta.apache.org
> >
> >
> --
> Christopher Lenz
> /=/ cmlenz at gmx.de
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: cactus-dev-help@jakarta.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org
Re: cvs commit: jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/tomcat AbstractTomcatContainer.java AbstractCatalinaContainer.java
Posted by Christopher Lenz <cm...@gmx.de>.
Hi Vincent,
I believe the support for context XML files in the webapps directory
has been removed from Tomcat 5, although I'm not sure. In Tomcat 5 the
context definition can go in META-INF/context.xml of the
web-application or in a Host/Engine directory hierarchy inside of the
Tomcat conf directory. Yeah, sounds like fun :-P
Cheers,
Chris
--
/=/ cmlenz at gmx.de
Am 15.01.2004 um 19:15 schrieb vmassol@apache.org:
> vmassol 2004/01/15 10:15:19
>
> Modified: documentation/docs/xdocs/integration/ant task_cactus.xml
> documentation/docs/xdocs sitemap.xml changes.xml
>
> integration/ant/src/java/org/apache/cactus/integration/ant/container/
> tomcat
> AbstractTomcatContainer.java
> AbstractCatalinaContainer.java
> Log:
> <action dev="VMA" type="add">
>
> In the Ant integration, added new <code>contextxml</code>
> attributes
>
> to the <code><tomcat4x></code> and
> <code><tomcat5x></code>
>
> nested elements of the <code><cactus></code> task.
> This is to
>
> support the new context xml configuration file that
> appeared with
>
> Tomcat 4.1.x.
>
> </action>
>
> Revision Changes Path
> 1.16 +17 -0
> jakarta-cactus/documentation/docs/xdocs/integration/ant/
> task_cactus.xml
>
> Index: task_cactus.xml
> ===================================================================
> RCS file:
> /home/cvs/jakarta-cactus/documentation/docs/xdocs/integration/ant/
> task_cactus.xml,v
> retrieving revision 1.15
> retrieving revision 1.16
> diff -u -r1.15 -r1.16
> --- task_cactus.xml 30 Dec 2003 09:03:52 -0000 1.15
> +++ task_cactus.xml 15 Jan 2004 18:15:19 -0000 1.16
> @@ -814,6 +814,15 @@
> <td>No</td>
> </tr>
> <tr>
> + <td>contextxml</td>
> + <td>
> + An optional <a
> href="ext:tomcat4_context_xml">context xml</a>
> + file to use. This feature is only supported by
> Tomcat versions
> + 4.1.x and above.
> + </td>
> + <td>No</td>
> + </tr>
> + <tr>
> <td>port</td>
> <td>
> The TCP port that the container should listen to
> @@ -924,6 +933,14 @@
> <td>serverxml</td>
> <td>
> The server configuration file to use instead of the
> default one
> + </td>
> + <td>No</td>
> + </tr>
> + <tr>
> + <td>contextxml</td>
> + <td>
> + An optional <a
> href="ext:tomcat5_context_xml">context xml</a>
> + file to use.
> </td>
> <td>No</td>
> </tr>
>
>
>
> 1.65 +2 -0
> jakarta-cactus/documentation/docs/xdocs/sitemap.xml
>
> Index: sitemap.xml
> ===================================================================
> RCS file:
> /home/cvs/jakarta-cactus/documentation/docs/xdocs/sitemap.xml,v
> retrieving revision 1.64
> retrieving revision 1.65
> diff -u -r1.64 -r1.65
> --- sitemap.xml 13 Nov 2003 10:54:56 -0000 1.64
> +++ sitemap.xml 15 Jan 2004 18:15:19 -0000 1.65
> @@ -466,6 +466,8 @@
> <external id="sun_j2ee_downloads"
> url="http://java.sun.com/j2ee/download.html"/>
> <external id="sun_servlet_downloads"
> url="http://java.sun.com/products/servlet/download.html"/>
> <external id="taglibs_standard"
> url="http://jakarta.apache.org/taglibs/doc/standard-doc/intro.html"/>
> + <external id="tomcat4_context_xml"
> url="http://jakarta.apache.org/tomcat/tomcat-4.1-doc/config/
> context.html"/>
> + <external id="tomcat5_context_xml"
> url="http://jakarta.apache.org/tomcat/tomcat-5.0-doc/config/
> context.html"/>
> <external id="velocity"
> url="http://jakarta.apache.org/velocity/"/>
> <external id="xalanj" url="http://xml.apache.org/xalan-j/"/>
>
>
>
>
> 1.151 +7 -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.150
> retrieving revision 1.151
> diff -u -r1.150 -r1.151
> --- changes.xml 10 Jan 2004 20:57:16 -0000 1.150
> +++ changes.xml 15 Jan 2004 18:15:19 -0000 1.151
> @@ -68,6 +68,13 @@
> </devs>
>
> <release version="1.6dev" date="in CVS">
> + <action dev="VMA" type="add">
> + In the Ant integration, added new <code>contextxml</code>
> attributes
> + to the <code><tomcat4x></code> and
> <code><tomcat5x></code>
> + nested elements of the <code><cactus></code> task.
> This is to
> + support the new context xml configuration file that
> appeared with
> + Tomcat 4.1.x.
> + </action>
> <action dev="VMA" type="fix" fixes-bug="25859"
> due-to="Brian Topping" due-to-email="topping@digidemic.com">
> In the Ant integration, added support for web contexts
> defined in
> JBoss's <code>jboss-web.xml</code>.
>
>
>
> 1.6 +4 -7
> 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.5
> retrieving revision 1.6
> diff -u -r1.5 -r1.6
> --- AbstractTomcatContainer.java 23 Nov 2003 17:16:41 -0000 1.5
> +++ AbstractTomcatContainer.java 15 Jan 2004 18:15:19 -0000 1.6
> @@ -3,7 +3,7 @@
> *
> * The Apache Software License, Version 1.1
> *
> - * Copyright (c) 2003 The Apache Software Foundation. All rights
> + * Copyright (c) 2003-2004 The Apache Software Foundation. All
> rights
> * reserved.
> *
> * Redistribution and use in source and binary forms, with or
> without
> @@ -139,10 +139,7 @@
> }
>
> /**
> - * Sets the server configuration file to use for the test
> installation of
> - * Tomcat.
> - *
> - * @return The server.xml file, if set
> + * @return The server.xml file, if set or null otherwise
> */
> public final File getServerXml()
> {
> @@ -203,7 +200,7 @@
>
> /**
> * Copies the configuration files specified by nested
> <conf> filesets
> - * to the conf directory.
> + * to the conf/ directory.
> *
> * @param theConfDir The Tomcat configuration directory
> */
>
>
>
> 1.8 +39 -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.7
> retrieving revision 1.8
> diff -u -r1.7 -r1.8
> --- AbstractCatalinaContainer.java 7 Dec 2003 09:46:54 -0000 1.7
> +++ AbstractCatalinaContainer.java 15 Jan 2004 18:15:19 -0000 1.8
> @@ -3,7 +3,7 @@
> *
> * The Apache Software License, Version 1.1
> *
> - * Copyright (c) 2003 The Apache Software Foundation. All rights
> + * Copyright (c) 2003-2004 The Apache Software Foundation. All
> rights
> * reserved.
> *
> * Redistribution and use in source and binary forms, with or
> without
> @@ -91,6 +91,11 @@
> */
> private String version;
>
> + /**
> + * A user-specific context xml configuration file.
> + */
> + private File contextXml;
> +
> // Public Methods
> ----------------------------------------------------------
>
> /**
> @@ -103,6 +108,25 @@
> this.tmpDir = theTmpDir;
> }
>
> + /**
> + * @return The context xml file, if set or null otherwise
> + */
> + public final File getContextXml()
> + {
> + return this.contextXml;
> + }
> +
> + /**
> + * Sets a user-custom context xml configuration file to use for
> the test
> + * installation of Tomcat.
> + *
> + * @param theContextXml the custom context xml file to use
> + */
> + public final void setContextXml(File theContextXml)
> + {
> + this.contextXml = theContextXml;
> + }
> +
> // AbstractContainer Implementation
> ----------------------------------------
>
> /**
> @@ -243,18 +267,26 @@
> 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");
> fileUtils.copyFile(getDeployableFile().getFile(),
> new File(webappsDir,
> getDeployableFile().getFile().getName()),
> null, true);
> +
> + // Copy user-provided configuration files into the
> temporary conf/
> + // container directory.
> + copyConfFiles(confDir);
> +
> + // Copy user-provided context xml file into the temporary
> webapp/
> + // container directory
> + if (getContextXml() != null)
> + {
> + fileUtils.copyFile(getContextXml(),
> + new File(webappsDir, getContextXml().getName()));
> + }
> +
> }
>
> }
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: cactus-dev-help@jakarta.apache.org
>
>
--
Christopher Lenz
/=/ cmlenz at gmx.de
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org