DO NOT REPLY [Bug 48817] Skip validation query and use JDBC API for validation
https://issues.apache.org/bugzilla/show_bug.cgi?id=48817 --- Comment #20 from Glen Taylor 2011-04-29 23:13:43 UTC --- To be clear, please note that the example in #19 will NOT function correctly due to the issues discussed in #18. It was just to clarify the workaround I was attempting. Thanks for adding setValidator() back! Though that still won't help those using a Tomcat Resource definition. I don't feel qualified to proclaim a "best of" solution, particularly with Validator already in "release". Probably the easiest solution would be to augment the internals of setValidatorClassName() to allow a config suffix like JdbcInterceptor. Maybe an additional ConfigurableValidator interface to allow the params to be passed and leave the implementation to the implementer (as with JdbcInterceptor)? I'm happy to work up a proposed patch, but I'd prefer someone else weigh in on the best of the many possible approaches. -- 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 48817] Skip validation query and use JDBC API for validation
https://issues.apache.org/bugzilla/show_bug.cgi?id=48817 --- Comment #19 from Glen Taylor 2011-04-29 23:01:59 UTC --- Created attachment 26944 --> https://issues.apache.org/bugzilla/attachment.cgi?id=26944 Example JDBC4 Validator/JdbcInjector implementation See my previous comment on this bug -- 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 48817] Skip validation query and use JDBC API for validation
https://issues.apache.org/bugzilla/show_bug.cgi?id=48817 --- Comment #18 from Glen Taylor 2011-04-29 23:00:03 UTC --- Gah! To my previous comment (#15), I wired up a Validator class which also extends JdbcInterceptor (I'll attach separately). Since ConnectionPool.init() instantiates each defined JdbcInterceptor and then calls the poolStarted() method, the idea was that the config values could be passed as properties of the JdbcInterceptor, which would then apply those properties to the Validator instance created by setValidatorClassName() in the poolStarted() hook. Inexplicably, though, ConnectionPool.init() does NOT apply the configured JdbcInterceptor properties - it just "new"s up an instance and immediately calls poolStarted(). Why doesn't it apply the configuration properties like it does in ConnectionPool.setupConnection(PooledConnection) So I can't really think of an easy way to inject a configuration into a Validator without code changes to jdbc-pool. I'll attempt to attach my example (but now non-functional) Validator implementation to the issue. -- 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
MIME type additions
We recently had some mime type additions, and the new BZ 51137 asks for more. I did some checking between the mime type file of httpd 2.3 latest and TC. There are about 600 more mime types in the httpd file, some of them with more than one suffix. Some entries are inconsistent between the two files, but not many. Below I will list the changes. I don't know whether it is a good idea to grow web.xml that much, but if people think it is useful, I can make our trunk web.xml mime types consistent with the one from httpd. We should expliciteley discuss the inconsistencies given at the start of the below list though. For reference: the official mime type list for registered types is at http://www.iana.org/assignments/media-types/index.html. 1) Mime types defined for suffixes which do not exist in httpd land: IANA registered (so we should keep them): application/mac-binhex40 hqx Not IANA registered, or suffix not contained in RFC but I suggest we keep them for compatibility reasons: application/annodex anx application/x-aim aim application/x-compress z application/x-compress Z application/x-gzip gz audio/annodex axa audio/basic ulw audio/flac flac audio/mp4 m4a audio/mp4 m4b audio/mp4 m4r audio/x-mpeg abs audio/x-mpeg mpega image/bmp dib image/pict pict image/x-jg art image/x-macpaint mac image/x-macpaint pnt image/x-quicktime qti image/x-quicktime qtif text/html body text/plain jsf text/plain jspf text/x-component htc text/x-server-parsed-html shtml video/annodex axv video/mpeg2 mpv2 video/x-dv dv video/x-rad-screenplay avx OK to keep all of them? 2) Wrong suffix TC:application/vnd.oasis.opendocument.text-master odm HTTPD: application/vnd.oasis.opendocument.text-master otm Here TC seems to be right, I'll check and fix httpd. TC:application/vnd.wap.wmlscriptc wmlscriptc HTTPD: application/vnd.wap.wmlscriptc wmlsc httpd seems right, we should fix TC. OK? 3) Inconsistent mime type between TC and httpd I suggest to take the definition from httpd because it is officially registered and seems unambiguous: TC:application/x-visio vsd HTTPD: application/vnd.visio vsd vst vss vsw TC:application/x-x509-ca-cert cer HTTPD: application/pkix-cert cer TC:audio/x-midi smf HTTPD: application/vnd.stardivision.math smf TC:audio/x-mpeg mp2 TC:audio/x-mpeg mp3 TC:audio/x-mpeg mpa HTTPD: audio/mpeg mpga mp2 mp2a mp3 m2a m3a TC:image/x-photoshop psd HTTPD: image/vnd.adobe.photoshop psd TC:x-world/x-vrml wrl HTTPD: model/vrml wrl vrml I suggest to take the definition from httpd because it seems better although it is more probably arguable: TC:application/x-troff roff TC:application/x-troff t TC:application/x-troff tr TC:application/x-troff-man man TC:application/x-troff-me me TC:application/x-wais-source ms HTTPD: text/troff t tr roff man me ms TC:audio/x-midi kar TC:audio/x-midi mid TC:audio/x-midi midi HTTPD: audio/midi mid midi kar rmi TC:text/javascript js HTTPD: application/javascript js TC:text/plain java HTTPD: text/x-java-source java I suggest we keep our definition, because there seems to be no clear favorite: TC:application/java class HTTPD: application/java-vm class TC:application/octet-stream exe HTTPD: application/x-msdownload exe dll com bat msi (add dll,...,msi like httpd) TC:application/x-cdf cdf TC:application/x-netcdf nc HTTPD: application/x-netcdf nc cdf TC:application/x-mif mif HTTPD: application/vnd.mif mif TC:audio/x-scpls pls HTTPD: application/pls+xml pls TC:image/pict pct TC:image/pict pic HTTPD: image/x-pict pic pct TC:video/mp4 m4v HTTPD: video/x-m4v m4v Other cases: TC:audio/x-mpeg mp1 HTTPD: missing I think this should be audio/mpeg, because IANA links to RFC http://www.rfc-editor.org/rfc/rfc3003.txt for audio/mpeg and the suffix mp1 is an example there. OK? 4) Mime types already defined, but httpd contains more suffixes I suggest we add the missing suffices for TC. # Same def but additional suffs TC:application/msword doc HTTPD: application/msword doc dot TC:application/octet-stream bin HTTPD: application/octet-stream bin dms lha lrf lzh so iso dmg dist distz pkg bpk dump elc deploy TC:application/vnd.ms-excel xls HTTPD: application/vnd.ms-excel xls xlm xla xlc xlt xlw TC:application/vnd.ms-powerpoint ppt pps HTTPD: application/vnd.ms-powerpoint ppt pps pot TC:text/plain txt HTTPD: text/plain txt text conf def list log in TC:video/mp4 mp4 HTTPD: video/mp4 mp4 mp4v mpg4 TC:video/mpeg mpeg mpg mpe HTTPD: video/mpeg mpeg mpg mpe m1v m2v 5) Long list of additional entries in httpd Should we add them (about 600 entries) as is? E.g. all of BZ 51137 are included here. Do we care about the order of the entries (alphabetic or some performance relevant ordering)? application/andrew-inset ez application/applixware aw application/atom+xml atom application/atomcat+xml atomcat application/
svn commit: r1097899 - in /tomcat/trunk: java/org/apache/catalina/Context.java java/org/apache/catalina/session/ManagerBase.java webapps/docs/changelog.xml
Author: markt
Date: Fri Apr 29 17:49:37 2011
New Revision: 1097899
URL: http://svn.apache.org/viewvc?rev=1097899&view=rev
Log:
Expose a container event for changing the session ID
Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1097899&r1=1097898&r2=1097899&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Fri Apr 29 17:49:37 2011
@@ -87,6 +87,11 @@ public interface Context extends Contain
*/
public static final String CLEAR_WELCOME_FILES_EVENT =
"clearWelcomeFiles";
+/**
+ * Container event for changing the ID of a session.
+ */
+public static final String CHANGE_SESSION_ID_EVENT = "changeSessionId";
+
// - Properties
/**
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1097899&r1=1097898&r2=1097899&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Fri Apr 29
17:49:37 2011
@@ -768,7 +768,11 @@ public abstract class ManagerBase extend
*/
@Override
public void changeSessionId(Session session) {
+String oldId = session.getIdInternal();
session.setId(generateSessionId(), false);
+String newId = session.getIdInternal();
+container.fireContainerEvent(Context.CHANGE_SESSION_ID_EVENT,
+new String[] {oldId, newId});
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1097899&r1=1097898&r2=1097899&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Apr 29 17:49:37 2011
@@ -90,6 +90,10 @@
Ensure response is committed when AsyncContext#complete()
is called. (markt)
+
+Add a container event that is fired when a session's ID is
changed,
+e.g. on authentication. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48817] Skip validation query and use JDBC API for validation
https://issues.apache.org/bugzilla/show_bug.cgi?id=48817 --- Comment #17 from Filip Hanik 2011-04-29 17:47:17 UTC --- I added this in r1097895 -- 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: r1097895 - in /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool: DataSourceProxy.java PoolConfiguration.java PoolProperties.java jmx/ConnectionPool.java
Author: fhanik
Date: Fri Apr 29 17:33:15 2011
New Revision: 1097895
URL: http://svn.apache.org/viewvc?rev=1097895&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=48817
Add in setValidator to support dependency injection frameworks like Spring etc
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=1097895&r1=1097894&r2=1097895&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Fri Apr 29 17:33:15 2011
@@ -844,6 +844,14 @@ public class DataSourceProxy implements
public Validator getValidator() {
return getPoolProperties().getValidator();
}
+
+/**
+ * {@inheritDoc}
+ */
+public void setValidator(Validator validator) {
+getPoolProperties().setValidator(validator);
+}
+
/**
* {@inheritDoc}
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java?rev=1097895&r1=1097894&r2=1097895&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
Fri Apr 29 17:33:15 2011
@@ -542,6 +542,13 @@ public interface PoolConfiguration {
* @return the optional validator object - may be null
*/
public Validator getValidator();
+
+/**
+ * Sets the validator object
+ * If this is a non null object, it will be used as a validator instead of
the validationQuery
+ * If this is null, remove the usage of the validator.
+ */
+public void setValidator(Validator validator);
/**
* avoid excess validation, only run validation at most at this frequency
- time in milliseconds.
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=1097895&r1=1097894&r2=1097895&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Fri Apr 29 17:33:15 2011
@@ -358,6 +358,19 @@ public class PoolProperties implements P
public Validator getValidator() {
return validator;
}
+
+/**
+ * {@inheritDoc}
+ */
+public void setValidator(Validator validator) {
+this.validator = validator;
+if (validator!=null) {
+this.validatorClassName = validator.getClass().getName();
+} else {
+this.validatorClassName = null;
+}
+}
+
/**
* {@inheritDoc}
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=1097895&r1=1097894&r2=1097895&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
Fri Apr 29 17:33:15 2011
@@ -638,4 +638,13 @@ public class ConnectionPool extends Noti
//noop
}
+/**
+ * {@inheritDoc}
+ */
+public void setValidator(Validator validator) {
+//noop
+}
+
+
+
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51137] Please add MIME types for xslx, xslm, docx, docm since xls and doc already contained in web.xml have been replaced by these.
https://issues.apache.org/bugzilla/show_bug.cgi?id=51137 Mark Thomas changed: What|Removed |Added OS/Version||All Severity|normal |enhancement --- Comment #1 from Mark Thomas 2011-04-29 16:52:45 UTC --- Enhancement requests where patches are provided (in diff -u format) tend to get addressed quicker than enhancement requests without patches -- 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 51137] New: Please add MIME types for xslx, xslm, docx, docm since xls and doc already contained in web.xml have been replaced by these.
https://issues.apache.org/bugzilla/show_bug.cgi?id=51137 Bug #: 51137 Summary: Please add MIME types for xslx, xslm, docx, docm since xls and doc already contained in web.xml have been replaced by these. Product: Tomcat 7 Version: 7.0.10 Platform: PC Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: guido.leend...@invantive.com Classification: Unclassified Could the following MIME types be added to conf/web.xml? docm application/vnd.ms-word.document.macroEnabled.12 docx application/vnd.openxmlformats-officedocument.wordprocessingml.document dotx application/vnd.openxmlformats-officedocument.wordprocessingml.template potm application/vnd.ms-powerpoint.template.macroEnabled.12 potx application/vnd.openxmlformats-officedocument.presentationml.template ppam application/vnd.ms-powerpoint.addin.macroEnabled.12 ppsm application/vnd.ms-powerpoint.slideshow.macroEnabled.12 ppsx application/vnd.openxmlformats-officedocument.presentationml.slideshow pptm application/vnd.ms-powerpoint.presentation.macroEnabled.12 pptx application/vnd.openxmlformats-officedocument.presentationml.presentation xlam application/vnd.ms-excel.addin.macroEnabled.12 xlsb application/vnd.ms-excel.sheet.binary.macroEnabled.12 xlsm application/vnd.ms-excel.sheet.macroEnabled.12 xlsx application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xltm application/vnd.ms-excel.template.macroEnabled.12 xltx application/vnd.openxmlformats-officedocument.spreadsheetml.template -- 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 48817] Skip validation query and use JDBC API for validation
https://issues.apache.org/bugzilla/show_bug.cgi?id=48817 --- Comment #16 from Filip Hanik 2011-04-29 16:45:35 UTC --- I agree, I will add the setValidator method -- 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 48817] Skip validation query and use JDBC API for validation
https://issues.apache.org/bugzilla/show_bug.cgi?id=48817 --- Comment #15 from Glen Taylor 2011-04-29 16:35:06 UTC --- May I ask why no provision was made for _configuring_ the Validator? I love the pluggable validation approach, but even the JDBC4 isValid() scenario has a configurable element (the method's timeout value). I agree that adding setValidatorClassName() makes sense for simple Resource configuration where appropriate, but these being by nature "custom" is seems inevitable that a Validator would be likely need to have config injected. Is there a reason that setValidator() had to be removed? It would be the most straightforward path for those using IOC-container-wired pools, though it wouldn't help when using a Tomcat Resource definition. The only mechanism I can see as things are now would to use a JdbcInterceptor to inject a configured Validator (since props can be set for JdbcInterceptors), but that seems a little convoluted. And what would be the appropriate hook there? One could use the poolStarted() event, but wouldn't the initial connections have been started and tested by then? Or maybe at the first connection creation. Could we not just make the Validator be wired in the same way as the JdbcInterceptor, where optional properties can be defined? I can't envision a need for a _chain_ like the interceptors have, but configurable properties would be very 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
DO NOT REPLY [Bug 51136] Allow to set the context name through Tomcat's embeded class before adding it to the host
https://issues.apache.org/bugzilla/show_bug.cgi?id=51136 --- Comment #1 from David Calavera 2011-04-29 16:19:10 UTC --- Created attachment 26942 --> https://issues.apache.org/bugzilla/attachment.cgi?id=26942 patch that fix this issue -- 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 51136] New: Allow to set the context name through Tomcat's embeded class before adding it to the host
https://issues.apache.org/bugzilla/show_bug.cgi?id=51136 Bug #: 51136 Summary: Allow to set the context name through Tomcat's embeded class before adding it to the host Product: Tomcat 7 Version: trunk Platform: PC Status: NEW Severity: enhancement Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: david.calav...@gmail.com Classification: Unclassified org.apache.catalina.startup.Tomcat creates contexts and add them to the host directly. It would be nice if we could set the name of the context before adding it to the host. I'm including a patch that overloads the methods "addWebapp" and "addContext" to take that name as a parameter. -- 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 49122] Update of ROOT application index.html
https://issues.apache.org/bugzilla/show_bug.cgi?id=49122 --- Comment #9 from Mark Thomas 2011-04-29 11:00:02 UTC --- Test comment - please ignore -- 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
