El Mejor Regalo Corporativo para tus Clientes
Si no puedes ver este mensaje da clic aqui ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? Insert your HTML code here. De acuerdo a la Ley Federal de Proteccion de Datos Personales en Posesion de los Particulares, aprobada el dia 13 de abril de 2010 en los articulos 3, Fracciones II y VII, y 33, asi como la denominacion del capitulo II, del Titulo Segundo, de la Ley Federal de Transparencia y Acceso a la Informacion Publica Gubernamental, le solicitamos amablemente que si usted no es dev@tomcat.apache.org o le gustaria darse de baja de nuestra lista de correos y no recibir mas comunicacion de nosotros, de click AQUI para su desuscripcion y borrado de nuestros registros. Le recordamos que nosotros solo promovemos valores empresariales, sin el afan de molestarle o poner en peligro sus datos, sino como un servicio de difusion y promocion, siempre bajo su consentimiento y conformidad. Se entendera que el titular consiente tacitamente el tratamiento de sus datos, cuando habiendose puesto a su disposicion el presente aviso de privacidad, no manifieste su oposicion. Agradecemos de antemano sus atenciones.
Publishing zips to the maven repo
We've been using plain Tomcat zips for creating TomEE in the OpenEJB maven build for a while now. So far that has been done by publishing the Tomcat zips to a maven repo in svn. Not the best idea to have them in svn, so we're trying to get them in the actual maven repo. It's pretty slick to be able to use the maven dependency plugin to download and unpack the zip so you can run integration tests and things like that. Arquillian does that. Or do like we do and download & unpack with the dependency plugin, then add some wars & zip up again with the maven assembly plugin. The current plan is to continue using the org.apache.openejb groupId. Do we (Tomcat) want to publish them ourselves in the org.apache.tomcat section of the repo? Not a Tomcat committer obviously, but would be happy to do the setup work so they could go up with the rest of the binaries. Thoughts? -David - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1183142 - in /tomcat/trunk/java/org/apache/catalina/startup: Constants.java ContextConfig.java LocalStrings.properties
On 14/10/2011 00:07, Konstantin Kolinko wrote: > 2011/10/14 : >> Author: markt >> Date: Thu Oct 13 22:28:22 2011 >> New Revision: 1183142 >> >> URL: http://svn.apache.org/viewvc?rev=1183142&view=rev >> Log: >> Cache the result of parsing global and host defaults for web.xml to speed up >> web application start. >> This change reduces applciation start time by ~15% with trunk and the TCK >> web apps Getting late here. I'll look at fixing the issues this change introduced tomorrow. Mark >> >> Modified: >>tomcat/trunk/java/org/apache/catalina/startup/Constants.java >>tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java >>tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties >> >> Modified: tomcat/trunk/java/org/apache/catalina/startup/Constants.java >> URL: >> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Constants.java?rev=1183142&r1=1183141&r2=1183142&view=diff >> == >> --- tomcat/trunk/java/org/apache/catalina/startup/Constants.java (original) >> +++ tomcat/trunk/java/org/apache/catalina/startup/Constants.java Thu Oct 13 >> 22:28:22 2011 >> @@ -34,7 +34,7 @@ public final class Constants { >> public static final String ApplicationContextXml = >> "META-INF/context.xml"; >> public static final String ApplicationWebXml = "/WEB-INF/web.xml"; >> public static final String DefaultContextXml = "conf/context.xml"; >> -public static final String DefaultWebXml = "conf/web.xml"; >> +public static final String DefaultWebXml = "web.xml"; >> public static final String HostContextXml = "context.xml.default"; >> public static final String HostWebXml = "web.xml.default"; > > 1. Regarding the above change to DefaultWebXml constant: > > Looking where it is used: > 1) it is returned by ContextConfig#getDefaultWebXml() > 2) ContextConfig#getGlobalWebXml() calls > a) ContextConfig#getDefaultWebXml() > b) ((StandardContext) context).getDefaultWebXml() > > so that the value could be overwritten in StandardContext. > > Javadoc for StandardContext#setDefaultContextXml() says that the value > is relative to catalina.base. This is now broken. > > > 2. Later in ContextConfig#getGlobalWebXml() : > +return new File(basePath, defaultWebXml); > and elsewhere > +return new File(basePath, resourceName); > > The above does not work if defaultWebXml is absolute. The simple jsp below > prints C:\workspace\C:\workspace on JDK 6u26 on WinXP: > <%= new java.io.File("C:\\workspace", "C:\\workspace") %> > > So absolute paths for StandardContext defaultWebXml setting are broken as > well. > > Best regards, > Konstantin Kolinko > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46264] Shutting down tomcat with large number of contexts is slow
https://issues.apache.org/bugzilla/show_bug.cgi?id=46264 Mark Thomas changed: What|Removed |Added Attachment #27769|0 |1 is obsolete|| --- Comment #26 from Mark Thomas 2011-10-13 23:19:14 UTC --- Created attachment 27772 --> https://issues.apache.org/bugzilla/attachment.cgi?id=27772 Threaded start, stop and deployment for Contexts Updated version of the patch that restores the ability to start contexts in parallel. The overhead (with the TCK webapps) of using a single thread is roughly what we have gained caching the global web.xml so users should see no change in the default config. On an 8-core machine (and with the TCK webapps) I see a 50% reduction in start time when I use 4 threads. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1183142 - in /tomcat/trunk/java/org/apache/catalina/startup: Constants.java ContextConfig.java LocalStrings.properties
2011/10/14 : > Author: markt > Date: Thu Oct 13 22:28:22 2011 > New Revision: 1183142 > > URL: http://svn.apache.org/viewvc?rev=1183142&view=rev > Log: > Cache the result of parsing global and host defaults for web.xml to speed up > web application start. > This change reduces applciation start time by ~15% with trunk and the TCK web > apps > > Modified: > tomcat/trunk/java/org/apache/catalina/startup/Constants.java > tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java > tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties > > Modified: tomcat/trunk/java/org/apache/catalina/startup/Constants.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Constants.java?rev=1183142&r1=1183141&r2=1183142&view=diff > == > --- tomcat/trunk/java/org/apache/catalina/startup/Constants.java (original) > +++ tomcat/trunk/java/org/apache/catalina/startup/Constants.java Thu Oct 13 > 22:28:22 2011 > @@ -34,7 +34,7 @@ public final class Constants { > public static final String ApplicationContextXml = "META-INF/context.xml"; > public static final String ApplicationWebXml = "/WEB-INF/web.xml"; > public static final String DefaultContextXml = "conf/context.xml"; > - public static final String DefaultWebXml = "conf/web.xml"; > + public static final String DefaultWebXml = "web.xml"; > public static final String HostContextXml = "context.xml.default"; > public static final String HostWebXml = "web.xml.default"; 1. Regarding the above change to DefaultWebXml constant: Looking where it is used: 1) it is returned by ContextConfig#getDefaultWebXml() 2) ContextConfig#getGlobalWebXml() calls a) ContextConfig#getDefaultWebXml() b) ((StandardContext) context).getDefaultWebXml() so that the value could be overwritten in StandardContext. Javadoc for StandardContext#setDefaultContextXml() says that the value is relative to catalina.base. This is now broken. 2. Later in ContextConfig#getGlobalWebXml() : +return new File(basePath, defaultWebXml); and elsewhere +return new File(basePath, resourceName); The above does not work if defaultWebXml is absolute. The simple jsp below prints C:\workspace\C:\workspace on JDK 6u26 on WinXP: <%= new java.io.File("C:\\workspace", "C:\\workspace") %> So absolute paths for StandardContext defaultWebXml setting are broken as well. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46264] Shutting down tomcat with large number of contexts is slow
https://issues.apache.org/bugzilla/show_bug.cgi?id=46264 --- Comment #25 from Mark Thomas 2011-10-13 23:04:51 UTC --- (In reply to comment #19) > Re: startStopExecutor.allowCoreThreadTimeOut(true); > > I think that just using "0" instead of getStartStopThreadsInternal() as the > value of first argument (corePoolSize) in ThreadPoolExecutor constructor will > have the same effect. It is not much of a difference though. This doesn't work since the queue is unbounded no more than one thread is every created. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1183150 - /tomcat/maven-plugin/trunk/pom.xml
Author: olamy Date: Thu Oct 13 22:36:51 2011 New Revision: 1183150 URL: http://svn.apache.org/viewvc?rev=1183150&view=rev Log: link to sonar report Modified: tomcat/maven-plugin/trunk/pom.xml Modified: tomcat/maven-plugin/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1183150&r1=1183149&r2=1183150&view=diff == --- tomcat/maven-plugin/trunk/pom.xml (original) +++ tomcat/maven-plugin/trunk/pom.xml Thu Oct 13 22:36:51 2011 @@ -527,6 +527,11 @@ findbugs-maven-plugin 2.3.2 + +org.codehaus.sonar-plugins +maven-report +0.1 + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1183149 - in /tomcat/maven-plugin/trunk: common-tomcat-maven-plugin/pom.xml pom.xml tomcat-maven-plugin-it/pom.xml tomcat6-maven-plugin/pom.xml tomcat7-maven-plugin/pom.xml
Author: olamy Date: Thu Oct 13 22:34:45 2011 New Revision: 1183149 URL: http://svn.apache.org/viewvc?rev=1183149&view=rev Log: fix project names Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml tomcat/maven-plugin/trunk/pom.xml tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml?rev=1183149&r1=1183148&r2=1183149&view=diff == --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml (original) +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml Thu Oct 13 22:34:45 2011 @@ -28,7 +28,7 @@ 2.0-SNAPSHOT common-tomcat-maven-plugin - Tomcat Maven Plugin :: Common API + Apache Tomcat Maven Plugin :: Common API Modified: tomcat/maven-plugin/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1183149&r1=1183148&r2=1183149&view=diff == --- tomcat/maven-plugin/trunk/pom.xml (original) +++ tomcat/maven-plugin/trunk/pom.xml Thu Oct 13 22:34:45 2011 @@ -30,7 +30,7 @@ org.apache.tomcat.maven tomcat-maven-plugin pom - Tomcat Maven Plugin + Apache Tomcat Maven Plugin 2.0-SNAPSHOT The Tomcat Maven Plugin provides goals to manipulate WAR projects within the Tomcat servlet container. Modified: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml?rev=1183149&r1=1183148&r2=1183149&view=diff == --- tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml (original) +++ tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml Thu Oct 13 22:34:45 2011 @@ -30,7 +30,7 @@ tomcat-maven-plugin-it jar - Tomcat Maven Plugin :: Integration Tests + Apache Tomcat Maven Plugin :: Integration Tests
svn commit: r1183147 - in /tomcat/maven-plugin/trunk: src/site/ src/site/apt/ tomcat6-maven-plugin/src/site/ tomcat6-maven-plugin/src/site/apt/
Author: olamy Date: Thu Oct 13 22:31:25 2011 New Revision: 1183147 URL: http://svn.apache.org/viewvc?rev=1183147&view=rev Log: start working on the web site Added: tomcat/maven-plugin/trunk/src/site/apt/container-goals.apt (contents, props changed) - copied, changed from r1183131, tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/container-goals.apt tomcat/maven-plugin/trunk/src/site/apt/context-goals.apt (contents, props changed) - copied, changed from r1183131, tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/context-goals.apt Removed: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/container-goals.apt tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/context-goals.apt Modified: tomcat/maven-plugin/trunk/src/site/apt/index.apt tomcat/maven-plugin/trunk/src/site/site.xml tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/site.xml Copied: tomcat/maven-plugin/trunk/src/site/apt/container-goals.apt (from r1183131, tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/container-goals.apt) URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/container-goals.apt?p2=tomcat/maven-plugin/trunk/src/site/apt/container-goals.apt&p1=tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/container-goals.apt&r1=1183131&r2=1183147&rev=1183147&view=diff == (empty) Propchange: tomcat/maven-plugin/trunk/src/site/apt/container-goals.apt -- svn:eol-style = native Propchange: tomcat/maven-plugin/trunk/src/site/apt/container-goals.apt -- svn:keywords = Author Date Id Revision Copied: tomcat/maven-plugin/trunk/src/site/apt/context-goals.apt (from r1183131, tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/context-goals.apt) URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/context-goals.apt?p2=tomcat/maven-plugin/trunk/src/site/apt/context-goals.apt&p1=tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/context-goals.apt&r1=1183131&r2=1183147&rev=1183147&view=diff == (empty) Propchange: tomcat/maven-plugin/trunk/src/site/apt/context-goals.apt -- svn:eol-style = native Propchange: tomcat/maven-plugin/trunk/src/site/apt/context-goals.apt -- svn:keywords = Author Date Id Revision Modified: tomcat/maven-plugin/trunk/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/index.apt?rev=1183147&r1=1183146&r2=1183147&view=diff == --- tomcat/maven-plugin/trunk/src/site/apt/index.apt (original) +++ tomcat/maven-plugin/trunk/src/site/apt/index.apt Thu Oct 13 22:31:25 2011 @@ -26,8 +26,21 @@ ~~ NOTE: For help with the syntax of this file, see: ~~ http://maven.apache.org/doxia/references/apt-format.html - This is the new for the Tomcat Maven Plugin (previously hosted at Codehaus). +Apache Tomcat Maven Plugin + + This is the new home for the Tomcat Maven Plugin (previously hosted at Codehaus). The version 2.0 which will support Tomcat7 is under developpement. Prior to version 2.0, tomcat mojos has been renamed to tomcat6 and tomcat7 with the same goals. + The Tomcat Maven Plugin provides goals to manipulate WAR projects within the {{{http://tomcat.apache.org/}Tomcat}} servlet container. + +* Goals Overview + + The goals for this plugin come in two categories: + + * {{{./context-goals.html}Goals to manipulate deployed projects within Tomcat}} + + * {{{./container-goals.html}Goals to obtain information from Tomcat}} + + Modified: tomcat/maven-plugin/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/site.xml?rev=1183147&r1=1183146&r2=1183147&view=diff == --- tomcat/maven-plugin/trunk/src/site/site.xml (original) +++ tomcat/maven-plugin/trunk/src/site/site.xml Thu Oct 13 22:31:25 2011 @@ -46,6 +46,8 @@ + + Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/site.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/site.xml?rev=1183147&r1=1183146&r2=1183147&view=diff == --- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/site.xml (original) +++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/site.xml Thu Oct 13 22:31:25 2011 @@ -23,8 +23,6 @@
svn commit: r1183142 - in /tomcat/trunk/java/org/apache/catalina/startup: Constants.java ContextConfig.java LocalStrings.properties
Author: markt Date: Thu Oct 13 22:28:22 2011 New Revision: 1183142 URL: http://svn.apache.org/viewvc?rev=1183142&view=rev Log: Cache the result of parsing global and host defaults for web.xml to speed up web application start. This change reduces applciation start time by ~15% with trunk and the TCK web apps Modified: tomcat/trunk/java/org/apache/catalina/startup/Constants.java tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Modified: tomcat/trunk/java/org/apache/catalina/startup/Constants.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Constants.java?rev=1183142&r1=1183141&r2=1183142&view=diff == --- tomcat/trunk/java/org/apache/catalina/startup/Constants.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/Constants.java Thu Oct 13 22:28:22 2011 @@ -34,7 +34,7 @@ public final class Constants { public static final String ApplicationContextXml = "META-INF/context.xml"; public static final String ApplicationWebXml = "/WEB-INF/web.xml"; public static final String DefaultContextXml = "conf/context.xml"; -public static final String DefaultWebXml = "conf/web.xml"; +public static final String DefaultWebXml = "web.xml"; public static final String HostContextXml = "context.xml.default"; public static final String HostWebXml = "web.xml.default"; Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1183142&r1=1183141&r2=1183142&view=diff == --- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Thu Oct 13 22:28:22 2011 @@ -43,6 +43,7 @@ import java.util.Locale; import java.util.Map; import java.util.Properties; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import javax.servlet.ServletContainerInitializer; import javax.servlet.ServletContext; @@ -172,6 +173,13 @@ public class ContextConfig protected static long deploymentCount = 0L; +/** + * Cache of default web.xml fragments per Host + */ +protected static final Map hostWebXmlCache = +new ConcurrentHashMap(); + + // - Instance Variables /** * Custom mappings of login methods to authenticators @@ -1210,7 +1218,6 @@ public class ContextConfig * web.xml file. */ protected void webConfig() { -WebXml webXml = createWebXml(); /* Anything and everything can override the global and host defaults. * This is implemented in two parts * - Handle as a web fragment that gets added after everything else so @@ -1218,34 +1225,11 @@ public class ContextConfig * - Mark Servlets as overridable so SCI configuration can replace * configuration from the defaults */ -WebXml webXmlDefaultFragment = createWebXml(); -webXmlDefaultFragment.setOverridable(true); -// Set to distributable else every app will be prevented from being -// distributable when the default fragment is merged with the main -// web.xml -webXmlDefaultFragment.setDistributable(true); -// When merging, the default welcome files are only used if the app has -// not defined any welcomes files. -webXmlDefaultFragment.setAlwaysAddWelcomeFiles(false); - -// Parse global web.xml if present -InputSource globalWebXml = getGlobalWebXmlSource(); -if (globalWebXml == null) { -// This is unusual enough to log -log.info(sm.getString("contextConfig.defaultMissing")); -} else { -parseWebXml(globalWebXml, webXmlDefaultFragment, false); -} - -// Parse host level web.xml if present -// Additive apart from welcome pages -webXmlDefaultFragment.setReplaceWelcomeFiles(true); -InputSource hostWebXml = getHostWebXmlSource(); -parseWebXml(hostWebXml, webXmlDefaultFragment, false); - Set defaults = new HashSet(); -defaults.add(webXmlDefaultFragment); - +defaults.add(getDefaultWebXmlFragment()); + +WebXml webXml = createWebXml(); + // Parse context level web.xml InputSource contextWebXml = getContextWebXmlSource(); parseWebXml(contextWebXml, webXml, false); @@ -1376,6 +1360,98 @@ public class ContextConfig } } +private WebXml getDefaultWebXmlFragment() { + +// Host should never be null +Host host = (Host) context.getParent(); + +DefaultWebXmlCacheEntry entry = hostWebXmlCache.get(
svn commit: r1183131 - /tomcat/maven-plugin/trunk/src/site/site.xml
Author: olamy Date: Thu Oct 13 22:05:01 2011 New Revision: 1183131 URL: http://svn.apache.org/viewvc?rev=1183131&view=rev Log: use a new skin for website Modified: tomcat/maven-plugin/trunk/src/site/site.xml Modified: tomcat/maven-plugin/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/site.xml?rev=1183131&r1=1183130&r2=1183131&view=diff == --- tomcat/maven-plugin/trunk/src/site/site.xml (original) +++ tomcat/maven-plugin/trunk/src/site/site.xml Thu Oct 13 22:05:01 2011 @@ -31,9 +31,9 @@ http://tomcat.apache.org/maven-plugin/ -org.apache.commons -commons-skin -2 +org.apache.maven.skins +maven-fluido-skin +1.0-SNAPSHOT - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52025] 7.0.21 and newer break the JDK 6 Service provider mechanism for loading JDBC Drivers
https://issues.apache.org/bugzilla/show_bug.cgi?id=52025 --- Comment #6 from Rick Bullotta 2011-10-13 22:01:25 UTC --- (In reply to comment #5) > I'll need to do some testing to see how well this actually worked before the > change. I have my suspicions about possible failure modes I need to check. > Depending on what the testing shows, this will / will not be treated as a > regression but either way the docs will probably end up being updated. I can reproduce fairly easily with the following scenario: Drop a couple JDBC drivers (any will do, MySQL connector and jTDS are two that we use) in the lib directly of a webapp. When an attempt is made to get a JDBC connection, in the loadInitialDrivers of the DriverManager class, it will (one time) try to get a list of JDBC drivers using the Service Provider mechanism. 7.0.20 and earlier would load and find three drivers (the two in the webapp and one built into the JVM). 7.0.21 and later do not see the drivers in the webapp. It uses the getCallerClassLoader() method to pass a classloader into the ServiceProvider stuff that is in sun.misc.Service. I'm guessing that the classloader here is obviously behaving differently - just not sure the mechanics, and it sound like you're very familiar with what's going on. LMK if you want us to test/try anything else. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-32) Allow manager url in settings.xml (via server/configuration/url)
[ https://issues.apache.org/jira/browse/MTOMCAT-32?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13126988#comment-13126988 ] Olivier Lamy commented on MTOMCAT-32: - and url is configurable tru cli: -Dmaven.tomcat.url= see http://tomcat.apache.org/maven-plugin-2.0-SNAPSHOT/tomcat6-maven-plugin/deploy-mojo.html#url > Allow manager url in settings.xml (via server/configuration/url) > > > Key: MTOMCAT-32 > URL: https://issues.apache.org/jira/browse/MTOMCAT-32 > Project: Maven 2.x Tomcat Plugin > Issue Type: Improvement >Affects Versions: 1.0-beta-1 > Environment: Windows/Apache/Tomcat/Maven2/JDK1.6 >Reporter: Steve Gillam >Priority: Minor > > URL for tomcat manager is a function of machine configuration (refelcted in > maven's settings.xml) as opposed to the project settings (as reflected in > pom.xml) > Maven's settings.xml does support > {server}{configuration}{url} http://localhost/manager > {/url}{/configuration}{/server} as used by > http://pyx4me.com/pyx4me-maven-plugins/obex-maven-plugin/ > Unfortunately, whilst not generating any errors, the tomcat plugin seems not > to look for/use it (and defaults to http://localhost:8080/manager) > Would be very useful if it did -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52025] 7.0.21 and newer break the JDK 6 Service provider mechanism for loading JDBC Drivers
https://issues.apache.org/bugzilla/show_bug.cgi?id=52025 --- Comment #5 from Mark Thomas 2011-10-13 21:50:43 UTC --- I'll need to do some testing to see how well this actually worked before the change. I have my suspicions about possible failure modes I need to check. Depending on what the testing shows, this will / will not be treated as a regression but either way the docs will probably end up being updated. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: juli.OneLineFormatter: use US locale
On 13.10.2011 14:16, Konstantin Kolinko wrote: > Hi! > > I would like to change OneLineFormatter to use US locale for its timestamp. > > The timestamp format there is "dd-MMM- HH:mm:ss" and in my case > the month name is rendered in Cyrillic. > > > The SimpleDateFormat instances are created in > org.apache.juli.DateFormatCache$Cache, so it has to be changed there. > > I think there is no need for it to be configurable the formatter (nor > I know how to make it configurable), > so I think that the locale in the Cache can be hardcoded as Locale.US. > > Are there any objections? Not from me. Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52025] 7.0.21 and newer break the JDK 6 Service provider mechanism for loading JDBC Drivers
https://issues.apache.org/bugzilla/show_bug.cgi?id=52025 --- Comment #4 from Rick Bullotta 2011-10-13 21:32:06 UTC --- Mark, thanks for the quick feedback. That does indeed seem to return it to the pre-7.0.21 behavior. That said, I still think we'd have to call it a regression issue, since it changes previous behavior and would break existing apps. It is an issue with the implementation of the JreMemoryLeakPreventionListener or just a changed behavior? (In reply to comment #1) > Try setting driverManagerProtection="false" for the > JreMemoryLeakPreventionListener in server.xml. > If I recall correctly, the service provider mechanism didn't work across > multiple web applications with different drivers anyway. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52025] 7.0.21 and newer break the JDK 6 Service provider mechanism for loading JDBC Drivers
https://issues.apache.org/bugzilla/show_bug.cgi?id=52025 --- Comment #3 from Rick Bullotta 2011-10-13 21:31:16 UTC --- Mark, thanks for the quick feedback. That does indeed seem to return it to the pre-7.0.21 behavior. That said, I still think we'd have to call it a regression issue, since it changes previous behavior and would break existing apps. It is an issue with the implementation of the JreMemoryLeakPreventionListener or just a changed behavior? -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52025] 7.0.21 and newer break the JDK 6 Service provider mechanism for loading JDBC Drivers
https://issues.apache.org/bugzilla/show_bug.cgi?id=52025 --- Comment #2 from Konstantin Kolinko 2011-10-13 21:26:09 UTC --- (In reply to comment #0) > would automatically be loaded using the JDK's service provider > mechanisms. Can you be more specific? Preferably with a step-by-step instruction on how to reproduce this. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52025] 7.0.21 and newer break the JDK 6 Service provider mechanism for loading JDBC Drivers
https://issues.apache.org/bugzilla/show_bug.cgi?id=52025 Mark Thomas changed: What|Removed |Added OS/Version||All --- Comment #1 from Mark Thomas 2011-10-13 21:24:37 UTC --- Try setting driverManagerProtection="false" for the JreMemoryLeakPreventionListener in server.xml. If I recall correctly, the service provider mechanism didn't work across multiple web applications with different drivers anyway. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52025] New: 7.0.21 and newer break the JDK 6 Service provider mechanism for loading JDBC Drivers
https://issues.apache.org/bugzilla/show_bug.cgi?id=52025 Bug #: 52025 Summary: 7.0.21 and newer break the JDK 6 Service provider mechanism for loading JDBC Drivers Product: Tomcat 7 Version: 7.0.21 Platform: PC Status: NEW Severity: regression Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: rick.bullo...@thingworx.com Classification: Unclassified In Tomcat 6 and Tomcat 7.0.20 and earlier, JDBC drivers in a web app's classpath would automatically be loaded using the JDK's service provider mechanisms. Starting with Tomcat 7.0.21, this no longer works. I suspect is has something to do with the classloader that is in effect at the time of this initialization, but not certain. It is difficult to debug, because the actual loading occurs in a Sun class sun.misc.Service, for which source is very hard to find! -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1183105 [1/2] - /tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
Author: markt Date: Thu Oct 13 21:14:16 2011 New Revision: 1183105 URL: http://svn.apache.org/viewvc?rev=1183105&view=rev Log: Fix git eol issues (should be no functional change) Sorry for the noise Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1183095 - /tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/genrsa_512.cert
Author: markt Date: Thu Oct 13 21:05:26 2011 New Revision: 1183095 URL: http://svn.apache.org/viewvc?rev=1183095&view=rev Log: Add missing eol property Modified: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/genrsa_512.cert (props changed) Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/genrsa_512.cert -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1183078 [2/2] - /tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
On 13/10/2011 21:34, ma...@apache.org wrote: > > Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=1183078&r1=1183077&r2=1183078&view=diff > == > --- tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java (original) > +++ tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java Thu Oct 13 > 20:34:49 2011 > @@ -1,2225 +1,2217 @@ > -/* > - * Licensed to the Apache Software Foundation (ASF) under one or more > - * contributor license agreements. See the NOTICE file distributed with > - * this work for additional information regarding copyright ownership. > - * The ASF licenses this file to You under the Apache License, Version 2.0 > - * (the "License"); you may not use this file except in compliance with > - * the License. You may obtain a copy of the License at > - * > - * http://www.apache.org/licenses/LICENSE-2.0 > - * > - * Unless required by applicable law or agreed to in writing, software > - * distributed under the License is distributed on an "AS IS" BASIS, > - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > - * See the License for the specific language governing permissions and > - * limitations under the License. > - */ Sorry about this. It looks like I have some line-ending issues to sort out with git and my Windows box. I thought I had sorted these all out but obviously not. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1183078 [1/2] - /tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
Author: markt Date: Thu Oct 13 20:34:49 2011 New Revision: 1183078 URL: http://svn.apache.org/viewvc?rev=1183078&view=rev Log: Re-factor merge code so it does not modify fragments to support caching of default web.xml settings Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-32) Allow manager url in settings.xml (via server/configuration/url)
[ https://issues.apache.org/jira/browse/MTOMCAT-32?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13126855#comment-13126855 ] Michael Osipov commented on MTOMCAT-32: --- Steve, what is the benefit? If I look at all other pom configs like site, deployment. All of them provider a serverId and a url. > Allow manager url in settings.xml (via server/configuration/url) > > > Key: MTOMCAT-32 > URL: https://issues.apache.org/jira/browse/MTOMCAT-32 > Project: Maven 2.x Tomcat Plugin > Issue Type: Improvement >Affects Versions: 1.0-beta-1 > Environment: Windows/Apache/Tomcat/Maven2/JDK1.6 >Reporter: Steve Gillam >Priority: Minor > > URL for tomcat manager is a function of machine configuration (refelcted in > maven's settings.xml) as opposed to the project settings (as reflected in > pom.xml) > Maven's settings.xml does support > {server}{configuration}{url} http://localhost/manager > {/url}{/configuration}{/server} as used by > http://pyx4me.com/pyx4me-maven-plugins/obex-maven-plugin/ > Unfortunately, whilst not generating any errors, the tomcat plugin seems not > to look for/use it (and defaults to http://localhost:8080/manager) > Would be very useful if it did -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51741] Eclipse WTP "Serve modules without publishing" broken with tc7, needs patch in tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=51741 --- Comment #8 from Sylvain Laurent 2011-10-13 18:32:50 UTC --- I'm still working on a patch... Actually, I think that it's really impossible to have a custom DirContext that fakes WEB-INF/classes to allow multiple virtual paths because one way or another it would return inexistent URLs. So, I started to work on a patch that would allow to specify additional paths that should be searched for annotated classes just like WEB-INF/classes. Such a configuration parameter is located on the StandardContext. With this patch, WTP could totally avoid to provide its own extensions to tomcat classes and just configure a with the new property, a with the org.apache.naming.resources.VirtualDirContext implementation and a with the org.apache.catalina.loader.VirtualWebappLoader implementation. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46264] Shutting down tomcat with large number of contexts is slow
https://issues.apache.org/bugzilla/show_bug.cgi?id=46264 --- Comment #24 from Mark Thomas 2011-10-13 15:01:23 UTC --- (In reply to comment #23) > With core pool size set to "0" in ContainerBase#initInternal I get no > concurrency at startup. It will be sequential only. If I change it back to > > startStopExecutor = new ThreadPoolExecutor(getStartStopThreadsInternal(), > getStartStopThreadsInternal(), 10, TimeUnit.SECONDS, > startStopQueue); > > I get a concurrent startup. (Startup time for my 20 dummy applications go down > from 16s to 9s) I'll take another look at that. > As ContainerBase#initInternal is also called from StandardContext, each > Context > will get its own startStopExecutor. Is this really needed? It isn't used at the moment and is likely to stay that way. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46264] Shutting down tomcat with large number of contexts is slow
https://issues.apache.org/bugzilla/show_bug.cgi?id=46264 --- Comment #23 from Felix Schumacher 2011-10-13 14:41:42 UTC --- With core pool size set to "0" in ContainerBase#initInternal I get no concurrency at startup. It will be sequential only. If I change it back to startStopExecutor = new ThreadPoolExecutor(getStartStopThreadsInternal(), getStartStopThreadsInternal(), 10, TimeUnit.SECONDS, startStopQueue); I get a concurrent startup. (Startup time for my 20 dummy applications go down from 16s to 9s) As ContainerBase#initInternal is also called from StandardContext, each Context will get its own startStopExecutor. Is this really needed? -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52024] New: Custom interceptor to support automatic failover of mirrored database
https://issues.apache.org/bugzilla/show_bug.cgi?id=52024 Bug #: 52024 Summary: Custom interceptor to support automatic failover of mirrored database Product: Tomcat Modules Version: unspecified Platform: PC OS/Version: Windows XP Status: NEW Severity: enhancement Priority: P2 Component: jdbc-pool AssignedTo: dev@tomcat.apache.org ReportedBy: chris.abrams.mob...@gmail.com Classification: Unclassified Created attachment 27771 --> https://issues.apache.org/bugzilla/attachment.cgi?id=27771 Adds a new interceptor class Custom Tomcat JDBC Pool interceptor which reconnects a JDBC Connection on failure. This was written to support automatic failover of a SQL Server database configured with database mirroring and using the Microsoft SQL Server JDBC driver, configured to support failover. It is hoped this interceptor may be more generally useful for supporting reconnection on failure but is untested on any database other than SQL Server 2008 R2. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46264] Shutting down tomcat with large number of contexts is slow
https://issues.apache.org/bugzilla/show_bug.cgi?id=46264 --- Comment #22 from Felix Schumacher 2011-10-13 13:42:01 UTC --- In ContainerBase#initInternal the ThreadPoolExecutor gets initialized with a core pool size of "0", but if we call ContainerBase#setStartStopThreads core pool size gets set to maximum pool size. Is this intended, or have I misinterpreted the code? -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1182844 - /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Author: olamy Date: Thu Oct 13 13:26:22 2011 New Revision: 1182844 URL: http://svn.apache.org/viewvc?rev=1182844&view=rev Log: fix jar path Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java?rev=1182844&r1=1182843&r2=1182844&view=diff == --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java (original) +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java Thu Oct 13 13:26:22 2011 @@ -132,7 +132,7 @@ public class DefaultClassLoaderEntriesCa } ); for (String jar : jars) { -classLoaderEntries.add( new File( jar ).toURI().toString() ); +classLoaderEntries.add( new File(libsDirectory, jar ).toURI().toString() ); } } File classesDirectory = new File( tmpDir, "WEB-INF/classes" ); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46264] Shutting down tomcat with large number of contexts is slow
https://issues.apache.org/bugzilla/show_bug.cgi?id=46264 Mark Thomas changed: What|Removed |Added Attachment #27767|0 |1 is obsolete|| --- Comment #21 from Mark Thomas 2011-10-13 12:46:23 UTC --- Created attachment 27769 --> https://issues.apache.org/bugzilla/attachment.cgi?id=27769 Threaded start, stop and deployment for Contexts Updated patch that addresses review comments so far. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
juli.OneLineFormatter: use US locale
Hi! I would like to change OneLineFormatter to use US locale for its timestamp. The timestamp format there is "dd-MMM- HH:mm:ss" and in my case the month name is rendered in Cyrillic. The SimpleDateFormat instances are created in org.apache.juli.DateFormatCache$Cache, so it has to be changed there. I think there is no need for it to be configurable the formatter (nor I know how to make it configurable), so I think that the locale in the Cache can be hardcoded as Locale.US. Are there any objections? Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: DO NOT REPLY [Bug 46264] Shutting down tomcat with large number of contexts is slow
On 13/10/2011 13:10, Konstantin Kolinko wrote: > 2011/10/13 Mark Thomas : >> >>> In one place Future is used, while I think it could be Future like >>> in >>> other places. >> >> That is the difference between a callable and runnable and I think it is >> correct. At least I see errors if I try using Future there. > > Do you need Runnable in DeployDescriptor, DeployWar, DeployDirectory? > That is new code and it is Callable in other places. It is a > bikeshed question though. It was more that I didn't need callable (no exceptions are expected). I don't have a strong preference one way or the other. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1182796 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Author: markt Date: Thu Oct 13 12:12:47 2011 New Revision: 1182796 URL: http://svn.apache.org/viewvc?rev=1182796&view=rev Log: Fix copy paste error s/dir/war/ Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1182796&r1=1182795&r2=1182796&view=diff == --- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Thu Oct 13 12:12:47 2011 @@ -676,8 +676,8 @@ public class HostConfig continue; if (files[i].equalsIgnoreCase("WEB-INF")) continue; -File dir = new File(appBase, files[i]); -if (files[i].toLowerCase(Locale.ENGLISH).endsWith(".war") && dir.isFile() +File war = new File(appBase, files[i]); +if (files[i].toLowerCase(Locale.ENGLISH).endsWith(".war") && war.isFile() && !invalidWars.contains(files[i]) ) { ContextName cn = new ContextName(files[i]); @@ -693,7 +693,7 @@ public class HostConfig if (isServiced(cn.getName())) continue; -deployWAR(cn, dir); +deployWAR(cn, war); } } } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: DO NOT REPLY [Bug 46264] Shutting down tomcat with large number of contexts is slow
2011/10/13 Mark Thomas : > >> In one place Future is used, while I think it could be Future like >> in >> other places. > > That is the difference between a callable and runnable and I think it is > correct. At least I see errors if I try using Future there. Do you need Runnable in DeployDescriptor, DeployWar, DeployDirectory? That is new code and it is Callable in other places. It is a bikeshed question though. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: DO NOT REPLY [Bug 46264] Shutting down tomcat with large number of contexts is slow
On 13/10/2011 12:32, bugzi...@apache.org wrote: > https://issues.apache.org/bugzilla/show_bug.cgi?id=46264 > > --- Comment #19 from Konstantin Kolinko 2011-10-13 > 11:32:13 UTC --- > (In reply to comment #18) >> Created attachment 27767 [details] > > Re: startStopExecutor.allowCoreThreadTimeOut(true); > > I think that just using "0" instead of getStartStopThreadsInternal() as the > value of first argument (corePoolSize) in ThreadPoolExecutor constructor will > have the same effect. It is not much of a difference though. I think that is a cleaner approach. I'll make the change. > Re: Iterator> iter = results.iterator(); > > It could be rewritten as for(Future future: results) loop. Done. > In one place Future is used, while I think it could be Future like in > other places. That is the difference between a callable and runnable and I think it is correct. At least I see errors if I try using Future there. > Re: HostConfig > > I do not quite understand why to remove > "if (deploymentExists(cn.getName())) { return; }" > from the beginning of e.g. deployDescriptor() method. > > The HostConfig#deployApps() method is called every 10 seconds to perform > autodeployment (by HostConfig#check() called by HostConfig#lifecycleEvent()) > and without early return it will proceed to parsing context.xml file. It wasn't removed, it was moved to the deployDescriptors() method to prevent a thread being spawned every 10s just to call deploymentExists() and then return. I missed the other route to calling that method. deployDescriptor() deployApps(String) check(String) I'll add a call to deploymentExists() to deployApps(String) > Renaming s/dir/war/ can be done now, to slightly reduce future patch. Yep. I'll do that too. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46264] Shutting down tomcat with large number of contexts is slow
https://issues.apache.org/bugzilla/show_bug.cgi?id=46264 --- Comment #20 from Konstantin Kolinko 2011-10-13 11:40:13 UTC --- > (In reply to comment #18) > > Created attachment 27767 [details] Re: HostConfig, one more: -hostConfig.deployWar=Deploying web application archive {0} The above message should not have been removed from LocalStrings.properties file. It is used. Re: docs/config/host.xml, engine.xml: Maybe move the phrase about the default value to the end of the description. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46264] Shutting down tomcat with large number of contexts is slow
https://issues.apache.org/bugzilla/show_bug.cgi?id=46264 --- Comment #19 from Konstantin Kolinko 2011-10-13 11:32:13 UTC --- (In reply to comment #18) > Created attachment 27767 [details] Re: startStopExecutor.allowCoreThreadTimeOut(true); I think that just using "0" instead of getStartStopThreadsInternal() as the value of first argument (corePoolSize) in ThreadPoolExecutor constructor will have the same effect. It is not much of a difference though. Re: Iterator> iter = results.iterator(); It could be rewritten as for(Future future: results) loop. In one place Future is used, while I think it could be Future like in other places. Re: HostConfig I do not quite understand why to remove "if (deploymentExists(cn.getName())) { return; }" from the beginning of e.g. deployDescriptor() method. The HostConfig#deployApps() method is called every 10 seconds to perform autodeployment (by HostConfig#check() called by HostConfig#lifecycleEvent()) and without early return it will proceed to parsing context.xml file. Renaming s/dir/war/ can be done now, to slightly reduce future patch. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46264] Shutting down tomcat with large number of contexts is slow
https://issues.apache.org/bugzilla/show_bug.cgi?id=46264 Mark Thomas changed: What|Removed |Added Attachment #27761|0 |1 is obsolete|| --- Comment #18 from Mark Thomas 2011-10-13 10:37:08 UTC --- Created attachment 27767 --> https://issues.apache.org/bugzilla/attachment.cgi?id=27767 Threaded start, stop and deployment for Contexts Updated patch that: - fixes the concurrency issue with the map of deployed applications - completes the remaining TODOs in the patch - removes the use of threads to start/stop listeners etc to prevent memory leaks as that is no longer required if all start/stop is done on a separate, short-lived thread I think this patch is getting pretty close now. Feedback from users with large numbers of apps would be useful. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
tomcat.apache.org serves static pages in UTF-8
Hi! The HTML pages on http://tomcat.apache.org/ are served with the following HTTP header: Content-Type: text/html; charset=utf-8 This happens both with US and EU mirrors (verified with "wget --save-headers") and it contradicts with our generating the pages as iso-8859-1. The noticeable effect is that the "(c)" symbol in the page footers appears as broken "?". Looking at how our Changelog pages deal with this, as they have accented European characters in some patch contributor names, I followed Tomcat 7.0 example and changed output method in tomcat-site.xsl as s/xml/html/. Among other differences it makes the (c) symbol to be encoded as © instead of printing it as a character. Revisions 1182736, 1182744, 1182745. Maybe there are other ideas how to deal with this bikeshed, but now the issue seems solved. It might be that this encoding issue will be observed on other parts of the website as well. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1182745 - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Author: kkolinko Date: Thu Oct 13 09:42:28 2011 New Revision: 1182745 URL: http://svn.apache.org/viewvc?rev=1182745&view=rev Log: Change output encoding, so that header added by XSTL processor matches with HTTP Content-Type header added by tomcat.apache.org site. Modified: tomcat/site/trunk/docs/bugreport.html tomcat/site/trunk/docs/ci.html tomcat/site/trunk/docs/contact.html tomcat/site/trunk/docs/download-55.html tomcat/site/trunk/docs/download-60.html tomcat/site/trunk/docs/download-70.html tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/docs/findhelp.html tomcat/site/trunk/docs/getinvolved.html tomcat/site/trunk/docs/heritage.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/irc.html tomcat/site/trunk/docs/legal.html tomcat/site/trunk/docs/lists.html tomcat/site/trunk/docs/maven-plugin.html tomcat/site/trunk/docs/migration.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/resources.html tomcat/site/trunk/docs/security-3.html tomcat/site/trunk/docs/security-4.html tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/docs/security-impact.html tomcat/site/trunk/docs/security-jk.html tomcat/site/trunk/docs/security-native.html tomcat/site/trunk/docs/security.html tomcat/site/trunk/docs/svn.html tomcat/site/trunk/docs/tomcat-55-eol.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/docs/whoweare.html tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1182745&r1=1182744&r2=1182745&view=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Thu Oct 13 09:42:28 2011 @@ -1,6 +1,6 @@ - + Apache Tomcat - Reporting Bugs Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1182745&r1=1182744&r2=1182745&view=diff == --- tomcat/site/trunk/docs/ci.html (original) +++ tomcat/site/trunk/docs/ci.html Thu Oct 13 09:42:28 2011 @@ -1,6 +1,6 @@ - + Apache Tomcat - Continuous Integration Modified: tomcat/site/trunk/docs/contact.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=1182745&r1=1182744&r2=1182745&view=diff == --- tomcat/site/trunk/docs/contact.html (original) +++ tomcat/site/trunk/docs/contact.html Thu Oct 13 09:42:28 2011 @@ -1,6 +1,6 @@ - + Apache Tomcat - Contact Information Modified: tomcat/site/trunk/docs/download-55.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-55.html?rev=1182745&r1=1182744&r2=1182745&view=diff == --- tomcat/site/trunk/docs/download-55.html (original) +++ tomcat/site/trunk/docs/download-55.html Thu Oct 13 09:42:28 2011 @@ -1,6 +1,6 @@ - + Apache Tomcat - Apache Tomcat 5 Downloads Modified: tomcat/site/trunk/docs/download-60.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=1182745&r1=1182744&r2=1182745&view=diff == --- tomcat/site/trunk/docs/download-60.html (original) +++ tomcat/site/trunk/docs/download-60.html Thu Oct 13 09:42:28 2011 @@ -1,6 +1,6 @@ - + Apache Tomcat - Apache Tomcat 6 Downloads Modified: tomcat/site/trunk/docs/download-70.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1182745&r1=1182744&r2=1182745&view=diff == --- tomcat/site/trunk/docs/download-70.html (original) +++ tomcat/site/trunk/docs/download-70.html Thu Oct 13 09:42:28 2011 @@ -1,6 +1,6 @@ - + Apache Tomcat - Apache Tomcat 7 Downloads Modified: tomcat/site/trunk/docs/download-connectors.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=1182745&r1=1182744&r2=1182745&view=diff == --- tomcat/site/trunk/docs/download-connectors.html (original) +++ tomcat/site/trunk/docs/download-connectors.html Thu Oct 13 09:42:28 2011 @@ -1,6 +1,6 @@ - + Apache Tomcat - Tomcat Connectors (mod_jk) Downloads Modified: tomcat/site/trunk/docs/download-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1182745&r1=1182744&r2=1182745&view=diff ==
svn commit: r1182744 - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Author: kkolinko Date: Thu Oct 13 09:34:17 2011 New Revision: 1182744 URL: http://svn.apache.org/viewvc?rev=1182744&view=rev Log: Remove doctype. It is not XHTML anymore. (And it honestly never was, with our etc. markup). Modified: tomcat/site/trunk/docs/bugreport.html tomcat/site/trunk/docs/ci.html tomcat/site/trunk/docs/contact.html tomcat/site/trunk/docs/download-55.html tomcat/site/trunk/docs/download-60.html tomcat/site/trunk/docs/download-70.html tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/docs/findhelp.html tomcat/site/trunk/docs/getinvolved.html tomcat/site/trunk/docs/heritage.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/irc.html tomcat/site/trunk/docs/legal.html tomcat/site/trunk/docs/lists.html tomcat/site/trunk/docs/maven-plugin.html tomcat/site/trunk/docs/migration.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/resources.html tomcat/site/trunk/docs/security-3.html tomcat/site/trunk/docs/security-4.html tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/docs/security-impact.html tomcat/site/trunk/docs/security-jk.html tomcat/site/trunk/docs/security-native.html tomcat/site/trunk/docs/security.html tomcat/site/trunk/docs/svn.html tomcat/site/trunk/docs/tomcat-55-eol.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/docs/whoweare.html tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1182744&r1=1182743&r2=1182744&view=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Thu Oct 13 09:34:17 2011 @@ -1,4 +1,3 @@ -http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1182744&r1=1182743&r2=1182744&view=diff == --- tomcat/site/trunk/docs/ci.html (original) +++ tomcat/site/trunk/docs/ci.html Thu Oct 13 09:34:17 2011 @@ -1,4 +1,3 @@ -http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> Modified: tomcat/site/trunk/docs/contact.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=1182744&r1=1182743&r2=1182744&view=diff == --- tomcat/site/trunk/docs/contact.html (original) +++ tomcat/site/trunk/docs/contact.html Thu Oct 13 09:34:17 2011 @@ -1,4 +1,3 @@ -http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> Modified: tomcat/site/trunk/docs/download-55.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-55.html?rev=1182744&r1=1182743&r2=1182744&view=diff == --- tomcat/site/trunk/docs/download-55.html (original) +++ tomcat/site/trunk/docs/download-55.html Thu Oct 13 09:34:17 2011 @@ -1,4 +1,3 @@ -http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> Modified: tomcat/site/trunk/docs/download-60.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=1182744&r1=1182743&r2=1182744&view=diff == --- tomcat/site/trunk/docs/download-60.html (original) +++ tomcat/site/trunk/docs/download-60.html Thu Oct 13 09:34:17 2011 @@ -1,4 +1,3 @@ -http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> Modified: tomcat/site/trunk/docs/download-70.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1182744&r1=1182743&r2=1182744&view=diff == --- tomcat/site/trunk/docs/download-70.html (original) +++ tomcat/site/trunk/docs/download-70.html Thu Oct 13 09:34:17 2011 @@ -1,4 +1,3 @@ -http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> Modified: tomcat/site/trunk/docs/download-connectors.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=1182744&r1=1182743&r2=1182744&view=diff == --- tomcat/site/trunk/docs/download-connectors.html (original) +++ tomcat/site/trunk/docs/download-connectors.html Thu Oct 13 09:34:17 2011 @@ -1,4 +1,3 @@ -http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> Modified: tomcat/site/trunk/docs/download-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1182744&r1=1182743&r2=1182744&view=diff =
svn commit: r1182738 - in /tomcat/maven-plugin/trunk: tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/ tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/ tomcat6-maven-pl
Author: olamy Date: Thu Oct 13 09:23:38 2011 New Revision: 1182738 URL: http://svn.apache.org/viewvc?rev=1182738&view=rev Log: move it tests metadata to o.a.t.m namespace Modified: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/usage-contextpath/pom.xml tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/pom.xml tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/simple-war-project/pom.xml tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml Modified: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java?rev=1182738&r1=1182737&r2=1182738&view=diff == --- tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java (original) +++ tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java Thu Oct 13 09:23:38 2011 @@ -98,7 +98,7 @@ public abstract class AbstractWarProject verifier.setDebugJvm( Boolean.getBoolean( "verifier.debugJvm" ) ); verifier.displayStreamBuffers(); -verifier.deleteArtifact( "org.codehaus.mojo.tomcat.it", getWarArtifactId(), "1.0-SNAPSHOT", "war" ); +verifier.deleteArtifact( "org.apache.tomcat.maven.it", getWarArtifactId(), "1.0-SNAPSHOT", "war" ); } @After @@ -107,7 +107,7 @@ public abstract class AbstractWarProject { httpClient.getConnectionManager().shutdown(); verifier.resetStreams(); -verifier.deleteArtifact( "org.codehaus.mojo.tomcat.it", getWarArtifactId(), "1.0-SNAPSHOT", "war" ); +verifier.deleteArtifact( "org.apache.tomcat.maven.it", getWarArtifactId(), "1.0-SNAPSHOT", "war" ); } /** Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml?rev=1182738&r1=1182737&r2=1182738&view=diff == --- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml (original) +++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml Thu Oct 13 09:23:38 2011 @@ -20,7 +20,7 @@ http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> 4.0.0 - org.codehaus.mojo.tomcat.it + org.apache.tomcat.maven.it simple-war-project 1.0-SNAPSHOT war Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml?rev=1182738&r1=1182737&r2=1182738&view=diff == --- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml (original) +++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml Thu Oct 13 09:23:38 2011 @@ -20,7 +20,7 @@ http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> 4.0.0 - org.codehaus.mojo.tomcat.it + org.apache.tomcat.maven.it simple-war-project 1.0-SNAPSHOT war Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml?rev=1182738&r1=1182737&r2=1182738&view=diff == --- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resource
svn commit: r1182736 [6/10] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/security-4.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-4.html?rev=1182736&r1=1182735&r2=1182736&view=diff == --- tomcat/site/trunk/docs/security-4.html (original) +++ tomcat/site/trunk/docs/security-4.html Thu Oct 13 09:22:24 2011 @@ -1,47 +1,33 @@ - http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> + Apache Tomcat - Apache Tomcat 4.x vulnerabilities - - - + + + - -http://tomcat.apache.org/";> - - - - - +http://tomcat.apache.org/";> Apache Tomcat - - - - -http://www.apache.org/";> -http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"/> - - + +http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"> http://www.google.com/search"; method="get"> - - - + - + @@ -194,25 +180,17 @@ - - + - - - - - - -Table of Contents - - - + +Table of Contents + Apache Tomcat 4.x vulnerabilities @@ -266,34 +244,28 @@ Not a vulnerability in Tomcat + - + - - - - - - -Apache Tomcat 4.x vulnerabilities - - - + +Apache Tomcat 4.x vulnerabilities -This page lists all security vulnerabilities fixed in released versions + +This page lists all security vulnerabilities fixed in released versions of Apache Tomcat 4.x. Each vulnerability is given a security impact rating by the Apache Tomcat security team - please note that this rating may vary from @@ -301,46 +273,43 @@ is known to affect, and where a flaw has not been verified list the version with a question mark. -Please send comments or corrections for these vulnerabilities to the + +Please send comments or corrections for these vulnerabilities to the mailto:secur...@tomcat.apache.org";>Tomcat Security Team. -Please note that Tomcat 4.0.x and 4.1.x are no longer supported. Further + +Please note that Tomcat 4.0.x and 4.1.x are no longer supported. Further vulnerabilities in the 4.0.x and 4.1.x branches will not be fixed. Users should upgrade to 5.5.x, 6.x or 7.x to obtain security fixes. - + + - + - - - - - - -Will not be fixed in Apache Tomcat 4.1.x - - - + +Will not be fixed in Apache Tomcat 4.1.x - + + moderate: Information disclosure http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2005-4836"; rel="nofollow">CVE-2005-4836 -The deprecated HTTP/1.1 connector does not reject request URIs containing + +The deprecated HTTP/1.1 connector does not reject request URIs containing null bytes when used with contexts that are configured with allowLinking="true". Failure to reject the null byte enables an attacker to obtain the source for any JSP page in these contexts. Users of Tomcat @@ -348,161 +317,174 @@ which does not exhibit this issue. There are no plans to issue an update to Tomcat 4.1.x for this issue. -Affects: 4.1.15-4.1.SVN + +Affects: 4.1.15-4.1.SVN - + + - + - - - - - - -Fixed in Apache Tomcat 4.1.40 - - - + +Fixed in Apache Tomcat 4.1.40 - + + Important: Information Disclosure http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-5515"; rel="nofollow">CVE-2008-5515 -When using a RequestDispatcher obtained from the Request, the target path + +When using a RequestDispatcher obtained from the Request, the target path was normalised before the query string was removed. A request that included a specially crafted request parameter could be used to access content that would otherwise be protected by a security constraint or by locating it in under the WEB-INF directory. -This was fixed in revisions http://svn.apache.org/viewvc?view=rev&rev=782763";>782763 and + +This was fixed in revisions http://svn.apache.org/viewvc?view=rev&rev=782763";>782763 and http://svn.apache.org/viewvc?view=rev&rev=783292";>783292. -Affects: 4.1.0-4.1.39 + +Affects: 4.1.0-4.1.39 - + + Important: Denial of Service http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-0033"; rel="nofollow">CVE-2009-0033 -If Tomcat receives a request with invalid headers via the Java AJP + +If Tomcat receives a request with invalid headers via the Java AJP connector, it does not return an error and instead closes the AJP connection. In case this connector is member of a mod_jk load balancing worker, this member will be put into an error state and will be blocked from use for approximately one minute. Thus the behaviour can be used for a denial of service attack using a carefully crafted request. -This was fixed in http://svn.apache.org/viewvc?view=rev&rev=781362";>revision 78136
svn commit: r1182736 [10/10] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/svn.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/svn.html?rev=1182736&r1=1182735&r2=1182736&view=diff == --- tomcat/site/trunk/docs/svn.html (original) +++ tomcat/site/trunk/docs/svn.html Thu Oct 13 09:22:24 2011 @@ -1,46 +1,32 @@ - http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> + Apache Tomcat - Subversion Repository Access - - + + - -http://tomcat.apache.org/";> - - - - - +http://tomcat.apache.org/";> Apache Tomcat - - - - -http://www.apache.org/";> -http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"/> - - + +http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"> http://www.google.com/search"; method="get"> - - - + - + @@ -193,23 +179,17 @@ - - + - - - -Subversion - - - +Subversion + All of the Apache Tomcat source code, documentation and this web site are managed under version control using Subversion. This page explains the structure of the Apache Tomcat Subversion repository. The page assumes you are familiar @@ -217,202 +197,191 @@ with the general http://www.apache.org/dev/version-control.html#anon-svn";>Apache guidance for Subversion. + All Subversion links in this page use anonymous access. + - + - - - - - - -Repository Structure - - - + +Repository Structure + The root of the repository is http://svn.apache.org/repos/asf/tomcat";> http://svn.apache.org/repos/asf/tomcat. + Note: there is also http://svn.apache.org/viewvc/tomcat/";>ViewVC-powered view of the repository. + The directories below this level are: + - -Directory -Contents - - - -http://svn.apache.org/repos/asf/tomcat/archive";> -/archive/ - - + + + +DirectoryContents + + + + + +http://svn.apache.org/repos/asf/tomcat/archive";> +/archive/ Modules that are no longer maintained - - - -http://svn.apache.org/repos/asf/tomcat/jk";> -/jk/ - - + + + + + +http://svn.apache.org/repos/asf/tomcat/jk";> +/jk/ The native source code for the Tomcat Connectors. This includes mod_jk, isapi and nsapi. The current code is in http://svn.apache.org/repos/asf/tomcat/jk/trunk";> -/jk/trunk/ -. - - - -http://svn.apache.org/repos/asf/tomcat/maven-plugin";> - -/maven-plugin/ - - - +/jk/trunk/. + + + + + +http://svn.apache.org/repos/asf/tomcat/maven-plugin";> +/maven-plugin/ The Apache Tomcat Maven Plugin source code and website. - - - -http://svn.apache.org/repos/asf/tomcat/native";> -/native/ - - + + + + + +http://svn.apache.org/repos/asf/tomcat/native";> +/native/ The native source code for the Tomcat Native/APR Connector. The current code is in http://svn.apache.org/repos/asf/tomcat/native/branches/1.1.x";> -/native/branches/1.1.x/ - (1.1.x) and +/native/branches/1.1.x/ (1.1.x) and http://svn.apache.org/repos/asf/tomcat/native/trunk";> -/native/trunk/ - (1.2.x). +/native/trunk/ (1.2.x). - - - -http://svn.apache.org/repos/asf/tomcat/sandbox";> -/sandbox/ - - + + + + + +http://svn.apache.org/repos/asf/tomcat/sandbox";> +/sandbox/ An area where Tomcat committers can experiment with new ideas. - - - -http://svn.apache.org/repos/asf/tomcat/site";> -/site/ - - + + + + + +http://svn.apache.org/repos/asf/tomcat/site";> +/site/ The Apache Tomcat website. - - - -http://svn.apache.org/repos/asf/tomcat/taglibs";> -/taglibs/ - - + + + + + +http://svn.apache.org/repos/asf/tomcat/taglibs";> +/taglibs/ The Apache Taglibs source code and website. - - - -http://svn.apache.org/repos/asf/tomcat/tags";> -/tags/ - - + + + + + +http://svn.apache.org/repos/asf/tomcat/tags";> +/tags/ Tags for the primary development branch. Mainly used for modules. - - - -http://svn.apache.org/repos/asf/tomcat/tc5.5.x";> -/tc5.5.x/ - - + + + + + +http://svn.apache.org/repos/asf/tomcat/tc5.5.x";> +/tc5.5.x/ The stable 5.5.x release branch. See http://svn.apache.org/repos/asf/tomcat/tc5.5.x/trunk";> -/tc5.5.x/trunk/ -. - - - -http://svn.apache.org/repos/asf/tomcat/tc6.0.x";> -/tc6.0.x/ - - +/tc5.5.x/trunk/. + + + + + +http://svn.apache.org/repos/asf/tomcat/tc6.0.x";> +/tc6.0.x/ The stable 6.0.x release branch. See http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk";> -/tc6.0.x/trunk/ -. - - - -http://svn.apache.org/repos/asf/tomcat/tc7.0.x";> -/tc7.0.x/ - - +/tc6.0.x/trunk/. + + + + + +http://svn.apache.org/repos/asf/tomcat/tc7.0.x";> +
svn commit: r1182736 [3/10] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/legal.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/legal.html?rev=1182736&r1=1182735&r2=1182736&view=diff == --- tomcat/site/trunk/docs/legal.html (original) +++ tomcat/site/trunk/docs/legal.html Thu Oct 13 09:22:24 2011 @@ -1,47 +1,33 @@ - http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> + Apache Tomcat - Legal Stuff They Make Us Say - - - + + + - -http://tomcat.apache.org/";> - - - - - +http://tomcat.apache.org/";> Apache Tomcat - - - - -http://www.apache.org/";> -http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"/> - - + +http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"> http://www.google.com/search"; method="get"> - - - + - + @@ -194,31 +180,24 @@ - - + - - - - - - -Legal Stuff They Make Us Say - - - + +Legal Stuff They Make Us Say + -All material on this website is Copyright © 1999-2011, The Apache +All material on this website is Copyright © 1999-2011, The Apache Software Foundation + Sun, Sun Microsystems, Solaris, Java and JavaServer Pages are trademarks or registered trademarks of Oracle Corporation. UNIX is a registered trademark in @@ -229,34 +208,28 @@ All other product names mentioned herein web site are trademarks of their respective owners. - + + - + - - - - - - -The Apache License - - - + +The Apache License + All software produced by The Apache Software Foundation or any of its projects or subjects is licensed according to the terms of @@ -264,58 +237,62 @@ projects or subjects is licensed accordi Version 2.0 (current). - + + - + - - - -Trademarks - - - +Trademarks -"Apache Tomcat" and "Tomcat" are trademarks of the Apache Software + +"Apache Tomcat" and "Tomcat" are trademarks of the Apache Software Foundation. Use of these trademarks is subject to the terms of section 6 of http://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 2.0 (current). -If you create a product that uses Apache Tomcat software or provides + +If you create a product that uses Apache Tomcat software or provides additional functionality to that software then: -When referring to Apache Tomcat software, please use the full name + +When referring to Apache Tomcat software, please use the full name of "Apache Tomcat" for at least the first reference on any web page, help file or similar. Subsequent references may refer to "Tomcat". -You may use the Powered by Tomcat + +You may use the Powered by Tomcat logo. -You may not use the Tomcat logo + +You may not use the Tomcat logo without the permission of the Apache Tomcat PMC. -If you use the words "Tomcat" or "Apache" in your product name then -you must call your product "... for Apache Tomcat". No other + +If you use the words "Tomcat" or "Apache" in your product name then +you must call your product "... for Apache Tomcat". No other form of product name that includes "Tomcat" or "Apache" is permitted. - - + + + + + - + @@ -324,21 +301,19 @@ Version 2.0 (current). - + - - -Copyright © 1999-2011, The Apache Software Foundation - + +Copyright © 1999-2011, The Apache Software Foundation + Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat project logo are trademarks of the Apache Software Foundation. - - + Modified: tomcat/site/trunk/docs/lists.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/lists.html?rev=1182736&r1=1182735&r2=1182736&view=diff == --- tomcat/site/trunk/docs/lists.html (original) +++ tomcat/site/trunk/docs/lists.html Thu Oct 13 09:22:24 2011 @@ -1,47 +1,33 @@ - http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> + Apache Tomcat - Mailing Lists - - - + + + - -http://tomcat.apache.org/";> - - - - - +http://tomcat.apache.org/";> Apache Tomcat - - - - -http://www.apache.org/";> -http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"/> - - + +http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"> http://www.google.com/search"; method="get"> - - - + - + @@ -194,25 +180,17 @@ - - + - - - - - - -Table of Contents - - - + +Table of Contents + Apache Tomcat Mailing Lists @@ -230,73 +208,84 @@ taglibs-user + - + - - -
svn commit: r1182736 [4/10] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/migration.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=1182736&r1=1182735&r2=1182736&view=diff == --- tomcat/site/trunk/docs/migration.html (original) +++ tomcat/site/trunk/docs/migration.html Thu Oct 13 09:22:24 2011 @@ -1,47 +1,33 @@ - http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> + Apache Tomcat - Migration Guide - - - + + + - -http://tomcat.apache.org/";> - - - - - +http://tomcat.apache.org/";> Apache Tomcat - - - - -http://www.apache.org/";> -http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"/> - - + +http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"> http://www.google.com/search"; method="get"> - - - + - + @@ -194,25 +180,17 @@ - - + - - - - - - -Table of Contents - - - + +Table of Contents + Before upgrading or migrating @@ -318,322 +296,284 @@ + - + - - - - - - -Before upgrading or migrating - - - + +Before upgrading or migrating + When updating from one major Apache Tomcat version a newer one, please make sure that the JVM that is installed on your system supports at least the required Java version. While it is possible that older versions of Tomcat may not be compatible with newer JVMs, all the currently supported Apache Tomcat versions (5.5.x, 6.0.x and 7.0.x) are known to run correctly on Java 6 JVMs. + When migrating from one major Tomcat version to another (e.g. from Tomcat 6 to Tomcat 7), you should not blindly copy the configuration files from the old version. The recommended approach is to start with the default configuration of the new version of Apache Tomcat and to adjust it as necessary. + When migrating from one minor release to another minor release within the same major release (e.g. from Tomcat 7.0.14 to Tomcat 7.0.16) you can retain the configuration files, but you should check to see if any defaults have changed and/or if any new elements have been added and adjust your configuration files accordingly. + - + - - - - - - -Migrating from 5.5.x to 6.0.x - - - + +Migrating from 5.5.x to 6.0.x - This section lists all the known changes between 5.5.x and 6.0.x which may + + This section lists all the known changes between 5.5.x and 6.0.x which may cause backwards compatibility problems when upgrading. - + + - - - - - - -Java 5 required - - - + +Java 5 required -Apache Tomcat 6.0.x requires Java 5 or later, unlike Apache Tomcat 5.5.x which + +Apache Tomcat 6.0.x requires Java 5 or later, unlike Apache Tomcat 5.5.x which could use a compatibility package to run on JRE 1.4. - + + - + - + + - - - - - - -Modified directory structure - - - + +Modified directory structure - + + - - - - - - -Shared libraries - - - + +Shared libraries -Apache Tomcat 5.5.x used, by default, a directory structure including + +Apache Tomcat 5.5.x used, by default, a directory structure including common, shared and server subdirectories. Apache Tomcat 6.0.x uses a single lib directory. -The lib directory is the direct replacement for both + +The lib directory is the direct replacement for both common/lib and common/classes subdirectories: it accepts both JARs and exploded class hierarchies. -The conf/catalina.properties file can be used to modify + +The conf/catalina.properties file can be used to modify the directory structure. -Starting with version 6.0.21, Apache Tomcat supports both the + +Starting with version 6.0.21, Apache Tomcat supports both the $CATALINA_BASE/lib and $CATALINA_HOME/lib directories. The jars and classes in $CATALINA_BASE/lib are earlier on the class path and thus take precedence. - + + - + - + + - - - - - - -Endorsed libraries - - - + +Endorsed libraries -The $CATALINA_HOME/common/endorsed subdirectory is replaced + +The $CATALINA_HOME/common/endorsed subdirectory is replaced by the $CATALINA_HOME/endorsed directory. This directory is absent by default. -The JAVA_ENDORSED_DIRS environment variable can be used + +The JAVA_ENDORSED_DIRS environment variable can be used with setenv.bat|sh scripts to provide alternative location of this directory. - + + - + - + + - - - - - - -Default web applications - - - + +Default web applications -The Manager and Host Manager web applications are no longer in + +The Manager and Host Manager web applications are no longer in server/webapps. All of the default web applications are now located in the webapps directory. -
svn commit: r1182734 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Oct 13 09:19:25 2011 New Revision: 1182734 URL: http://svn.apache.org/viewvc?rev=1182734&view=rev Log: Commit Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1182734&r1=1182733&r2=1182734&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 13 09:19:25 2011 @@ -68,13 +68,13 @@ PATCHES PROPOSED TO BACKPORT: Automate copyright end date It is based on r962466 http://people.apache.org/~kkolinko/patches/2011-09-26_tc6_docs-date.patch - +1: kkolinko, kfujino + +1: kkolinko, kfujino, markt -1: * Backport (copy in) JULI OneLineFormatter plus DateFormatCache helper class from TC 7 JULI. http://people.apache.org/~rjung/patches/tc6-onelineformatter.patch - +1: rjung, kkolinko + +1: rjung, kkolinko, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51872 @@ -89,20 +89,20 @@ PATCHES PROPOSED TO BACKPORT: Fix infinite loop in AprEndpoint shutdown if acceptor unlock fails. Reduce timeout before forcefully closing the socket from 30s to 10s. http://svn.apache.org/viewvc?rev=1176799&view=rev - +1: kkolinko + +1: kkolinko, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51640 Improve memory leak protection for DriverManager http://svn.apache.org/viewvc?rev=1156171&view=rev (r1156182 in TC7) - +1: kkolinko + +1: kkolinko, markt -1: * Improve MimeHeaders.toString() http://svn.apache.org/viewvc?rev=1177246&view=rev (r1177125, r1177245 in trunk) - +1: kkolinko + +1: kkolinko, markt -1: * Fix BIO + SSL + Java7 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1182733 - /tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/
Author: olamy Date: Thu Oct 13 09:09:13 2011 New Revision: 1182733 URL: http://svn.apache.org/viewvc?rev=1182733&view=rev Log: remove not needed resources Removed: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1182729 - in /tomcat/maven-plugin/trunk: tomcat-maven-plugin-it/src/main/java/org/codehaus/ tomcat6-maven-plugin/src/test/java/org/codehaus/ tomcat7-maven-plugin/src/test/java/org/apache/
Author: olamy Date: Thu Oct 13 09:04:34 2011 New Revision: 1182729 URL: http://svn.apache.org/viewvc?rev=1182729&view=rev Log: remove empty directories Removed: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/plugin/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1182728 - in /tomcat/maven-plugin/trunk: tomcat6-maven-plugin/src/test/java/org/apache/ tomcat6-maven-plugin/src/test/java/org/apache/tomcat/ tomcat6-maven-plugin/src/test/java/org/apache
Author: olamy Date: Thu Oct 13 09:02:35 2011 New Revision: 1182728 URL: http://svn.apache.org/viewvc?rev=1182728&view=rev Log: move test classes to o.a.t.m namespace Added: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/apache/ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6DeployWarOnlyProjectIT.java (contents, props changed) - copied, changed from r1182727, tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarOnlyProjectIT.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6DeployWarProjectIT.java (contents, props changed) - copied, changed from r1182727, tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarProjectIT.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6RunMultiConfigIT.java (contents, props changed) - copied, changed from r1182727, tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6RunMultiConfigIT.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6SimpleWarProjectIT.java (contents, props changed) - copied, changed from r1182727, tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6SimpleWarProjectIT.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6UsageContextpathIT.java (contents, props changed) - copied, changed from r1182727, tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6UsageContextpathIT.java tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/it/ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarOnlyProjectIT.java (with props) tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarProjectIT.java (with props) tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7RunMultiConfigIT.java (with props) tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7SimpleWarProjectIT.java (with props) Removed: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarOnlyProjectIT.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarProjectIT.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6RunMultiConfigIT.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6SimpleWarProjectIT.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6UsageContextpathIT.java tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/plugin/tomcat7/Tomcat7DeployWarOnlyProjectIT.java tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/plugin/tomcat7/Tomcat7DeployWarProjectIT.java tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/plugin/tomcat7/Tomcat7RunMultiConfigIT.java tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/plugin/tomcat7/Tomcat7SimpleWarProjectIT.java Copied: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6DeployWarOnlyProjectIT.java (from r1182727, tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarOnlyProjectIT.java) URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6DeployWarOnlyProjectIT.java?p2=tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6DeployWarOnlyProjectIT.java&p1=tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarOnlyProjectIT.java&r1=1182727&r2=1182728&rev=1182728&view=diff == --- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarOnlyProjectIT.java (original) +++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6DeployWarOnlyProjec
svn commit: r1182727 - in /tomcat/maven-plugin/trunk: tomcat-maven-plugin-it/src/main/java/org/apache/ tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/ tomcat-maven-plugin-it/src/main/java/org/
Author: olamy Date: Thu Oct 13 08:57:41 2011 New Revision: 1182727 URL: http://svn.apache.org/viewvc?rev=1182727&view=rev Log: move test classes to o.a.t.m namespace Added: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/ tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/ tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/ tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/ tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractDeployWarOnlyProjectIT.java (with props) tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractDeployWarProjectIT.java (with props) tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractSimpleWarProjectIT.java (with props) tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractTomcatRunMultiConfigIT.java (with props) tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractUsageContextpathIT.java (with props) tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java (with props) Removed: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractDeployWarOnlyProjectIT.java tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractDeployWarProjectIT.java tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractSimpleWarProjectIT.java tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractTomcatRunMultiConfigIT.java tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractUsageContextpathIT.java tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractWarProjectIT.java Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarOnlyProjectIT.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarProjectIT.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6RunMultiConfigIT.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6SimpleWarProjectIT.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6UsageContextpathIT.java tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/plugin/tomcat7/Tomcat7DeployWarOnlyProjectIT.java tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/plugin/tomcat7/Tomcat7DeployWarProjectIT.java tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/plugin/tomcat7/Tomcat7RunMultiConfigIT.java tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/plugin/tomcat7/Tomcat7SimpleWarProjectIT.java Added: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractDeployWarOnlyProjectIT.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractDeployWarOnlyProjectIT.java?rev=1182727&view=auto == --- tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractDeployWarOnlyProjectIT.java (added) +++ tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractDeployWarOnlyProjectIT.java Thu Oct 13 08:57:41 2011 @@ -0,0 +1,73 @@ +package org.apache.tomcat.maven.it; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + + +import org.junit.Test; +import org.slf4j.Logger; +import org.slf
svn commit: r1182725 - /tomcat/maven-plugin/trunk/pom.xml
Author: olamy Date: Thu Oct 13 08:53:15 2011 New Revision: 1182725 URL: http://svn.apache.org/viewvc?rev=1182725&view=rev Log: exclude .idea/** from rat plugin Modified: tomcat/maven-plugin/trunk/pom.xml Modified: tomcat/maven-plugin/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1182725&r1=1182724&r2=1182725&view=diff == --- tomcat/maven-plugin/trunk/pom.xml (original) +++ tomcat/maven-plugin/trunk/pom.xml Thu Oct 13 08:53:15 2011 @@ -409,6 +409,7 @@ README.txt *.sh .git/** + .idea/** - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1182723 - /tomcat/maven-plugin/trunk/
Author: olamy Date: Thu Oct 13 08:49:35 2011 New Revision: 1182723 URL: http://svn.apache.org/viewvc?rev=1182723&view=rev Log: ignore .idea Modified: tomcat/maven-plugin/trunk/ (props changed) Propchange: tomcat/maven-plugin/trunk/ -- --- svn:ignore (original) +++ svn:ignore Thu Oct 13 08:49:35 2011 @@ -1,2 +1,3 @@ target *.iml +.idea - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Mail address in security-NN.html pages
On 13/10/2011 09:03, jean-frederic clere wrote: > On 10/13/2011 07:26 AM, Konstantin Kolinko wrote: >> Hi! >> >> Re-reading the security pages I have several notes >> >> http://tomcat.apache.org/security-6.html >> http://tomcat.apache.org/security-7.html >> >> 1) security-6.html and others have the following text: >> >> "Please send comments or corrections for these vulnerabilities to the >> Tomcat Security Team." >> >> with a link to security@ address in it. >> >> I think it is wrong. General comments and questions should be sent to >> dev@ or users@. Only exploits are for security@. >> >> I am not yet sure how to better write it. Maybe with a link to >> security.html or lists.html > > I think the idea was to avoid a security comment like "in fact the fix > is wrong" going to a public list. Yep. Changing the text to "corrections to security@, questions to users@" could be the way to go. >> 2) I would like to mention that we do not provide binary patches. >> >> I think direct links to the following pages will help some people: >> >> http://tomcat.apache.org/tomcat-7.0-doc/building.html >> http://tomcat.apache.org/tomcat-7.0-doc/BUILDING.txt >> >> The links will be different for different Tomcat versions. > > +1 that should prevent people ask for a binary just after a fix. huge +1. I am getting really fed up of the requests for 6.0.34. >> 3) The above issues are already mentioned on the generic security page >> (security.html), but on security-6.html page there is no direct link >> back to security.html unless you pay attention to the site menu on the >> left side. > > Go fix it :D +1. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1182718 - in /tomcat/site/trunk: docs/svn.html xdocs/svn.xml
Author: kkolinko Date: Thu Oct 13 08:34:57 2011 New Revision: 1182718 URL: http://svn.apache.org/viewvc?rev=1182718&view=rev Log: Update subversion repository links: - Add viewvc link - Add maven-plugin - Add direct links to foo/trunk - Add link to the official Git mirrors at ASF Modified: tomcat/site/trunk/docs/svn.html tomcat/site/trunk/xdocs/svn.xml Modified: tomcat/site/trunk/docs/svn.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/svn.html?rev=1182718&r1=1182717&r2=1182718&view=diff == --- tomcat/site/trunk/docs/svn.html (original) +++ tomcat/site/trunk/docs/svn.html Thu Oct 13 08:34:57 2011 @@ -251,6 +251,9 @@ guidance for Subversion. http://svn.apache.org/repos/asf/tomcat";> http://svn.apache.org/repos/asf/tomcat. +Note: there is also http://svn.apache.org/viewvc/tomcat/";>ViewVC-powered view +of the repository. + The directories below this level are: @@ -272,7 +275,20 @@ http://svn.apache.org/repos/asf/tomcat The native source code for the Tomcat Connectors. This includes -mod_jk, isapi and nsapi. +mod_jk, isapi and nsapi. The current code is in +http://svn.apache.org/repos/asf/tomcat/jk/trunk";> +/jk/trunk/ +. + + + +http://svn.apache.org/repos/asf/tomcat/maven-plugin";> + +/maven-plugin/ + + + +The Apache Tomcat Maven Plugin source code and website. @@ -280,7 +296,15 @@ http://svn.apache.org/repos/asf/tomcat/native/ -The native source code for the Tomcat Native/APR Connector. +The native source code for the Tomcat Native/APR Connector. +The current code is in +http://svn.apache.org/repos/asf/tomcat/native/branches/1.1.x";> +/native/branches/1.1.x/ + (1.1.x) and +http://svn.apache.org/repos/asf/tomcat/native/trunk";> +/native/trunk/ + (1.2.x). + @@ -320,7 +344,10 @@ http://svn.apache.org/repos/asf/tomcat/tc5.5.x/ -The stable 5.5.x release branch. +The stable 5.5.x release branch. See +http://svn.apache.org/repos/asf/tomcat/tc5.5.x/trunk";> +/tc5.5.x/trunk/ +. @@ -328,7 +355,10 @@ http://svn.apache.org/repos/asf/tomcat/tc6.0.x/ -The stable 6.0.x release branch. +The stable 6.0.x release branch. See +http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk";> +/tc6.0.x/trunk/ +. @@ -336,7 +366,10 @@ http://svn.apache.org/repos/asf/tomcat/tc7.0.x/ -The stable 7.0.x release branch. +The stable 7.0.x release branch. See +http://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk";> +/tc7.0.x/trunk/ +. @@ -360,6 +393,37 @@ http://svn.apache.org/repos/asf/tomcat + + + + + + + + +Git Mirror + + + + + + + + + +The Apache Software Foundation provides read-only Git mirrors for +its projects. See http://git.apache.org/";>http://git.apache.org/ + + + + + + + + + + + Modified: tomcat/site/trunk/xdocs/svn.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/svn.xml?rev=1182718&r1=1182717&r2=1182718&view=diff == --- tomcat/site/trunk/xdocs/svn.xml (original) +++ tomcat/site/trunk/xdocs/svn.xml Thu Oct 13 08:34:57 2011 @@ -26,6 +26,9 @@ guidance for Subversion. http://svn.apache.org/repos/asf/tomcat";> http://svn.apache.org/repos/asf/tomcat. +Note: there is also http://svn.apache.org/viewvc/tomcat/";>ViewVC-powered view +of the repository. + The directories below this level are: @@ -40,12 +43,25 @@ http://svn.apache.org/repos/asf/tomcathttp://svn.apache.org/repos/asf/tomcat/jk";> /jk/ The native source code for the Tomcat Connectors. This includes -mod_jk, isapi and nsapi. +mod_jk, isapi and nsapi. The current code is in +http://svn.apache.org/repos/asf/tomcat/jk/trunk";> +/jk/trunk/. + + +http://svn.apache.org/repos/asf/tomcat/maven-plugin";> +/maven-plugin/ +The Apache Tomcat Maven Plugin source code and website. http://svn.apache.org/repos/asf/tomcat/native";> /native/ -The native source code for the Tomcat Native/APR Connector. +The native source code for the Tomcat Native/APR Connector. +The current code is in +http://svn.apache.org/repos/asf/tomcat/native/branches/1.1.x";> +/native/branches/1.1.x/ (1.1.x) and +http://svn.apache.org/repos/asf/tomcat/native/trunk";> +/native/trunk/ (1.2.x). + http://svn.apache.org/repos/asf/tomcat/sandbox";> @@ -70,17 +86,23 @@ http://svn.apache.org/repos/asf/tomcat http://svn.apache.org/repos/asf/tomcat/tc5.5.x";> /tc5.5.x/ -The stable 5.5.x release branch. +The stable 5.5.x release branch. See +http://svn.apache.org/repos/asf/tomcat/tc5.5.x/trunk";> +/tc5.5.x/trunk/. http://svn.apache.org/repos/asf/tomcat/tc6.0.x";> /tc6.0.x/ -T
Fwd: [jira] [Created] (INFRA-4027) Reconfigure tomcat70.git for another svn branch
Hi! The tomcat70.git Git mirror still reflects our trunk and not tc7.0.x. I filed an INFRA issue, but as I do not have much experience with Git, maybe somebody else can look at this as well. https://issues.apache.org/jira/browse/INFRA-4027 Best regards, Konstantin Kolinko -- Forwarded message -- From: Konstantin Kolinko (Created) (JIRA) Date: 2011/10/13 Subject: [jira] [Created] (INFRA-4027) Reconfigure tomcat70.git for another svn branch To: kkolinko at apache org Reconfigure tomcat70.git for another svn branch --- Key: INFRA-4027 URL: https://issues.apache.org/jira/browse/INFRA-4027 Project: Infrastructure Issue Type: Task Security Level: public (Regular issues) Components: Git Reporter: Konstantin Kolinko Until August 2011 the development for Tomcat 7.0 was performed on /tomcat/trunk. Now the 7.0 version has its own branch, http://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk/ (like Tomcat 6.0 and 5.5 do), but the tomcat70.git still references the old address. I am not a Git user, so here are just several observations of mine: 1) http://git.apache.org/tomcat70.git/config It contains: [[[ [core] repositoryformatversion = 0 filemode = true bare = true [svn-remote "svn"] url = https://svn.apache.org/repos/asf fetch = tomcat/trunk:refs/remotes/trunk branches = tomcat/tc7.0.x/branches/*:refs/remotes/* tags = tomcat/tc7.0.x/tags/*:refs/remotes/tags/* ... ]]] I think there should be fetch = tomcat/tc7.0.x/trunk:refs/remotes/trunk like in http://git.apache.org/tomcat60.git/config 2) Looking at the files, as displayed by https://github.com/apache/tomcat70 I see TOMCAT-NEXT.txt there. That file exists only on trunk, but not on tc7.0.x/trunk Thus it indeed shows trunk instead of Tomcat 7.0. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Mail address in security-NN.html pages
On 10/13/2011 07:26 AM, Konstantin Kolinko wrote: Hi! Re-reading the security pages I have several notes http://tomcat.apache.org/security-6.html http://tomcat.apache.org/security-7.html 1) security-6.html and others have the following text: "Please send comments or corrections for these vulnerabilities to the Tomcat Security Team." with a link to security@ address in it. I think it is wrong. General comments and questions should be sent to dev@ or users@. Only exploits are for security@. I am not yet sure how to better write it. Maybe with a link to security.html or lists.html I think the idea was to avoid a security comment like "in fact the fix is wrong" going to a public list. 2) I would like to mention that we do not provide binary patches. I think direct links to the following pages will help some people: http://tomcat.apache.org/tomcat-7.0-doc/building.html http://tomcat.apache.org/tomcat-7.0-doc/BUILDING.txt The links will be different for different Tomcat versions. +1 that should prevent people ask for a binary just after a fix. 3) The above issues are already mentioned on the generic security page (security.html), but on security-6.html page there is no direct link back to security.html unless you pay attention to the site menu on the left side. Go fix it :D Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52009] NPE exception in org.apache.catalina.connector.CoyoteAdapter.service
https://issues.apache.org/bugzilla/show_bug.cgi?id=52009 --- Comment #6 from Konstantin Kolinko 2011-10-13 07:11:46 UTC --- (In reply to comment #4) > 4) I am running with the following line added to catalina.properties file: > org.apache.coyote.http11.InternalNioInputBuffer.level = FINE Ops. I meant the following line: org.apache.catalina.connector.RECYCLE_FACADES=true > > and it shows that there are problems in BayeuxServlet that it calls > setHeader() > on a response that has already been recycled. (...) -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org