Author: markt
Date: Fri Sep 29 17:23:26 2006
New Revision: 451501
URL: http://svn.apache.org/viewvc?view=rev&rev=451501
Log:
Fix bug 40625. Remove DefaultContext from docs.
Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/container/tc5.5.x/webapps/docs/config/context.xml
tomcat/container/tc5.5.x/webapps/docs/config/engine.xml
tomcat/container/tc5.5.x/webapps/docs/config/globalresources.xml
tomcat/container/tc5.5.x/webapps/docs/config/host.xml
tomcat/container/tc5.5.x/webapps/docs/funcspecs/mbean-names.xml
tomcat/container/tc5.5.x/webapps/docs/jndi-resources-howto.xml
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=451501&r1=451500&r2=451501
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Fri Sep 29 17:23:26 2006
@@ -27,6 +27,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Webapps">
+ <changelog>
+ <fix>
+ <bug>40633</bug>: Remove references to the DefaultContext from the
+ documentation. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
Modified: tomcat/container/tc5.5.x/webapps/docs/config/context.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/context.xml?view=diff&rev=451501&r1=451500&r2=451501
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/config/context.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/config/context.xml Fri Sep 29
17:23:26 2006
@@ -150,9 +150,9 @@
<attribute name="override" required="false">
<p>Set to <code>true</code> to have explicit settings in this
Context element override any corresponding settings in the
- <a href="defaultcontext.html">DefaultContext</a> element associated
- with our owning <a href="host.html">Host</a>. By default, settings
- in the DefaultContext element will be used.</p>
+ default settings associated with the owning
+ <a href="host.html">Host</a>. The default is <code>false</code>.
+ </p>
</attribute>
<attribute name="privileged" required="false">
Modified: tomcat/container/tc5.5.x/webapps/docs/config/engine.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/engine.xml?view=diff&rev=451501&r1=451500&r2=451501
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/config/engine.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/config/engine.xml Fri Sep 29 17:23:26
2006
@@ -111,10 +111,6 @@
have a name that matches the name specified for the
<code>defaultHost</code> attribute, listed above.</p>
- <p>You can optional nest a <a href="defaultcontext.html">DefaultContext</a>
- element inside this <strong>Engine</strong> element, to define the default
- characteristics of web applications that are automatically deployed.</p>
-
<p>You can nest at most one instance of the following utility components
by nesting a corresponding element inside your <strong>Engine</strong>
element:</p>
Modified: tomcat/container/tc5.5.x/webapps/docs/config/globalresources.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/globalresources.xml?view=diff&rev=451501&r1=451500&r2=451501
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/config/globalresources.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/config/globalresources.xml Fri Sep 29
17:23:26 2006
@@ -203,7 +203,7 @@
<p>Use <a href="context.html#Resource Links"><ResourceLink></a>
elements to link resources from the global context into
per-web-application contexts. Here is an example of making a custom
- factory available to all applications in the server, based on the example
+ factory available to a web applications, based on the example
definition in the
<a href="../jndi-resource-howto.html#Generic JavaBean Resources">
JNDI Resource HOW-TO</a>:
@@ -211,13 +211,13 @@
<source>
<![CDATA[
- <DefaultContext>
+ <Context>
<ResourceLink
name="bean/MyBeanFactory"
global="bean/MyBeanFactory"
type="com.mycompany.MyBean"
/>
- </DefaultContext>
+ </Context>
]]>
</source>
Modified: tomcat/container/tc5.5.x/webapps/docs/config/host.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/host.xml?view=diff&rev=451501&r1=451500&r2=451501
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/config/host.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/config/host.xml Fri Sep 29 17:23:26
2006
@@ -190,13 +190,7 @@
<p>You can nest one or more <a href="context.html">Context</a> elements
inside this <strong>Host</strong> element, each representing a different web
- application associated with this virtual host. In addition, you can nest a
- single <a href="defaultcontext.html">DefaultContext</a> element that defines
- default values for subsequently deployed web applications.</p>
-
- <p>You can optional nest a <a href="defaultcontext.html">DefaultContext</a>
- element inside this <strong>Host</strong> element, to define the default
- characteristics of web applications that are automatically deployed.</p>
+ application associated with this virtual host.</p>
<p>You can nest at most one instance of the following utility components
by nesting a corresponding element inside your <strong>Host</strong>
@@ -288,8 +282,7 @@
generated <a href="context.html">Context</a> element, even if this
directory is not mentioned in the <code>conf/server.xml</code> file.
This generated Context entry will be configured according to the
- properties set in any <a href="defaultcontext.html">DefaultContext</a>
- element nested in this Host element. The context path for this
+ defaults configured for this Host element. The context path for this
deployed Context will be a slash character ("/") followed by the
directory name, unless the directory name is ROOT, in which case
the context path will be an empty string ("").</li>
@@ -520,8 +513,7 @@
considerations:</p>
<ul>
<li>Each user web application will be deployed with characteristics
- established by any <a href="defaultcontext.html">DefaultContext</a>
- element you have configured for this Host.</li>
+ established by any defaults you have configured for this Host.</li>
<li>It is legal to include more than one instance of this Listener
element. This would only be useful, however, in circumstances
where you wanted to configure more than one "homeBase" directory.</li>
Modified: tomcat/container/tc5.5.x/webapps/docs/funcspecs/mbean-names.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/funcspecs/mbean-names.xml?view=diff&rev=451501&r1=451500&r2=451501
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/funcspecs/mbean-names.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/funcspecs/mbean-names.xml Fri Sep 29
17:23:26 2006
@@ -139,79 +139,6 @@
</tr>
<tr>
- <td>Server / Service / Engine / DefaultContext</td>
- <td align="center">0..1</td>
- <td align="center">(none)</td>
- <td><code>type=${DEFAULT-CONTEXT}, service=${service.name}</code></td>
- </tr>
-
-<!--
- <tr>
- <td>Server / Service / Engine / DefaultContext / InstanceListener</td>
- <td align="center">0..n</td>
- <td align="center">(none)</td>
- <td></td>
- </tr>
-
- <tr>
- <td>Server / Service / Engine / DefaultContext / Listener</td>
- <td align="center">0..n</td>
- <td align="center">(none)</td>
- <td><code>type=${LISTENER}, sequence=${###}</code></td>
- <td></td>
- </tr>
-
- <tr>
- <td>Server / Service / Engine / DefaultContext / Loader</td>
- <td align="center">0..1</td>
- <td align="center">(none)</td>
- <td></td>
- </tr>
-
- <tr>
- <td>Server / Service / Engine / DefaultContext / Manager</td>
- <td align="center">0..1</td>
- <td align="center">(none)</td>
- <td></td>
- </tr>
-
- <tr>
- <td>Server / Service / Engine / DefaultContext / Realm</td>
- <td align="center">0..1</td>
- <td align="center">(none)</td>
- <td></td>
- </tr>
-
- <tr>
- <td>Server / Service / Engine / DefaultContext / Resources</td>
- <td align="center">0..1</td>
- <td align="center">(none)</td>
- <td></td>
- </tr>
-
- <tr>
- <td>Server / Service / Engine / DefaultContext / Valve</td>
- <td align="center">0..n</td>
- <td align="center">(none)</td>
- <td></td>
- </tr>
-
- <tr>
- <td>Server / Service / Engine / DefaultContext / WrapperLifecycle</td>
- <td align="center">0..n</td>
- <td align="center">(none)</td>
- <td></td>
- </tr>
-
- <tr>
- <td>Server / Service / Engine / DefaultContext / WrapperListener</td>
- <td align="center">0..n</td>
- <td align="center">(none)</td>
- <td></td>
- </tr>
--->
-
- <tr>
<td>Server / Service / Engine / Host</td>
<td align="center">1..n</td>
<td align="center"><code>name</code></td>
@@ -300,79 +227,6 @@
</tr>
<tr>
- <td>Server / Service / Engine / Host / DefaultContext</td>
- <td align="center">0..1</td>
- <td align="center">(none)</td>
- <td><code>type=DefaultContext, host=${host.name},
- service=${service.name}</code></td>
- </tr>
-
-<!--
- <tr>
- <td>Server / Service / Engine / Host / DefaultContext /
InstanceListener</td>
- <td align="center">0..n</td>
- <td align="center">(none)</td>
- <td></td>
- </tr>
-
- <tr>
- <td>Server / Service / Engine / Host / DefaultContext / Listener</td>
- <td align="center">0..n</td>
- <td align="center">(none)</td>
- <td></td>
- </tr>
-
- <tr>
- <td>Server / Service / Engine / Host / DefaultContext / Loader</td>
- <td align="center">0..1</td>
- <td align="center">(none)</td>
- <td></td>
- </tr>
-
- <tr>
- <td>Server / Service / Engine / Host / DefaultContext / Manager</td>
- <td align="center">0..1</td>
- <td align="center">(none)</td>
- <td></td>
- </tr>
-
- <tr>
- <td>Server / Service / Engine / Host / DefaultContext / Realm</td>
- <td align="center">0..1</td>
- <td align="center">(none)</td>
- <td></td>
- </tr>
-
- <tr>
- <td>Server / Service / Engine / Host / DefaultContext / Resources</td>
- <td align="center">0..1</td>
- <td align="center">(none)</td>
- <td></td>
- </tr>
-
- <tr>
- <td>Server / Service / Engine / Host / DefaultContext / Valve</td>
- <td align="center">0..n</td>
- <td align="center">(none)</td>
- <td></td>
- </tr>
-
- <tr>
- <td>Server / Service / Engine / Host / DefaultContext /
WrapperLifecycle</td>
- <td align="center">0..n</td>
- <td align="center">(none)</td>
- <td></td>
- </tr>
-
- <tr>
- <td>Server / Service / Engine / Host / DefaultContext /
WrapperListener</td>
- <td align="center">0..n</td>
- <td align="center">(none)</td>
- <td></td>
- </tr>
--->
-
- <tr>
<td>Server / Service / Engine / Host / Listener</td>
<td align="center">0..n</td>
<td align="center">(none)</td>
@@ -503,13 +357,6 @@
<td align="center"><code>CONNECTOR</code></td>
<td><code>org.apache.catalina.Connector</code></td>
<td><code>org.apache.coyote.tomcat4.CoyoteConnector</code></td>
- </tr>
-
- <tr>
- <td><code>DefaultContext</code></td>
- <td align="center"><code>DEFAULT-CONTEXT</code></td>
- <td><code>org.apache.catalina.DefaultContext</code></td>
- <td><code>org.apache.catalina.core.StandardDefaultContext</code></td>
</tr>
<tr>
Modified: tomcat/container/tc5.5.x/webapps/docs/jndi-resources-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/jndi-resources-howto.xml?view=diff&rev=451501&r1=451500&r2=451501
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/jndi-resources-howto.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/jndi-resources-howto.xml Fri Sep 29
17:23:26 2006
@@ -100,8 +100,8 @@
<section name="Configuring JNDI Resources">
<p>Each available JNDI Resource is configured based on inclusion of the
-following elements in the <code><strong><Context></strong></code> or
-<code><strong><DefaultContext></strong></code> elements:</p>
+following elements in the <code><strong><Context></strong></code>
+element:</p>
<ul>
<li><a href="config/context.html#Environment Entries"><Environment></a> -
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
