You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2011/11/10 05:14:00 UTC
svn commit: r1200133 - in /tomcat/tc7.0.x/trunk/webapps/docs:
default-servlet.xml deployer-howto.xml developers.xml extras.xml
html-manager-howto.xml jasper-howto.xml jndi-datasource-examples-howto.xml
jndi-resources-howto.xml
Author: kkolinko
Date: Thu Nov 10 04:13:59 2011
New Revision: 1200133
URL: http://svn.apache.org/viewvc?rev=1200133&view=rev
Log:
Merging r1187809 - Trailing whitespace removal from /webapps
/webapps/docs, 7
Modified:
tomcat/tc7.0.x/trunk/webapps/docs/default-servlet.xml
tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml
tomcat/tc7.0.x/trunk/webapps/docs/developers.xml
tomcat/tc7.0.x/trunk/webapps/docs/extras.xml
tomcat/tc7.0.x/trunk/webapps/docs/html-manager-howto.xml
tomcat/tc7.0.x/trunk/webapps/docs/jasper-howto.xml
tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml
tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml
Modified: tomcat/tc7.0.x/trunk/webapps/docs/default-servlet.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/default-servlet.xml?rev=1200133&r1=1200132&r2=1200133&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/default-servlet.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/default-servlet.xml Thu Nov 10 04:13:59 2011
@@ -175,8 +175,8 @@ The DefaultServlet allows the following
<tr>
<th valign='top'>sendfileSize</th>
<td valign='top'>
- If the connector used supports sendfile, this represents the minimal
- file size in KB for which sendfile will be used. Use a negative value
+ If the connector used supports sendfile, this represents the minimal
+ file size in KB for which sendfile will be used. Use a negative value
to always disable sendfile. [48]
</td>
</tr>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml?rev=1200133&r1=1200132&r2=1200133&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml Thu Nov 10 04:13:59 2011
@@ -36,8 +36,8 @@
<section name="Introduction">
<p>
Deployment is the term used for the process of installing a web
- application (either a 3rd party WAR or your own custom web application)
- into the Tomcat server.
+ application (either a 3rd party WAR or your own custom web application)
+ into the Tomcat server.
</p>
<p>
Web application deployment may be accomplished in a number of ways
@@ -45,7 +45,7 @@
<ul>
<li>Statically; the web application is setup before Tomcat is started</li>
<li>
- Dynamically; in conjunction with the Tomcat Manager web application or
+ Dynamically; in conjunction with the Tomcat Manager web application or
manipulating already deployed web applications
</li>
</ul>
@@ -58,20 +58,20 @@
web application resource (WAR) files.
</p>
</section>
-
+
<section name="Installation">
<p>
There is no installation required for static deployment of web
applications as this is provided out of the box by Tomcat. Nor is any
- installation required for deployment functions with the Tomcat Manager,
- although some configuration is required as detailed in the
+ installation required for deployment functions with the Tomcat Manager,
+ although some configuration is required as detailed in the
Tomcat Manager manual. An installation is however required if you wish
- to use the Tomcat Client Deployer (TCD).
- </p>
+ to use the Tomcat Client Deployer (TCD).
+ </p>
<p>
- The TCD is not packaged with the Tomcat core
- distribution, and must therefore be downloaded separately from
- the Downloads area. The download is usually labelled
+ The TCD is not packaged with the Tomcat core
+ distribution, and must therefore be downloaded separately from
+ the Downloads area. The download is usually labelled
<i>apache-tomcat-7.0.x-deployer</i>.
</p>
<p>
@@ -92,25 +92,25 @@
Tomcat Client Deployer</a></li>
</ol>
</section>
-
+
<section name="A word on Contexts">
<p>
In talking about deployment of web applications, the concept of a
- <i>Context</i> is required to be understood. A Context is what Tomcat
+ <i>Context</i> is required to be understood. A Context is what Tomcat
calls a web application.
</p>
<p>
In order to configure a Context within Tomcat a <i>Context Descriptor</i>
is required. A Context Descriptor is simply an XML file that contains
- Tomcat related configuration for a Context, e.g naming resources or
+ Tomcat related configuration for a Context, e.g naming resources or
session manager configuration. In earlier versions of
Tomcat the content of a Context Descriptor configuration was often stored within
Tomcat's primary configuration file <i>server.xml</i> but this is now
discouraged (although it currently still works).
</p>
- <p>
- Context Descriptors not only help Tomcat to know how to configure
- Contexts but other tools such as the Tomcat Manager and TCD often use
+ <p>
+ Context Descriptors not only help Tomcat to know how to configure
+ Contexts but other tools such as the Tomcat Manager and TCD often use
these Context Descriptors to perform their roles properly.
</p>
<p>
@@ -123,16 +123,16 @@
<p>
Files in (1) are named [webappname].xml but files in (2) are named
context.xml. If a Context Descriptor is not provided for a Context,
- Tomcat configures the Context using default values.
+ Tomcat configures the Context using default values.
</p>
</section>
-
+
<section name="Deployment on Tomcat startup">
<p>
- If you are not interested in using the Tomcat Manager, or TCD,
- then you'll need to deploy your web applications
+ If you are not interested in using the Tomcat Manager, or TCD,
+ then you'll need to deploy your web applications
statically to Tomcat, followed by a Tomcat startup. The location you
- deploy web applications to for this type of deployment is called the
+ deploy web applications to for this type of deployment is called the
<code>appBase</code> which is specified per Host. You either copy a
so-called <i>exploded web application</i>, i.e non-compressed, to this
location, or a compressed web application resource .WAR file.
@@ -140,7 +140,7 @@
<p>
The web applications present in the location specified by the Host's
(default Host is "localhost") <code>appBase</code> attribute (default
- appBase is "$CATALINA_BASE/webapps") will be deployed on Tomcat startup
+ appBase is "$CATALINA_BASE/webapps") will be deployed on Tomcat startup
only if the Host's <code>deployOnStartup</code> attribute is "true".
</p>
<p>
@@ -151,31 +151,31 @@
<li>Any Context Descriptors will be deployed first.</li>
<li>
Exploded web applications not referenced by any Context
- Descriptor will then be deployed. If they have an associated
- .WAR file in the appBase and it is newer than the exploded web application,
- the exploded directory will be removed and the webapp will be
+ Descriptor will then be deployed. If they have an associated
+ .WAR file in the appBase and it is newer than the exploded web application,
+ the exploded directory will be removed and the webapp will be
redeployed from the .WAR
</li>
<li>.WAR files will be deployed</li>
</ol>
<p>
- Note again that for each deployed web application, a
+ Note again that for each deployed web application, a
Context Descriptor will be created <i>unless one exists already</i>.
</p>
</section>
-
+
<section name="Deploying on a running Tomcat server">
<p>
It is possible to deploy web applications to a running Tomcat server.
</p>
<p>
- If the Host <code>autoDeploy</code> attribute is "true", the Host will
+ If the Host <code>autoDeploy</code> attribute is "true", the Host will
attempt to deploy and update web applications dynamically, as needed,
- for example if a new .WAR is dropped into the <code>appBase</code>.
- For this to work, the Host needs to have background processing
+ for example if a new .WAR is dropped into the <code>appBase</code>.
+ For this to work, the Host needs to have background processing
enabled which is the default configuration.
</p>
-
+
<p>
<code>autoDeploy</code> set to "true" and a running Tomcat allows for:
</p>
@@ -187,11 +187,11 @@
</li>
<li>
Re-deployment of a web application which has already been deployed from
- a .WAR when the new .WAR is provided. In this case the exploded
- web application is removed, and the .WAR is expanded again.
- Note that the explosion will not occur if the Host is configured
+ a .WAR when the new .WAR is provided. In this case the exploded
+ web application is removed, and the .WAR is expanded again.
+ Note that the explosion will not occur if the Host is configured
so that .WARs are not exploded with a <code>unpackWARs</code>
- attribute set to "false", in which case the web application
+ attribute set to "false", in which case the web application
will be simply redeployed as a compressed archive.
</li>
<li>
@@ -205,14 +205,14 @@
<li>
Re-deployment of a web application if a Context Descriptor file (with a
filename corresponding to the Context path of the previously deployed
- web application) is added to the
+ web application) is added to the
<code>$CATALINA_BASE/conf/[enginename]/[hostname]/</code>
directory.
</li>
<li>
Undeployment of a web application if its document base (docBase)
- is deleted. Note that on Windows, this assumes that anti-locking
- features (see Context configuration) are enabled, otherwise it is not
+ is deleted. Note that on Windows, this assumes that anti-locking
+ features (see Context configuration) are enabled, otherwise it is not
possible to delete the resources of a running web application.
</li>
</ul>
@@ -221,23 +221,23 @@
case loaded classes will be tracked for changes.
</p>
</section>
-
+
<section name="Deploying using the Tomcat Manager">
<p>
- The Tomcat Manager is covered in its <a href="manager-howto.html">own manual page</a>.
+ The Tomcat Manager is covered in its <a href="manager-howto.html">own manual page</a>.
</p>
</section>
-
+
<section name="Deploying using the Client Deployer Package">
<p>
- Finally, deployment of web application may be achieved using the
- Tomcat Client Deployer. This is a package which can be used to
- validate, compile, compress to .WAR, and deploy web applications to
- production or development Tomcat servers. It should be noted that this feature
+ Finally, deployment of web application may be achieved using the
+ Tomcat Client Deployer. This is a package which can be used to
+ validate, compile, compress to .WAR, and deploy web applications to
+ production or development Tomcat servers. It should be noted that this feature
uses the Tomcat Manager and as such the target Tomcat server should be
running.
</p>
-
+
<p>
It is assumed the user will be familiar with Apache Ant for using the TCD.
Apache Ant is a scripted build tool. The TCD comes pre-packaged with a
@@ -246,37 +246,37 @@
with using the operating system command shell and configuring
environment variables).
</p>
-
+
<p>
- The TCD includes Ant tasks, the Jasper page compiler for JSP compilation
+ The TCD includes Ant tasks, the Jasper page compiler for JSP compilation
before deployment, as well as a task which
validates the web application Context Descriptor. The validator task (class
<code>org.apache.catalina.ant.ValidatorTask</code>) allows only one parameter:
the base path of an exploded web application.
</p>
-
+
<p>
The TCD uses an exploded web application as input (see the list of the
- properties used below). A web application that is programmatically
- deployed with the deployer may include a Context Descriptor in
+ properties used below). A web application that is programmatically
+ deployed with the deployer may include a Context Descriptor in
<code>/META-INF/context.xml</code>.
</p>
-
+
<p>
The TCD includes a ready-to-use Ant script, with the following targets:
</p>
<ul>
<li>
- <code>compile</code> (default): Compile and validate the web
+ <code>compile</code> (default): Compile and validate the web
application. This can be used standalone, and does not need a running
Tomcat server. The compiled application will only run on the associated
Tomcat 7.0.x server release, and is not guaranteed to work on another
Tomcat release, as the code generated by Jasper depends on its runtime
component. It should also be noted that this target will also compile
- automatically any Java source file located in the
+ automatically any Java source file located in the
<code>/WEB-INF/classes</code> folder of the web application.</li>
<li>
- <code>deploy</code>: Deploy a web application (compiled or not) to
+ <code>deploy</code>: Deploy a web application (compiled or not) to
a Tomcat server.
</li>
<li><code>undeploy</code>: Undeploy a web application</li>
@@ -284,42 +284,42 @@
<li><code>reload</code>: Reload web application</li>
<li><code>stop</code>: Stop web application</li>
</ul>
-
+
<p>
In order for the deployment to be configured, create a file
called <code>deployer.properties</code> in the TCD installation
directory root. In this file, add the following name=value pairs per
line:
</p>
-
+
<p>
- Additionally, you will need to ensure that a user has been
+ Additionally, you will need to ensure that a user has been
setup for the target Tomcat Manager (which TCD uses) otherwise the TCD
will not authenticate with the Tomcat Manager and the deployment will
- fail. To do this, see the Tomcat Manager page.
+ fail. To do this, see the Tomcat Manager page.
</p>
-
+
<ul>
<li>
- <code>build</code>: The build folder used will be, by default,
+ <code>build</code>: The build folder used will be, by default,
<code>${build}/webapp/${path}</code>. After the end of the execution
of the <code>compile</code> target, the web application .WAR will be
located at <code>${build}/webapp/${path}.war</code>.
</li>
<li>
- <code>webapp</code>: The directory containing the exploded web application
+ <code>webapp</code>: The directory containing the exploded web application
which will be compiled and validated. By default, the folder is
<code>myapp</code>.
</li>
<li>
- <code>path</code>: Deployed context path of the web application,
+ <code>path</code>: Deployed context path of the web application,
by default <code>/myapp</code>.
</li>
<li>
- <code>url</code>: Absolute URL to the Tomcat Manager web application of a
+ <code>url</code>: Absolute URL to the Tomcat Manager web application of a
running Tomcat server, which will be used to deploy and undeploy the
- web application. By default, the deployer will attempt to access
- a Tomcat instance running on localhost, at
+ web application. By default, the deployer will attempt to access
+ a Tomcat instance running on localhost, at
<code>http://localhost:8080/manager/text</code>.
</li>
<li>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/developers.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/developers.xml?rev=1200133&r1=1200132&r2=1200133&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/developers.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/developers.xml Thu Nov 10 04:13:59 2011
@@ -34,12 +34,12 @@
<p>
The list indicates the developers' main areas of interest. Feel free to
- add to the list :) The developers email addresses are
- <code>[login]@apache.org</code>. Please <strong>do not</strong> contact
- developers directly for any support issues (please post to the
- tomcat-users mailing list instead, or one of the other support
- resources; some organizations and individual consultants also offer
- for pay Tomcat support, as listed on the
+ add to the list :) The developers email addresses are
+ <code>[login]@apache.org</code>. Please <strong>do not</strong> contact
+ developers directly for any support issues (please post to the
+ tomcat-users mailing list instead, or one of the other support
+ resources; some organizations and individual consultants also offer
+ for pay Tomcat support, as listed on the
<a href="http://wiki.apache.org/tomcat/SupportAndTraining">support and
training</a> page on the Tomcat Wiki).
</p>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/extras.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/extras.xml?rev=1200133&r1=1200132&r2=1200133&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/extras.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/extras.xml Thu Nov 10 04:13:59 2011
@@ -36,7 +36,7 @@
<section name="Introduction">
<p>
A number of additional components may be used with Apache Tomcat. These
- components may be built by users should they need them or they can be
+ components may be built by users should they need them or they can be
downloaded from one of the mirrors.
</p>
@@ -46,10 +46,10 @@
<p>
To download the extras components open the Tomcat download page and
select "browse" from the Quick Navigation Links. The extras components can be
- found in bin/extras.
+ found in bin/extras.
</p>
</section>
-
+
<section name="Building">
<p>
@@ -57,9 +57,9 @@
of the standard Tomcat Ant script which is present in the source bundle of
Tomcat.
</p>
-
+
<p>The build process is the following:</p>
-
+
<ul>
<li>Follow the <a href="building.html">build instructions</a> to build a
Tomcat binary from the source bundle (note: it will be used by the build
Modified: tomcat/tc7.0.x/trunk/webapps/docs/html-manager-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/html-manager-howto.xml?rev=1200133&r1=1200132&r2=1200133&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/html-manager-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/html-manager-howto.xml Thu Nov 10 04:13:59 2011
@@ -133,25 +133,25 @@ OK - Started application at context path
error message. Possible causes for problems include:</p>
<ul>
<li><em>Encountered exception</em>
- <blockquote>
+ <blockquote>
<p>An exception was encountered trying to start the web application.
Check the Tomcat logs for the details.</p>
- </blockquote></li>
+ </blockquote></li>
<li><em>Invalid context path was specified</em>
- <blockquote>
+ <blockquote>
<p>The context path must start with a slash character, unless you are
referencing the ROOT web application -- in which case the context path
must be a zero-length string.</p>
- </blockquote></li>
+ </blockquote></li>
<li><em>No context exists for path /foo</em>
- <blockquote>
+ <blockquote>
<p>There is no deployed application on the context path
- that you specified.</p>
- </blockquote></li>
+ that you specified.</p>
+ </blockquote></li>
<li><em>No context path was specified</em>
- <blockquote>
+ <blockquote>
The <code>path</code> parameter is required.
- </blockquote></li>
+ </blockquote></li>
</ul>
</subsection>
@@ -170,27 +170,27 @@ OK - Stopped application at context path
<p>Otherwise, the Message will start with <code>FAIL</code> and include an
error message. Possible causes for problems include:</p>
-<ul>
+<ul>
<li><em>Encountered exception</em>
- <blockquote>
+ <blockquote>
<p>An exception was encountered trying to stop the web application.
Check the Tomcat logs for the details.</p>
- </blockquote></li>
+ </blockquote></li>
<li><em>Invalid context path was specified</em>
- <blockquote>
+ <blockquote>
<p>The context path must start with a slash character, unless you are
referencing the ROOT web application -- in which case the context path
must be a zero-length string.</p>
- </blockquote></li>
+ </blockquote></li>
<li><em>No context exists for path /foo</em>
- <blockquote>
+ <blockquote>
<p>There is no deployed application on the context path
- that you specified.</p>
- </blockquote></li>
+ that you specified.</p>
+ </blockquote></li>
<li><em>No context path was specified</em>
- <blockquote>
+ <blockquote>
The <code>path</code> parameter is required.
- </blockquote></li>
+ </blockquote></li>
</ul>
</subsection>
@@ -219,35 +219,35 @@ OK - Reloaded application at context pat
error message. Possible causes for problems include:</p>
<ul>
<li><em>Encountered exception</em>
- <blockquote>
+ <blockquote>
<p>An exception was encountered trying to restart the web application.
Check the Tomcat logs for the details.</p>
- </blockquote></li>
+ </blockquote></li>
<li><em>Invalid context path was specified</em>
- <blockquote>
+ <blockquote>
<p>The context path must start with a slash character, unless you are
referencing the ROOT web application -- in which case the context path
must be a zero-length string.</p>
- </blockquote></li>
+ </blockquote></li>
<li><em>No context exists for path /foo</em>
- <blockquote>
+ <blockquote>
<p>There is no deployed application on the context path
- that you specified.</p>
- </blockquote></li>
+ that you specified.</p>
+ </blockquote></li>
<li><em>No context path was specified</em>
- <blockquote>
+ <blockquote>
The <code>path</code> parameter is required.
- </blockquote></li>
+ </blockquote></li>
<li><em>Reload not supported on WAR deployed at path /foo</em>
- <blockquote>
+ <blockquote>
Currently, application reloading (to pick up changes to the classes or
<code>web.xml</code> file) is not supported when a web application is
- installed directly from a WAR file, which happens when the host is
- configured to not unpack WAR files. As it only works when the web
- application is installed from an unpacked directory, if you are using
- a WAR file, you should <code>undeploy</code> and then <code>deploy</code>
+ installed directly from a WAR file, which happens when the host is
+ configured to not unpack WAR files. As it only works when the web
+ application is installed from an unpacked directory, if you are using
+ a WAR file, you should <code>undeploy</code> and then <code>deploy</code>
the application again to pick up your changes.
- </blockquote></li>
+ </blockquote></li>
</ul>
</subsection>
@@ -260,11 +260,11 @@ the <code>appBase</code> directory (typi
</strong>. The web application temporary work directory is also deleted. If
you simply want to take an application out of service, you should use the
<code>/stop</code> command instead.</p>
-
+
<p>Signal an existing application to gracefully shut itself down, and then
remove it from Tomcat (which also makes this context path available for
reuse later). This command is the logical opposite of the
-<code>/deploy</code> Ant command, and the related deploy features available
+<code>/deploy</code> Ant command, and the related deploy features available
in the HTML manager.</p>
<p>If this command succeeds, you will see a Message like this:</p>
@@ -274,27 +274,27 @@ OK - Undeployed application at context p
<p>Otherwise, the Message will start with <code>FAIL</code> and include an
error message. Possible causes for problems include:</p>
-<ul>
+<ul>
<li><em>Encountered exception</em>
- <blockquote>
+ <blockquote>
<p>An exception was encountered trying to undeploy the web application.
Check the Tomcat logs for the details.</p>
- </blockquote></li>
+ </blockquote></li>
<li><em>Invalid context path was specified</em>
- <blockquote>
+ <blockquote>
<p>The context path must start with a slash character, unless you are
referencing the ROOT web application -- in which case the context path
must be a zero-length string.</p>
- </blockquote></li>
+ </blockquote></li>
<li><em>No context exists for path /foo</em>
- <blockquote>
+ <blockquote>
<p>There is no deployed application on the context path
- that you specified.</p>
- </blockquote></li>
+ that you specified.</p>
+ </blockquote></li>
<li><em>No context path was specified</em>
- <blockquote>
+ <blockquote>
The <code>path</code> parameter is required.
- </blockquote></li>
+ </blockquote></li>
</ul>
</subsection>
@@ -423,8 +423,8 @@ extension is used as the context path na
<p>Use the <i>Browse</i> button to select a WAR file to upload to the
server from your local desktop system.</p>
-<p>The .WAR file may include Tomcat specific deployment configuration, by
-including a Context configuration XML file in
+<p>The .WAR file may include Tomcat specific deployment configuration, by
+including a Context configuration XML file in
<code>/META-INF/context.xml</code>.</p>
<p>Upload of a WAR file could fail for the following reasons:</p>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/jasper-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/jasper-howto.xml?rev=1200133&r1=1200132&r2=1200133&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/jasper-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/jasper-howto.xml Thu Nov 10 04:13:59 2011
@@ -97,7 +97,7 @@ classpath is created dynamically based o
<li><strong>compiler</strong> - Which compiler Ant should use to compile JSP
pages. See the Ant documentation for more information. If the value is not set,
-then the default Eclipse JDT Java compiler will be used instead of using Ant.
+then the default Eclipse JDT Java compiler will be used instead of using Ant.
No default value.</li>
<li><strong>compilerSourceVM</strong> - What JDK version are the source files
@@ -153,7 +153,7 @@ java source files. Default <code>UTF8</c
code for each page instead of deleting it? <code>true</code> or
<code>false</code>, default <code>true</code>.</li>
-<li><strong>mappedfile</strong> - Should we generate static content with one
+<li><strong>mappedfile</strong> - Should we generate static content with one
print statement per input line, to ease debugging?
<code>true</code> or <code>false</code>, default <code>true</code>.</li>
@@ -185,7 +185,7 @@ application.</li>
<li><strong>suppressSmap</strong> - Should the generation of SMAP info for JSR45
debugging be suppressed? <code>true</code> or <code>false</code>, default
<code>false</code>.</li>
-
+
<li><strong>trimSpaces</strong> - Should white spaces in template text between
actions or directives be trimmed ?, default <code>false</code>.</li>
@@ -239,7 +239,7 @@ the following changes from the default c
<ul>
<li><strong>development</strong> - To disable on access checks for JSP
pages compilation set this to <code>false</code>.</li>
-<li><strong>genStringAsCharArray</strong> - To generate slightly more efficient
+<li><strong>genStringAsCharArray</strong> - To generate slightly more efficient
char arrays, set this to <code>true</code>.</li>
<li><strong>modificationTestInterval</strong> - If development has to be set to
<code>true</code> for any reason (such as dynamic generation of JSPs), setting
@@ -254,27 +254,27 @@ set this to <code>true</code>.</li>
<section name="Web Application Compilation">
<p>Using Ant is the preferred way to compile web applications using JSPC. Note
-that when pre-compiling JSPs, SMAP information will only be included in the
+that when pre-compiling JSPs, SMAP information will only be included in the
final classes if suppressSmap is false and compile is true.
-Use the script given below (a similar script is included in the "deployer"
+Use the script given below (a similar script is included in the "deployer"
download) to precompile a webapp:
</p>
<p>
<source>
-<project name="Webapp Precompilation" default="all" basedir=".">
+<project name="Webapp Precompilation" default="all" basedir=".">
<import file="${tomcat.home}/bin/catalina-tasks.xml"/>
-
- <target name="jspc">
- <jasper
- validateXml="false"
- uriroot="${webapp.path}"
- webXmlFragment="${webapp.path}/WEB-INF/generated_web.xml"
- outputDir="${webapp.path}/WEB-INF/src" />
+ <target name="jspc">
+
+ <jasper
+ validateXml="false"
+ uriroot="${webapp.path}"
+ webXmlFragment="${webapp.path}/WEB-INF/generated_web.xml"
+ outputDir="${webapp.path}/WEB-INF/src" />
- </target>
+ </target>
<target name="compile">
@@ -284,7 +284,7 @@ download) to precompile a webapp:
<javac destdir="${webapp.path}/WEB-INF/classes"
optimize="off"
debug="on" failonerror="false"
- srcdir="${webapp.path}/WEB-INF/src"
+ srcdir="${webapp.path}/WEB-INF/src"
excludes="**/*.smap">
<classpath>
<pathelement location="${webapp.path}/WEB-INF/classes"/>
@@ -295,9 +295,9 @@ download) to precompile a webapp:
<fileset dir="${tomcat.home}/lib">
<include name="*.jar"/>
</fileset>
- <fileset dir="${tomcat.home}/bin">
- <include name="*.jar"/>
- </fileset>
+ <fileset dir="${tomcat.home}/bin">
+ <include name="*.jar"/>
+ </fileset>
</classpath>
<include name="**" />
<exclude name="tags/**" />
@@ -321,7 +321,7 @@ download) to precompile a webapp:
<p>
The following command line can be used to run the script
-(replacing the tokens with the Tomcat base path and the path to the webapp
+(replacing the tokens with the Tomcat base path and the path to the webapp
which should be precompiled):<br/>
<source>
$ANT_HOME/bin/ant -Dtomcat.home=<$TOMCAT_HOME> -Dwebapp.path=<$WEBAPP_PATH>
@@ -329,20 +329,20 @@ $ANT_HOME/bin/ant -Dtomcat.home=<$TOM
</p>
<p>
-Then, the declarations and mappings for the servlets which were generated
+Then, the declarations and mappings for the servlets which were generated
during the precompilation must be added to the web application deployment
descriptor. Insert the <code>${webapp.path}/WEB-INF/generated_web.xml</code>
at the right place inside the <code>${webapp.path}/WEB-INF/web.xml</code> file.
-Restart the web application (using the manager) and test it to verify it is
+Restart the web application (using the manager) and test it to verify it is
running fine with precompiled servlets. An appropriate token placed in the
web application deployment descriptor may also be used to automatically
-insert the generated servlet declarations and mappings using Ant filtering
-capabilities. This is actually how all the webapps distributed with Tomcat
+insert the generated servlet declarations and mappings using Ant filtering
+capabilities. This is actually how all the webapps distributed with Tomcat
are automatically compiled as part of the build process.
</p>
<p>
-At the jasper2 task you can use the option <code>addWebXmlMappings</code> for
+At the jasper2 task you can use the option <code>addWebXmlMappings</code> for
automatic merge the <code>${webapp.path}/WEB-INF/generated_web.xml</code>
with the current web application deployment descriptor at
<code>${webapp.path}/WEB-INF/web.xml</code>. When you want to use Java 6
@@ -353,7 +353,7 @@ without debug info <code>debug="off
</p>
<p>
-When you don't want to stop the jsp generation at first jsp syntax error, use
+When you don't want to stop the jsp generation at first jsp syntax error, use
<code>failOnError="false"</code>and with
<code>showSuccess="true"</code> all successfull <i>jsp to java</i>
generation are printed out. Sometimes it is very helpfull, when you cleanup the
Modified: tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1200133&r1=1200132&r2=1200133&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml Thu Nov 10 04:13:59 2011
@@ -58,9 +58,9 @@ to make them work in Tomcat 7.x.x.
</p>
<p>
-Also, please note that JNDI DataSource configuration in general, and this
-tutorial in particular, assumes that you have read and understood the
-<a href="config/context.html">Context</a> and
+Also, please note that JNDI DataSource configuration in general, and this
+tutorial in particular, assumes that you have read and understood the
+<a href="config/context.html">Context</a> and
<a href="config/host.html">Host</a> configuration references, including
the section about Automatic Application Deployment in the latter reference.
</p>
@@ -120,7 +120,7 @@ The following libraries are used:
</ul>
<p>
-These libraries are located in a single JAR at
+These libraries are located in a single JAR at
<code>$CATALINA_HOME/lib/tomcat-dbcp.jar</code>. However,
only the classes needed for connection pooling have been included, and the
packages have been renamed to avoid interfering with applications.
@@ -218,13 +218,13 @@ Your MySQL user <strong>must</strong> ha
will fail if you try to connect with an empty password.
</p>
<source>
-mysql> GRANT ALL PRIVILEGES ON *.* TO javauser@localhost
+mysql> GRANT ALL PRIVILEGES ON *.* TO javauser@localhost
-> IDENTIFIED BY 'javadude' WITH GRANT OPTION;
mysql> create database javatest;
mysql> use javatest;
mysql> create table testdata (
-> id int not null auto_increment primary key,
- -> foo varchar(25),
+ -> foo varchar(25),
-> bar int);
</source>
<blockquote>
@@ -277,7 +277,7 @@ resource to your <a href="config/context
org.gjt.mm.mysql.Driver - we recommend using Connector/J though.
Class name for the official MySQL Connector/J driver is com.mysql.jdbc.Driver.
-->
-
+
<!-- url: The JDBC connection url for connecting to your MySQL database.
-->
@@ -325,7 +325,7 @@ select id, foo, bar from testdata
<body>
<h2>Results</h2>
-
+
<c:forEach var="row" items="${rs.rows}">
Foo ${row.foo}<br/>
Bar ${row.bar}<br/>
@@ -387,7 +387,7 @@ user scott.</p>
type="javax.sql.DataSource" driverClassName="oracle.jdbc.OracleDriver"
url="jdbc:oracle:thin:@127.0.0.1:1521:mysid"
username="scott" password="tiger" maxActive="20" maxIdle="10"
- maxWait="-1"/>
+ maxWait="-1"/>
</source>
<h3>2. web.xml configuration</h3>
@@ -519,11 +519,11 @@ Oracle and DBCP solution above.</p>
<p>
In order to use OCI driver, you should have an Oracle client installed. You should have installed
Oracle8i(8.1.7) client from cd, and download the suitable JDBC/OCI
-driver(Oracle8i 8.1.7.1 JDBC/OCI Driver) from <a href="http://otn.oracle.com/">otn.oracle.com</a>.
+driver(Oracle8i 8.1.7.1 JDBC/OCI Driver) from <a href="http://otn.oracle.com/">otn.oracle.com</a>.
</p>
<p>
After renaming <code>classes12.zip</code> file to <code>classes12.jar</code>
-for Tomcat, copy it into <code>$CATALINA_HOME/lib</code>.
+for Tomcat, copy it into <code>$CATALINA_HOME/lib</code>.
You may also have to remove the <code>javax.sql.*</code> classes
from this file depending upon the version of Tomcat and JDK you are using.
</p>
@@ -532,7 +532,7 @@ from this file depending upon the versio
<subsection name="Putting it all together">
<p>
Ensure that you have the <code>ocijdbc8.dll</code> or <code>.so</code> in your <code>$PATH</code> or <code>LD_LIBRARY_PATH</code>
- (possibly in <code>$ORAHOME\bin</code>) and also confirm that the native library can be loaded by a simple test program
+ (possibly in <code>$ORAHOME\bin</code>) and also confirm that the native library can be loaded by a simple test program
using <code>System.loadLibrary("ocijdbc8");</code>
</p>
<p>
@@ -546,12 +546,12 @@ conn =
DriverManager.getConnection("jdbc:oracle:oci8:@database","username","password");
</source>
<p>
-where database is of the form <code>host:port:SID</code> Now if you try to access the URL of your
-test servlet/jsp and what you get is a
+where database is of the form <code>host:port:SID</code> Now if you try to access the URL of your
+test servlet/jsp and what you get is a
<code>ServletException</code> with a root cause of <code>java.lang.UnsatisfiedLinkError:get_env_handle</code>.
</p>
<p>
-First, the <code>UnsatisfiedLinkError</code> indicates that you have
+First, the <code>UnsatisfiedLinkError</code> indicates that you have
<ul>
<li>a mismatch between your JDBC classes file and
your Oracle client version. The giveaway here is the message stating that a needed library file cannot be
@@ -559,7 +559,7 @@ found. For example, you may be using a c
Oracle client. The classeXXXs.zip file and Oracle client software versions must match.
</li>
<li>A <code>$PATH</code>, <code>LD_LIBRARY_PATH</code> problem.</li>
-<li>It has been reported that ignoring the driver you have downloded from otn and using
+<li>It has been reported that ignoring the driver you have downloded from otn and using
the classes12.zip file from the directory <code>$ORAHOME\jdbc\lib</code> will also work.
</li>
</ul>
@@ -680,7 +680,7 @@ obtained from a connection pool:
<subsection name="Context versus GlobalNamingResources">
<p>
Please note that although the above instructions place the JNDI declarations in a Context
- element, it is possible and sometimes desirable to place these declarations in the
+ element, it is possible and sometimes desirable to place these declarations in the
<a href="config/globalresources.html">GlobalNamingResources</a> section of the server
configuration file. A resource placed in the GlobalNamingResources section will be shared
among the Contexts of the server.
@@ -693,7 +693,7 @@ obtained from a connection pool:
defined in the <GlobalNamingResources> or <Context> section, not a datasource as renamed
using <ResourceLink>.
</p>
-</subsection>
+</subsection>
</section>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml?rev=1200133&r1=1200132&r2=1200133&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml Thu Nov 10 04:13:59 2011
@@ -37,9 +37,9 @@
<section name="Introduction">
<p>Tomcat provides a JNDI <strong>InitialContext</strong> implementation
-instance for each web application running under it, in a manner that is
-compatible with those provided by a
-<a href="http://java.sun.com/j2ee">Java Enterprise Edition</a> application
+instance for each web application running under it, in a manner that is
+compatible with those provided by a
+<a href="http://java.sun.com/j2ee">Java Enterprise Edition</a> application
server. The Java EE standard provides a standard set of elements in the
<code>/WEB-INF/web.xml</code> file to reference/define resources.</p>
@@ -108,13 +108,13 @@ element:</p>
<code><resource-ref></code> element in the web application
deployment descriptor).</li>
<li><a href="config/context.html#Resource Links"><ResourceLink></a> -
- Add a link to a resource defined in the global JNDI context. Use resource
- links to give a web application access to a resource defined in
+ Add a link to a resource defined in the global JNDI context. Use resource
+ links to give a web application access to a resource defined in
the<a href="config/globalresources.html"><GlobalNamingResources></a>
child element of the <a href="config/server.html"><Server></a>
element.</li>
<li><a href="config/context.html#Transaction"><Transaction></a> -
- Add a resource factory for instantiating the UserTransaction object
+ Add a resource factory for instantiating the UserTransaction object
instance that is available at <code>java:comp/UserTransaction</code>.</li>
</ul>
@@ -143,16 +143,16 @@ attribute to "true").</p>
<section name="Global configuration">
-<p>Tomcat maintains a separate namespace of global resources for the
-entire server. These are configured in the
+<p>Tomcat maintains a separate namespace of global resources for the
+entire server. These are configured in the
<a href="config/globalresources.html">
-<code><strong><GlobalNamingResources></strong></code></a> element of
-<code>$CATALINA_BASE/conf/server.xml</code>. You may expose these resources to
-web applications by using a
+<code><strong><GlobalNamingResources></strong></code></a> element of
+<code>$CATALINA_BASE/conf/server.xml</code>. You may expose these resources to
+web applications by using a
<a href="config/context.html#Resource Links"><ResourceLink></a> to
include it in the per-web-application context.</p>
-<p>If a resource has been defined using a
+<p>If a resource has been defined using a
<a href="config/context.html#Resource Links"><ResourceLink></a>, it is not
necessary for that resource to be defined in <code>/WEB-INF/web.xml</code>.
However, it is recommended to keep the entry in <code>/WEB-INF/web.xml</code>
@@ -376,7 +376,7 @@ writer.println("foo = " + bean.getFoo()
<p>The <code>pathname</code> attribute can be absolute or relative. If
relative, it is relative to <code>$CATALINA_BASE</code>.</p>
-
+
<p>The <code>readonly</code> attribute is optional and defaults to
<code>true</code> if not supplied. If the XML is writeable then it will be
written to when Tomcat starts. <strong>WARNING:</strong> When the file is
@@ -513,7 +513,7 @@ Transport.send(message);
</p>
<h3>5. Restart Tomcat</h3>
-
+
<p>For the additional JAR to be visible to Tomcat, it is necessary for the
Tomcat instance to be restarted.</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org