February 2013 - jbossweb-commits - Jboss List Archives

JBossWeb SVN: r2163 - in tags/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10636/java/org: apache/catalina/connector and 3 other directories.

by jbossweb-commits＠lists.jboss.org

Author: bmaxwell Date: 2013-02-12 19:58:42 -0500 (Tue, 12 Feb 2013) New Revision: 2163 Modified: tags/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10636/java/org/apache/InstanceManager.java tags/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10636/java/org/apache/catalina/connector/Request.java tags/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10636/java/org/apache/catalina/deploy/InjectionTarget.java tags/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10636/java/org/apache/jasper/runtime/InstanceManagerFactory.java tags/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10636/java/org/jboss/web/rewrite/RewriteValve.java Log: [JBPAPP-10636] backport fix for After RewriteValve has rewritten the context path, HttpServletRequest.getRequestURI() still returns the original URI. Modified: tags/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10636/java/org/apache/InstanceManager.java =================================================================== --- tags/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10636/java/org/apache/InstanceManager.java 2013-02-13 00:11:14 UTC (rev 2162) +++ tags/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10636/java/org/apache/InstanceManager.java 2013-02-13 00:58:42 UTC (rev 2163) @@ -25,7 +25,7 @@ import javax.naming.NamingException; /** - * @version $Rev:$ $Date:$ + * @version $Rev$ $Date$ */ public interface InstanceManager { Modified: tags/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10636/java/org/apache/catalina/connector/Request.java =================================================================== --- tags/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10636/java/org/apache/catalina/connector/Request.java 2013-02-13 00:11:14 UTC (rev 2162) +++ tags/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10636/java/org/apache/catalina/connector/Request.java 2013-02-13 00:58:42 UTC (rev 2163) @@ -2543,7 +2543,8 @@ if (context.getLogger().isDebugEnabled()) { context.getLogger().debug("Post too large"); } - return; + throw new IllegalArgumentException("MERDE"); + // return; } byte[] formData = null; if (len < CACHED_POST_LEN) { Modified: tags/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10636/java/org/apache/catalina/deploy/InjectionTarget.java =================================================================== --- tags/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10636/java/org/apache/catalina/deploy/InjectionTarget.java 2013-02-13 00:11:14 UTC (rev 2162) +++ tags/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10636/java/org/apache/catalina/deploy/InjectionTarget.java 2013-02-13 00:58:42 UTC (rev 2163) @@ -21,7 +21,7 @@ package org.apache.catalina.deploy; /** - * @version $Rev:$ $Date:$ + * @version $Rev$ $Date$ */ public class InjectionTarget { private String targetClass; Modified: tags/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10636/java/org/apache/jasper/runtime/InstanceManagerFactory.java =================================================================== --- tags/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10636/java/org/apache/jasper/runtime/InstanceManagerFactory.java 2013-02-13 00:11:14 UTC (rev 2162) +++ tags/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10636/java/org/apache/jasper/runtime/InstanceManagerFactory.java 2013-02-13 00:58:42 UTC (rev 2163) @@ -25,7 +25,7 @@ import org.apache.InstanceManager; /** - * @version $Rev:$ $Date:$ + * @version $Rev$ $Date$ */ public class InstanceManagerFactory { Modified: tags/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10636/java/org/jboss/web/rewrite/RewriteValve.java =================================================================== --- tags/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10636/java/org/jboss/web/rewrite/RewriteValve.java 2013-02-13 00:11:14 UTC (rev 2162) +++ tags/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10636/java/org/jboss/web/rewrite/RewriteValve.java 2013-02-13 00:58:42 UTC (rev 2163) @@ -426,6 +426,7 @@ urlString = urlString.substring(0, queryIndex); } // Set the new URL + request.getCoyoteRequest().requestURI().setString(null); CharChunk chunk = request.getCoyoteRequest().requestURI().getCharChunk(); chunk.recycle(); if (context) { @@ -435,6 +436,7 @@ request.getCoyoteRequest().requestURI().toChars(); // Set the new Query if there is one if (queryString != null) { + request.getCoyoteRequest().queryString().setString(null); chunk = request.getCoyoteRequest().queryString().getCharChunk(); chunk.recycle(); chunk.append(queryString); @@ -442,6 +444,7 @@ } // Set the new host if it changed if (!host.equals(request.getServerName())) { + request.getCoyoteRequest().serverName().setString(null); chunk = request.getCoyoteRequest().serverName().getCharChunk(); chunk.recycle(); chunk.append(host.toString());

11 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2162 - tags.

by jbossweb-commits＠lists.jboss.org

Author: bmaxwell Date: 2013-02-12 19:11:14 -0500 (Tue, 12 Feb 2013) New Revision: 2162 Added: tags/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10636/ Log: [JBPAPP-10636] create one off patch branch

11 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2161 - branches/2.1.x/java/org/apache/catalina/connector.

by jbossweb-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-02-11 06:57:16 -0500 (Mon, 11 Feb 2013) New Revision: 2161 Modified: branches/2.1.x/java/org/apache/catalina/connector/Request.java Log: Oops test code... Modified: branches/2.1.x/java/org/apache/catalina/connector/Request.java =================================================================== --- branches/2.1.x/java/org/apache/catalina/connector/Request.java 2013-02-11 10:59:30 UTC (rev 2160) +++ branches/2.1.x/java/org/apache/catalina/connector/Request.java 2013-02-11 11:57:16 UTC (rev 2161) @@ -2543,8 +2543,7 @@ if (context.getLogger().isDebugEnabled()) { context.getLogger().debug("Post too large"); } - throw new IllegalArgumentException("MERDE"); - // return; + return; } byte[] formData = null; if (len < CACHED_POST_LEN) {

11 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2160 - in branches/2.1.x/java/org: jboss/web/rewrite and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-02-11 05:59:30 -0500 (Mon, 11 Feb 2013) New Revision: 2160 Modified: branches/2.1.x/java/org/apache/catalina/connector/Request.java branches/2.1.x/java/org/jboss/web/rewrite/RewriteValve.java Log: Make sure all the strings are reset (thank Kyle Lape). Modified: branches/2.1.x/java/org/apache/catalina/connector/Request.java =================================================================== --- branches/2.1.x/java/org/apache/catalina/connector/Request.java 2013-02-11 10:57:28 UTC (rev 2159) +++ branches/2.1.x/java/org/apache/catalina/connector/Request.java 2013-02-11 10:59:30 UTC (rev 2160) @@ -2543,7 +2543,8 @@ if (context.getLogger().isDebugEnabled()) { context.getLogger().debug("Post too large"); } - return; + throw new IllegalArgumentException("MERDE"); + // return; } byte[] formData = null; if (len < CACHED_POST_LEN) { Modified: branches/2.1.x/java/org/jboss/web/rewrite/RewriteValve.java =================================================================== --- branches/2.1.x/java/org/jboss/web/rewrite/RewriteValve.java 2013-02-11 10:57:28 UTC (rev 2159) +++ branches/2.1.x/java/org/jboss/web/rewrite/RewriteValve.java 2013-02-11 10:59:30 UTC (rev 2160) @@ -426,6 +426,7 @@ urlString = urlString.substring(0, queryIndex); } // Set the new URL + request.getCoyoteRequest().requestURI().setString(null); CharChunk chunk = request.getCoyoteRequest().requestURI().getCharChunk(); chunk.recycle(); if (context) { @@ -435,6 +436,7 @@ request.getCoyoteRequest().requestURI().toChars(); // Set the new Query if there is one if (queryString != null) { + request.getCoyoteRequest().queryString().setString(null); chunk = request.getCoyoteRequest().queryString().getCharChunk(); chunk.recycle(); chunk.append(queryString); @@ -442,6 +444,7 @@ } // Set the new host if it changed if (!host.equals(request.getServerName())) { + request.getCoyoteRequest().serverName().setString(null); chunk = request.getCoyoteRequest().serverName().getCharChunk(); chunk.recycle(); chunk.append(host.toString());

11 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2159 - branches/7.2.x/src/main/java/org/jboss/web/rewrite.

by jbossweb-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-02-11 05:57:28 -0500 (Mon, 11 Feb 2013) New Revision: 2159 Modified: branches/7.2.x/src/main/java/org/jboss/web/rewrite/RewriteValve.java Log: Make sure the string (StringCache) is reset too. Modified: branches/7.2.x/src/main/java/org/jboss/web/rewrite/RewriteValve.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/rewrite/RewriteValve.java 2013-02-11 10:14:15 UTC (rev 2158) +++ branches/7.2.x/src/main/java/org/jboss/web/rewrite/RewriteValve.java 2013-02-11 10:57:28 UTC (rev 2159) @@ -429,6 +429,7 @@ urlString = urlString.substring(0, queryIndex); } // Set the new URL + request.getCoyoteRequest().requestURI().setString(null); CharChunk chunk = request.getCoyoteRequest().requestURI().getCharChunk(); chunk.recycle(); if (context) {

11 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2158 - in branches/7.2.x/webapps/docs: config and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-02-11 05:14:15 -0500 (Mon, 11 Feb 2013) New Revision: 2158 Modified: branches/7.2.x/webapps/docs/config/context.xml branches/7.2.x/webapps/docs/tomcat-docs.xsl Log: Arrange docs. Modified: branches/7.2.x/webapps/docs/config/context.xml =================================================================== --- branches/7.2.x/webapps/docs/config/context.xml 2013-02-07 13:17:05 UTC (rev 2157) +++ branches/7.2.x/webapps/docs/config/context.xml 2013-02-11 10:14:15 UTC (rev 2158) @@ -7,7 +7,7 @@ &project; <properties> - <author email="craigmcc(a)apache.org">Craig R. McClanahan</author> + <author email="jfclere(a)gmail.com">Jean-Frederic Clere</author> <title>The Context Container</title> </properties> @@ -43,58 +43,10 @@ web application for this virtual host, and is used to process all requests that do not match any other Context's context path. - For JBoss Web, unlike Tomcat 4.x, it is NOT recommended to place - <Context> elements directly in the server.xml file. This - is because it makes modifing the Context configuration - more invasive since the main <code>conf/server.xml</code> file cannot be - reloaded without restarting JBoss Web. + In AS7 the file context.xml is ignored + Most of the old context.xml configuration has been moved to + jboss-web.xml (See <a href="../appdev/jbossweb.html"> jboss-web.xml</a>). - Context elements may be explicitly defined: - <ul> - <li>In the <code>$CATALINA_BASE/conf/context.xml</code> file: - the Context element information will be loaded by all webapps.</li> - <li>In the - <code>$CATALINA_BASE/conf/[enginename]/[hostname]/context.xml.default</code> - file: the Context element information will be loaded by all webapps of that - host.</li> - <li>In individual files (with a ".xml" extension) in the - <code>$CATALINA_BASE/conf/[enginename]/[hostname]/</code> directory. - The name of the file (less the .xml extension) will be used as the - context path. Multi-level context paths may be defined using #, e.g. - <code>foo#bar.xml</code> for a context path of <code>/foo/bar</code>. The - default web application may be defined by using a file called - <code>ROOT.xml</code>.</li> - <li>Only if a context file does not exist for the application in the - <code>$CATALINA_BASE/conf/[enginename]/[hostname]/</code>, in an individual - file at <code>/META-INF/context.xml</code> inside the application files. If - the web application is packaged as a WAR then - <code>/META-INF/context.xml</code> will be copied to - <code>$CATALINA_BASE/conf/[enginename]/[hostname]/</code> and renamed to - match the application's context path. Once this file exists, it will not be - replaced if a new WAR with a newer <code>/META-INF/context.xml</code> is - placed in the host's appBase.</li> - <li>Inside a <a href="host.html">Host</a> element in the main - <code>conf/server.xml</code>.</li> - </ul> - - - In addition to explicitly specified Context elements, there are - several techniques by which Context elements can be created automatically - for you. See <a href="host.html#Automatic Application Deployment"> - Automatic Application Deployment</a> and - <a href="host.html#User Web Applications">User Web Applications</a> - for more information. - - <blockquote> - The description below uses the variable name $CATALINA_HOME - to refer to the directory into which you have installed JBoss Web, - and is the base directory against which most relative paths are - resolved. However, if you have configured Tomcat for multiple - instances by setting a CATALINA_BASE directory, you should use - $CATALINA_BASE instead of $CATALINA_HOME for each of these - references. - </blockquote> - </section> @@ -118,63 +70,40 @@ the thread will invoke the backgroundProcess method on this host and all its child containers. A context will use background processing to perform session expiration and class monitoring for - reloading. If not specified, the default value for this attribute is - -1, which means the context will rely on the background processing - thread of its parent host. + reloading. The value of this attribut is 10 seconds. </attribute> <attribute name="className" required="false"> Java class name of the implementation to use. This class must implement the <code>org.apache.catalina.Context</code> interface. - If not specified, the standard value (defined below) will be used. + org.apache.catalina.core.StandardContext is used. </attribute> <attribute name="cookies" required="false"> - Set to <code>true</code> if you want cookies to be used for - session identifier communication if supported by the client (this - is the default). Set to <code>false</code> if you want to disable - the use of cookies for session identifier communication, and rely - only on URL rewriting by the application. + To control the cookies use <code>session-config</code> + in web.xml </attribute> <attribute name="crossContext" required="false"> - Set to <code>true</code> if you want calls within this application + Use <code>disable-cross-context</code> in jboss-web.xml + Set to <code>false</code> if you want calls within this application to <code>ServletContext.getContext()</code> to successfully return a request dispatcher for other web applications running on this virtual - host. Set to <code>false</code> (the default) in security + host. Set to <code>true</code> (the default) in security conscious environments, to make <code>getContext()</code> always return <code>null</code>. </attribute> - <attribute name="docBase" required="true"> - The Document Base (also known as the Context - Root) directory for this web application, or the pathname - to the web application archive file (if this web application is - being executed directly from the WAR file). You may specify - an absolute pathname for this directory or WAR file, or a pathname - that is relative to the <code>appBase</code> directory of the - owning <a href="host.html">Host</a>. + <attribute name="docBase" required="false"> + Can't be changed in AS7 </attribute> <attribute name="override" required="false"> - Set to <code>true</code> to have explicit settings in this - Context element override any corresponding settings in either the global - or <a href="host.html">Host</a> default contexts. By default, settings - from a default context will be used. - If a symbolic link is used for docBase then changes to the - symbolic link will only be effective after a JBoss Web restart or - by undeploying and redeploying the conext. A context reload is not - sufficient. + Not supported in AS7 </attribute> <attribute name="privileged" required="false"> - Set to <code>true</code> to allow this context to use container - servlets, like the manager servlet. Use of the <code>privileged</code> - attribute will change the context's parent class loader to be the - Server class loader rather than the Shared class - loader. Note that in a default installation, the Common class - loader is used for both the Server and the Shared - class loaders. + Not supported in AS7 </attribute> <attribute name="path" required="false"> @@ -184,10 +113,8 @@ within a particular <a href="host.html">Host</a> must be unique. If you specify a context path of an empty string (""), you are defining the default web application for this Host, which - will process all requests not assigned to other Contexts. The value of - this field must not be set except when statically defining a Context in - server.xml, as it will be inferred from the filenames used for either the - .xml context file or the docBase. + will process all requests not assigned to other Contexts. + Use <code>context-root</code> in jboss-web.xml to configure that in AS7. </attribute> <attribute name="reloadable" required="false"> @@ -196,17 +123,16 @@ changes, and automatically reload the web application if a change is detected. This feature is very useful during application development, but it requires significant runtime overhead and is - not recommended for use on deployed production applications. That's - why the default setting for this attribute is false. You - can use the <a href="../manager-howto.html">Manager</a> web - application, however, to trigger reloads of deployed applications - on demand. + not recommended for use on deployed production applications. + In AS7 you can use use the <code>deployment-scanner</code> in standalone.xml + or <code>development</code> in the jsp-configuration element inside the + subsystem=web element. </attribute> <attribute name="wrapperClass" required="false"> Java class name of the <code>org.apache.catalina.Wrapper</code> implementation class that will be used for servlets managed by this - Context. If not specified, a standard default value will be used. + Context. <code>org.apache.catalina.core.StandardWrapper</code> is used. </attribute> </attributes> @@ -224,6 +150,7 @@ <attributes> <attribute name="allowLinking" required="false"> + Actually not supported in AS7 If the value of this flag is <code>true</code>, symlinks will be allowed inside the web application, pointing to resources outside the web application base path. If not specified, the default value @@ -235,51 +162,29 @@ </attribute> <attribute name="antiJARLocking" required="false"> - If true, the JBoss Web classloader will take extra measures to avoid - JAR file locking when resources are accessed inside JARs through URLs. - This will impact startup time of applications, but could prove to be useful - on platforms or configurations where file locking can occur. - If not specified, the default value is <code>false</code>. + Not supported in AS7 </attribute> <attribute name="antiResourceLocking" required="false"> - If true, JBoss Web will prevent any file locking. - This will significantly impact startup time of applications, - but allows full webapp hot deploy and undeploy on platforms - or configurations where file locking can occur. - If not specified, the default value is <code>false</code>. - - Please note that setting this to <code>true</code> has some side effects, - including the disabling of JSP reloading in a running server: see - <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=37668">Bugzilla 37668</a>. - - - - Please note that setting this flag to true in applications that are - outside the appBase for the Host (the <code>webapps</code> directory - by default) will cause the application to be - deleted on JBoss Web shutdown. You probably don't want to - do this, so think twice before setting antiResourceLocking=true on a webapp - that's outside the appBase for its Host. - + Not supported in AS7 </attribute> <attribute name="cacheMaxSize" required="false"> Maximum size of the static resource cache in kilobytes. - If not specified, the default value is <code>10240</code> - (10 megabytes). + The default value is <code>10240</code> + (10 megabytes) is used in AS7. </attribute> <attribute name="cacheTTL" required="false"> Amount of time in milliseconds between cache entries revalidation. - If not specified, the default value is <code>5000</code> - (5 seconds). + The default value is <code>5000</code> + (5 seconds) is used in AS7. </attribute> <attribute name="cachingAllowed" required="false"> If the value of this flag is <code>true</code>, the cache for static - resources will be used. If not specified, the default value - of the flag is <code>true</code>. + resources will be used. + The default value <code>true</code> is used in AS7. </attribute> <attribute name="caseSensitive" required="false"> @@ -289,55 +194,41 @@ NOTE: This flag MUST NOT be set to false on the Windows platform (or any other OS which does not have a case sensitive filesystem), as it will disable case sensitivity checks, allowing JSP source code - disclosure, among other security problems. + disclosure, among other security problems. + The default value <code>true</code> is used in AS7. </attribute> <attribute name="processTlds" required="false"> Whether the context should process TLDs on startup. The default is true. The false setting is intended for special cases - that know in advance TLDs are not part of the webapp. + that know in advance TLDs are not part of the webapp. + The default value <code>true</code> is used in AS7. </attribute> <attribute name="swallowOutput" required="false"> - If the value of this flag is <code>true</code>, the bytes output to - System.out and System.err by the web application will be redirected to - the web application logger. If not specified, the default value - of the flag is <code>false</code>. + Not supported in AS7. The outputs go to server.log file </attribute> <attribute name="tldNamespaceAware" required="false"> - If the value of this flag is <code>true</code>, the TLD files - XML validation will be namespace-aware. If you turn this flag on, - you should probably also turn <code>tldValidation</code> on. The - default value for this flag is <code>false</code>, and setting it - to true will incur a performance penalty. - + Not supported in AS7 </attribute> <attribute name="tldValidation" required="false"> - If the value of this flag is <code>true</code>, the TLD files - will be XML validated on context startup. The default value for - this flag is <code>false</code>, and setting it to true will incur - a performance penalty. + Not supported in AS7 </attribute> <attribute name="unloadDelay" required="false"> - Amount of ms that the container will wait for servlets to unload. - If not specified, the default value of the flag is <code>2000</code> - ms. + Not supported in AS7 </attribute> <attribute name="unpackWAR" required="false"> - If true, JBoss Web will unpack all compressed web applications before - running them. - If not specified, the default value is <code>true</code>. + Not supported in AS7 + AS7 will unpack all compressed web applications before + running them. </attribute> <attribute name="useNaming" required="false"> - Set to <code>true</code> (the default) to have Catalina enable a - JNDI <code>InitialContext</code> for this web application that is - compatible with Java2 Enterprise Edition (J2EE) platform - conventions. + Not supported in AS7 </attribute> <attribute name="workDir" required="false"> @@ -347,8 +238,8 @@ web application by a servlet context attribute (of type <code>java.io.File</code>) named <code>javax.servlet.context.tempdir</code> as described in the - Servlet Specification. If not specified, a suitable directory - underneath <code>$CATALINA_HOME/work</code> will be provided. + Servlet Specification. + In AS7 something like <code>standalone/tmp/work/jboss.web</code> is used. </attribute> </attributes> @@ -358,443 +249,16 @@ </section> - -<section name="Nested Components"> - - You can nest at most one instance of the following utility components - by nesting a corresponding element inside your Context - element: - <ul> - <li><a href="loader.html">Loader</a> - - Configure the web application class loader that will be used to load - servlet and bean classes for this web application. Normally, the - default configuration of the class loader will be sufficient.</li> - <li><a href="manager.html">Manager</a> - - Configure the session manager that will be used to create, destroy, - and persist HTTP sessions for this web application. Normally, the - default configuration of the session manager will be sufficient.</li> - <li><a href="realm.html">Realm</a> - - Configure a realm that will allow its - database of users, and their associated roles, to be utilized solely - for this particular web application. If not specified, this web - application will utilize the Realm associated with the owning - <a href="host.html">Host</a> or <a href="engine.html">Engine</a>.</li> - <li><a href="resources.html">Resources</a> - - Configure the resource manager that will be used to access the static - resources associated with this web application. Normally, the - default configuration of the resource manager will be sufficient.</li> - <li>WatchedResource - The auto deployer will monitor the - specified static resource of the web application for updates, and will - reload the web application if is is updated. The content of this element - must be a string.</li> - </ul> - -</section> - - <section name="Special Features"> - <subsection name="Logging"> + <subsection name="jboss-web.xml"> - A context is associated with the - <code>org.apache.catalina.core.ContainerBase.[enginename].[hostname].[path]</code> - log category. Note that the brackets are actually part of the name, don't omit them. + In AS7 most of the feature of <code>context.xml</code> are now in <code>jboss-web.xml</code>. + See <a href="./appdev/jbossweb.html">jboss-web.xml</a> for more information. </subsection> - - <subsection name="Access Logs"> - - When you run a web server, one of the output files normally generated - is an access log, which generates one line of information for - each request processed by the server, in a standard format. Catalina - includes an optional <a href="valve.html">Valve</a> implementation that - can create access logs in the same standard format created by web servers, - or in any number of custom formats. - - You can ask Catalina to create an access log for all requests - processed by an <a href="engine.html">Engine</a>, - <a href="host.html">Host</a>, or <a href="context.html">Context</a> - by nesting a <a href="valve.html">Valve</a> element like this: - -<source> -<Context path="/examples" ...> - ... - <Valve className="org.apache.catalina.valves.AccessLogValve" - prefix="localhost_access_log." suffix=".txt" - pattern="common"/> - ... -</Context> -</source> - - See <a href="valve.html#Access Log Valve">Access Log Valve</a> - for more information on the configuration attributes that are - supported. - - </subsection> - - - <subsection name="Automatic Context Configuration"> - - If you use the standard Context implementation, - the following configuration steps occur automtically when Catalina - is started, or whenever this web application is reloaded. No special - configuration is required to enable this feature. - - <ul> - <li>If you have not declared your own <a href="loader.html">Loader</a> - element, a standard web application class loader will be configured. - </li> - <li>If you have not declared your own <a href="manager.html">Manager</a> - element, a standard session manager will be configured.</li> - <li>If you have not declared your own <a href="resources.html">Resources</a> - element, a standard resources manager will be configured.</li> - <li>The web application properties listed in <code>conf/web.xml</code> - will be processed as defaults for this web application. This is used - to establish default mappings (such as mapping the <code>*.jsp</code> - extension to the corresponding JSP servlet), and other standard - features that apply to all web applications.</li> - <li>The web application properties listed in the - <code>/WEB-INF/web.xml</code> resource for this web application - will be processed (if this resource exists).</li> - <li>If your web application has specified security constraints that might - require user authentication, an appropriate Authenticator that - implements the login method you have selected will be configured.</li> - </ul> - - </subsection> - - - <subsection name="Context Parameters"> - - You can configure named values that will be made visible to the - web application as servlet context initialization parameters by nesting - <code><Parameter></code> elements inside this element. For - example, you can create an initialization parameter like this: -<source> -<Context ...> - ... - <Parameter name="companyName" value="My Company, Incorporated" - override="false"/> - ... -</Context> -</source> - - This is equivalent to the inclusion of the following element in the - web application deployment descriptor (<code>/WEB-INF/web.xml</code>): - -<source> -<context-param> - <param-name>companyName</param-name> - <param-value>My Company, Incorporated</param-value> -</context-param> -</source> - but does not require modification of the deployment descriptor - to customize this value. - - The valid attributes for a <code><Parameter></code> element - are as follows: - - <attributes> - - <attribute name="description" required="false"> - Optional, human-readable description of this context - initialization parameter. - </attribute> - - <attribute name="name" required="true"> - The name of the context initialization parameter to be created. - </attribute> - - <attribute name="override" required="false"> - Set this to <code>false</code> if you do not want - a <code><context-param></code> for the same parameter name, - found in the web application deployment descriptor, to override the - value specified here. By default, overrides are allowed. - </attribute> - - <attribute name="value" required="true"> - The parameter value that will be presented to the application - when requested by calling - <code>ServletContext.getInitParameter()</code>. - </attribute> - - </attributes> - - </subsection> - - - <subsection name="Environment Entries"> - - You can configure named values that will be made visible to the - web application as environment entry resources, by nesting - <code><Environment></code> entries inside this element. For - example, you can create an environment entry like this: -<source> -<Context ...> - ... - <Environment name="maxExemptions" value="10" - type="java.lang.Integer" override="false"/> - ... -</Context> -</source> - - This is equivalent to the inclusion of the following element in the - web application deployment descriptor (<code>/WEB-INF/web.xml</code>): - -<source> -<env-entry> - <env-entry-name>maxExemptions</param-name> - <env-entry-value>10</env-entry-value> - <env-entry-type>java.lang.Integer</env-entry-type> -</env-entry> -</source> - but does not require modification of the deployment descriptor - to customize this value. - - The valid attributes for an <code><Environment></code> element - are as follows: - - <attributes> - - <attribute name="description" required="false"> - Optional, human-readable description of this environment entry. - </attribute> - - <attribute name="name" required="true"> - The name of the environment entry to be created, relative to the - <code>java:comp/env</code> context. - </attribute> - - <attribute name="override" required="false"> - Set this to <code>false</code> if you do not want - an <code><env-entry></code> for the same environment entry name, - found in the web application deployment descriptor, to override the - value specified here. By default, overrides are allowed. - </attribute> - - <attribute name="type" required="true"> - The fully qualified Java class name expected by the web application - for this environment entry. Must be one of the legal values for - <code><env-entry-type></code> in the web application deployment - descriptor: <code>java.lang.Boolean</code>, - <code>java.lang.Byte</code>, <code>java.lang.Character</code>, - <code>java.lang.Double</code>, <code>java.lang.Float</code>, - <code>java.lang.Integer</code>, <code>java.lang.Long</code>, - <code>java.lang.Short</code>, or <code>java.lang.String</code>. - </attribute> - - <attribute name="value" required="true"> - The parameter value that will be presented to the application - when requested from the JNDI context. This value must be convertable - to the Java type defined by the <code>type</code> attribute. - </attribute> - - </attributes> - - </subsection> - - - <subsection name="Lifecycle Listeners"> - - If you have implemented a Java object that needs to know when this - Context is started or stopped, you can declare it by - nesting a Listener element inside this element. The - class name you specify must implement the - <code>org.apache.catalina.LifecycleListener</code> interface, and - it will be notified about the occurrence of the coresponding - lifecycle events. Configuration of such a listener looks like this: - -<source> -<Context path="/examples" ...> - ... - <Listener className="com.mycompany.mypackage.MyListener" ... > - ... -</Context> -</source> - - Note that a Listener can have any number of additional properties - that may be configured from this element. Attribute names are matched - to corresponding JavaBean property names using the standard property - method naming patterns. - - </subsection> - - - <subsection name="Request Filters"> - - You can ask Catalina to check the IP address, or host name, on every - incoming request directed to the surrounding - <a href="engine.html">Engine</a>, <a href="host.html">Host</a>, or - <a href="context.html">Context</a> element. The remote address or name - will be checked against a configured list of "accept" and/or "deny" - filters, which are defined using the Regular Expression syntax supported - by the <a href="http://jakarta.apache.org/regexp/">Jakarta Regexp</a> - regular expression library. Requests that come from locations that are - not accepted will be rejected with an HTTP "Forbidden" error. - Example filter declarations: - -<source> -<Context path="/examples" ...> - ... - <Valve className="org.apache.catalina.valves.RemoteHostValve" - allow="*.mycompany.com,www.yourcompany.com"/> - <Valve className="org.apache.catalina.valves.RemoteAddrValve" - deny="192.168.1.*"/> - ... -</Context> -</source> - - See <a href="valve.html#Remote Address Filter">Remote Address Filter</a> - and <a href="valve.html#Remote Host Filter">Remote Host Filter</a> for - more information about the configuration options that are supported. - - </subsection> - - - <subsection name="Resource Definitions"> - - You can declare the characteristics of the resource - to be returned for JNDI lookups of <code><resource-ref></code> and - <code><resource-env-ref></code> elements in the web application - deployment descriptor. You MUST also define - the needed resource parameters as attributes of the <code>Resource</code> - element, to configure the object factory to be used (if not known to JBoss Web - already), and the properties used to configure that object factory. - - For example, you can create a resource definition like this: -<source> -<Context ...> - ... - <Resource name="jdbc/EmployeeDB" auth="Container" - type="javax.sql.DataSource" - description="Employees Database for HR Applications"/> - ... -</Context> -</source> - - This is equivalent to the inclusion of the following element in the - web application deployment descriptor (<code>/WEB-INF/web.xml</code>): -<source> -<resource-ref> - <description>Employees Database for HR Applications</description> - <res-ref-name>jdbc/EmployeeDB</res-ref-name> - <res-ref-type>javax.sql.DataSource</res-ref-type> - <res-auth>Container</res-auth> -</resource-ref> -</source> - - but does not require modification of the deployment - descriptor to customize this value. - - The valid attributes for a <code><Resource></code> element - are as follows: - - <attributes> - - <attribute name="auth" required="false"> - Specify whether the web Application code signs on to the - corresponding resource manager programatically, or whether the - Container will sign on to the resource manager on behalf of the - application. The value of this attribute must be - <code>Application</code> or <code>Container</code>. This - attribute is required if the web application - will use a <code><resource-ref></code> element in the web - application deployment descriptor, but is optional if the - application uses a <code><resource-env-ref></code> instead. - </attribute> - - <attribute name="description" required="false"> - Optional, human-readable description of this resource. - </attribute> - - <attribute name="name" required="true"> - The name of the resource to be created, relative to the - <code>java:comp/env</code> context. - </attribute> - - <attribute name="scope" required="false"> - Specify whether connections obtained through this resource - manager can be shared. The value of this attribute must be - <code>Shareable</code> or <code>Unshareable</code>. By default, - connections are assumed to be shareable. - </attribute> - - <attribute name="type" required="true"> - The fully qualified Java class name expected by the web - application when it performs a lookup for this resource. - </attribute> - - </attributes> - - - </subsection> - - - <subsection name="Resource Links"> - - This element is used to create a link to a global JNDI resource. Doing - a JNDI lookup on the link name will then return the linked global - resource. - - For example, you can create a resource link like this: -<source> -<Context ...> - ... - <ResourceLink name="linkToGlobalResource" - global="simpleValue" - type="java.lang.Integer" - ... -</Context> -</source> - - The valid attributes for a <code><ResourceLink></code> element - are as follows: - - <attributes> - - <attribute name="global" required="true"> - The name of the linked global resource in the - global JNDI context. - </attribute> - - <attribute name="name" required="true"> - The name of the resource link to be created, relative to the - <code>java:comp/env</code> context. - </attribute> - - <attribute name="type" required="true"> - The fully qualified Java class name expected by the web - application when it performs a lookup for this resource link. - </attribute> - - </attributes> - - </subsection> - - <subsection name="Transaction"> - - You can declare the characteristics of the UserTransaction - to be returned for JNDI lookup for <code>java:comp/UserTransaction</code>. - You MUST define an object factory class to instantiate - this object as well as the needed resource parameters as attributes of the - <code>Transaction</code> - element, and the properties used to configure that object factory. - - The valid attributes for the <code><Transaction></code> element - are as follows: - - <attributes> - - <attribute name="factory" required="true"> - The class name for the JNDI object factory. - </attribute> - - </attributes> - - </subsection> - </section> Modified: branches/7.2.x/webapps/docs/tomcat-docs.xsl =================================================================== --- branches/7.2.x/webapps/docs/tomcat-docs.xsl 2013-02-07 13:17:05 UTC (rev 2157) +++ branches/7.2.x/webapps/docs/tomcat-docs.xsl 2013-02-11 10:14:15 UTC (rev 2158) @@ -133,7 +133,7 @@ </div> <xsl:comment>FOOTER</xsl:comment> - <div class="footer">© 1999-2007, Apache Software Foundation. © 2007-2011 Red Hat Middleware, LLC. All Rights Reserved. </div> + <div class="footer">© 1999-2007, Apache Software Foundation. © 2007-2013 Red Hat Middleware, LLC. All Rights Reserved. </div> </div>

11 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2157 - tags.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2013-02-07 08:17:05 -0500 (Thu, 07 Feb 2013) New Revision: 2157 Added: tags/JBOSSWEB_7_2_0_FINAL/ Log: Web for AS 7.2.

11 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2156 - in branches/7.2.x: src/main/java/org/apache/catalina/connector and 1 other directories.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2013-02-05 10:56:42 -0500 (Tue, 05 Feb 2013) New Revision: 2156 Modified: branches/7.2.x/pom.xml branches/7.2.x/src/main/java/org/apache/catalina/connector/Connector.java branches/7.2.x/webapps/docs/changelog.xml Log: - Remove the connector selection logic. - Changelog update. Modified: branches/7.2.x/pom.xml =================================================================== (Binary files differ) Modified: branches/7.2.x/src/main/java/org/apache/catalina/connector/Connector.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/catalina/connector/Connector.java 2013-02-04 14:49:31 UTC (rev 2155) +++ branches/7.2.x/src/main/java/org/apache/catalina/connector/Connector.java 2013-02-05 15:56:42 UTC (rev 2156) @@ -585,7 +585,7 @@ } } else { if ("HTTP/1.1".equals(protocol) || "http".equals(protocol)) { - try { + /*try { Class.forName("java.nio.channels.CompletionHandler"); setProtocolHandlerClassName ("org.apache.coyote.http11.Http11NioProtocol"); @@ -594,7 +594,9 @@ setProtocolHandlerClassName ("org.apache.coyote.http11.Http11Protocol"); CatalinaLogger.CONNECTOR_LOGGER.usingJavaIoConnector(); - } + }*/ + setProtocolHandlerClassName + ("org.apache.coyote.http11.Http11Protocol"); } else if ("AJP/1.3".equals(protocol) || "ajp".equals(protocol)) { setProtocolHandlerClassName ("org.apache.coyote.ajp.AjpProtocol"); Modified: branches/7.2.x/webapps/docs/changelog.xml =================================================================== --- branches/7.2.x/webapps/docs/changelog.xml 2013-02-04 14:49:31 UTC (rev 2155) +++ branches/7.2.x/webapps/docs/changelog.xml 2013-02-05 15:56:42 UTC (rev 2156) @@ -16,6 +16,23 @@ <body> +<section name="JBoss Web 7.2.0.Final (remm)"> + <subsection name="General"> + <changelog> + <fix> + Switch to Eclipse JDT packaging for building. (remm) + </fix> + </changelog> + </subsection> + <subsection name="Catalina"> + <changelog> + <fix> + Remove connector selection logic based on the JDK version. (remm) + </fix> + </changelog> + </subsection> +</section> + <section name="JBoss Web 7.2.0.Beta2 (remm)"> <subsection name="Catalina"> <changelog>

11 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2155 - branches/7.2.x.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2013-02-04 09:49:31 -0500 (Mon, 04 Feb 2013) New Revision: 2155 Modified: branches/7.2.x/pom.xml Log: Switch to a real Eclipse artifact found by Fernando, that appears to work. Modified: branches/7.2.x/pom.xml =================================================================== (Binary files differ)

11 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossweb-commits February 2013