svn commit: r1371620 - /tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
Author: markt Date: Fri Aug 10 09:13:14 2012 New Revision: 1371620 URL: http://svn.apache.org/viewvc?rev=1371620view=rev Log: Tab police Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1371620r1=1371619r2=1371620view=diff == --- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Fri Aug 10 09:13:14 2012 @@ -119,7 +119,7 @@ public class Http11AprProtocol extends A /** * SSL honor cipher order. -* + * * Set to codetrue/code to enforce the iserver's/i cipher order * instead of the default which is to allow the client to choose a * preferred cipher. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1371622 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/Http11AprProtocol.java
Author: markt Date: Fri Aug 10 09:24:29 2012 New Revision: 1371622 URL: http://svn.apache.org/viewvc?rev=1371622view=rev Log: tab police Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1371620 Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1371622r1=1371621r2=1371622view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Fri Aug 10 09:24:29 2012 @@ -119,7 +119,7 @@ public class Http11AprProtocol extends A /** * SSL honor cipher order. -* + * * Set to codetrue/code to enforce the iserver's/i cipher order * instead of the default which is to allow the client to choose a * preferred cipher. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc7.0.x-validate (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-validate : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-validate.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-validate (Type: Build) Work ended in a state of : Failed Elapsed: 33 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-10082012.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.1.1-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-10082012.jar:/srv/gump/public/workspace/junit/dist/junit-10082012.jar:/srv/gump/ public/workspace/junit/dist/junit-dep-10082012.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-14.0-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-10082012.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-10082012.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/jdom/build/jdom.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-10082012.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-10082012-dep.jar - Buildfile: /srv/gump/public/workspace/tomcat-7.0.x/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-7.0.x/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/build/temp compile-prepare: download-validate: proxyflags: setproxy: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar downloadzip: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/res/checkstyle [checkstyle] Running Checkstyle 5.6-SNAPSHOT on 2284 files [checkstyle] /srv/gump/public/workspace/tomcat-7.0.x/java/org/apache/coyote/http11/Http11AprProtocol.java:122:1: File contains tab characters (this is the first instance). BUILD FAILED /srv/gump/public/workspace/tomcat-7.0.x/build.xml:450: Got 1 errors and 0 warnings. Total time: 32 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 06000610082012, vmgump.apache.org:vmgump:06000610082012 Gump E-mail Identifier (unique within run) #40. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-validate : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build) Work ended in a state of : Failed Elapsed: 35 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-10082012.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.1.1-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-10082012.jar:/srv/gump/public/workspace/junit/dist/junit-10082012.jar:/srv/gump/ public/workspace/junit/dist/junit-dep-10082012.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-14.0-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-10082012.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-10082012.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/jdom/build/jdom.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-10082012.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-10082012-dep.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp compile-prepare: download-validate: proxyflags: setproxy: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar downloadzip: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle [checkstyle] Running Checkstyle 5.6-SNAPSHOT on 2295 files [checkstyle] /srv/gump/public/workspace/tomcat-trunk/java/org/apache/coyote/http11/Http11AprProtocol.java:122:1: File contains tab characters (this is the first instance). BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:461: Got 1 errors and 0 warnings. Total time: 34 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 06000610082012, vmgump.apache.org:vmgump:06000610082012 Gump E-mail Identifier (unique within run) #41. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional
[GUMP@vmgump]: Project tomcat-taglibs-standard (in module tomcat-taglibs) failed
To whom it may engage...
This is an automated request, but not an unsolicited one. For
more information please visit http://gump.apache.org/nagged.html,
and/or contact the folk at gene...@gump.apache.org.
Project tomcat-taglibs-standard has an issue affecting its community
integration.
This issue affects 2 projects,
and has been outstanding for 4 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-taglibs-standard : Standard Taglib
- tomcat-taglibs-standard-install : JSP Taglibs
Full details are available at:
http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/index.html
That said, some information snippets are provided here.
The following annotations (debug/informational/warning/error messages) were
provided:
-INFO- Optional dependency httpunit failed with reason build failed
-DEBUG- (Apache Gump generated) Apache Maven Settings in:
/srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml
-INFO- Failed with reason build failed
-DEBUG- Maven POM in:
/srv/gump/public/workspace/tomcat-taglibs/standard/pom.xml
-INFO- Failed to extract fallback artifacts from Gump Repository
The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/gump_work/build_tomcat-taglibs_tomcat-taglibs-standard.html
Work Name: build_tomcat-taglibs_tomcat-taglibs-standard (Type: Build)
Work ended in a state of : Failed
Elapsed: 20 secs
Command Line: /opt/maven2/bin/mvn --batch-mode -DskipTests=true --settings
/srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml
install
[Working Directory: /srv/gump/public/workspace/tomcat-taglibs/standard]
M2_HOME: /opt/maven2
-
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Nothing to compile - all classes are up to date
[debug] execute contextualize
[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory
/srv/gump/public/workspace/tomcat-taglibs/standard/spec/src/test/resources
[INFO] Copying 3 resources
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] No sources to compile
[INFO] [surefire:test {execution: default-test}]
[INFO] Tests are skipped.
[INFO] [bundle:bundle {execution: default-bundle}]
[INFO] [install:install {execution: default-install}]
[INFO] Installing
/srv/gump/public/workspace/tomcat-taglibs/standard/spec/target/taglibs-standard-spec-1.2-SNAPSHOT.jar
to
/srv/gump/public/workspace/mvnlocalrepo/shared/org/apache/taglibs/taglibs-standard-spec/1.2-SNAPSHOT/taglibs-standard-spec-1.2-SNAPSHOT.jar
[INFO] [bundle:install {execution: default-install}]
[INFO] Parsing
file:/srv/gump/public/workspace/mvnlocalrepo/shared/repository.xml
[INFO] Installing
org/apache/taglibs/taglibs-standard-spec/1.2-SNAPSHOT/taglibs-standard-spec-1.2-SNAPSHOT.jar
[INFO] Writing OBR metadata
[INFO]
[INFO] Building JSTL Implementation
[INFO]task-segment: [install]
[INFO]
[INFO] [remote-resources:process {execution: default}]
[INFO] snapshot org.apache.taglibs:taglibs-standard-spec:1.2-SNAPSHOT: checking
for updates from apache.snapshots
[debug] execute contextualize
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 14 resources
[INFO] Copying 3 resources
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 96 source files to
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/target/classes
[INFO] -
[ERROR] COMPILATION ERROR :
[INFO] -
[ERROR]
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java:[38,7]
error: DataSourceWrapper is not abstract and does not override abstract method
getParentLogger() in CommonDataSource
[INFO] 1 error
[INFO] -
[INFO]
[ERROR] BUILD FAILURE
[INFO]
[INFO] Compilation failure
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java:[38,7]
error: DataSourceWrapper is not abstract and does not override abstract method
getParentLogger() in CommonDataSource
[INFO]
[INFO] For more information, run Maven with the -e switch
[INFO]
svn commit: r1371678 - in /tomcat/tc6.0.x/trunk: 53531.diff java/org/apache/catalina/startup/LocalStrings.properties src/
Author: kkolinko
Date: Fri Aug 10 12:07:37 2012
New Revision: 1371678
URL: http://svn.apache.org/viewvc?rev=1371678view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=53531
Followup to r1371355.
Add missing message, remove erroneously added files.
Removed:
tomcat/tc6.0.x/trunk/53531.diff
tomcat/tc6.0.x/trunk/src/
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1371678r1=1371677r2=1371678view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Fri Aug 10 12:07:37 2012
@@ -59,6 +59,7 @@ engineConfig.cce=Lifecycle event data ob
engineConfig.start=EngineConfig: Processing START
engineConfig.stop=EngineConfig: Processing STOP
expandWar.copy=Error copying {0} to {1}
+expandWar.createFailed=Unable to create the directory [{0}]
expandWar.deleteFailed=[{0}] could not be completely deleted. The presence of
the remaining files may cause problems
expandWar.illegalPath=The archive [{0}] is malformed and will be ignored: an
entry contains an illegal path [{1}]
hostConfig.appBase=Application base directory {0} does not exist
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1371355 - in /tomcat/tc6.0.x/trunk: ./ 53531.diff STATUS.txt java/org/apache/catalina/startup/ExpandWar.java src/ webapps/docs/changelog.xml
2012/8/10 Konstantin Kolinko knst.koli...@gmail.com: 2012/8/9 schu...@apache.org: Author: schultz Date: Thu Aug 9 18:14:14 2012 New Revision: 1371355 URL: http://svn.apache.org/viewvc?rev=1371355view=rev Log: https://issues.apache.org/bugzilla/show_bug.cgi?id=53531 Fix ExpandWar.expand to check the return value of File.mkdir and File.mkdirs Added: tomcat/tc6.0.x/trunk/53531.diff tomcat/tc6.0.x/trunk/src/ The above two (a file and a directory) - I think that you did not intend to commit them. Fixed by http://svn.apache.org/viewvc?rev=1371678view=rev Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1371678 - in /tomcat/tc6.0.x/trunk: 53531.diff java/org/apache/catalina/startup/LocalStrings.properties src/
Konstantin, On 8/10/12 8:07 AM, kkoli...@apache.org wrote: Author: kkolinko Date: Fri Aug 10 12:07:37 2012 New Revision: 1371678 URL: http://svn.apache.org/viewvc?rev=1371678view=rev Log: https://issues.apache.org/bugzilla/show_bug.cgi?id=53531 Followup to r1371355. Add missing message, remove erroneously added files. Removed: tomcat/tc6.0.x/trunk/53531.diff tomcat/tc6.0.x/trunk/src/ Bah. I really hate Eclipse's insistence that any file not under revision control needs to be added-and-committed. I'm really sorry for the pollution. -chris signature.asc Description: OpenPGP digital signature
svn commit: r1371750 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: schultz Date: Fri Aug 10 15:52:36 2012 New Revision: 1371750 URL: http://svn.apache.org/viewvc?rev=1371750view=rev Log: Updated proposal. 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=1371750r1=1371749r2=1371750view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Aug 10 15:52:36 2012 @@ -185,7 +185,10 @@ PATCHES PROPOSED TO BACKPORT: +1: schultz -1: kkolinko: r1041892 is not enough. It has bad formatting, a HashMap protected field (should be 'Map'), etc. See the current code of Tomcat 7. - + schultz: current trunk and TC7 code has HashSetString. Am I misunderstanding? + I will also add http://svn.apache.org/viewvc?view=revisionrevision=1043983 + and http://svn.apache.org/viewvc?view=revisionrevision=1049264 + to fix the formatting issues. PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53541] Bug in virtual webapp feature. Custom tags badly supported. Error is org.apache.jasper.JasperException: The absolute uri: http://java.sun.com/jsp/jstl/core cannot be resolved in either we
https://issues.apache.org/bugzilla/show_bug.cgi?id=53541 --- Comment #2 from Mark Thomas ma...@apache.org --- For the record, the maximum permitted attachment size is 1MB, not 1KB. 1MB should be more than enough for any test case - even one packaged as a WAR - providing it meets the standard of the minimum necessary to demonstrate the bug. -- 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: r1371793 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Author: fhanik
Date: Fri Aug 10 18:10:49 2012
New Revision: 1371793
URL: http://svn.apache.org/viewvc?rev=1371793view=rev
Log:
ConnectionState must supported with short name too.
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1371793r1=1371792r2=1371793view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Fri Aug 10 18:10:49 2012
@@ -183,7 +183,8 @@ public class PooledConnection {
}
//set up the default state, unless we expect the interceptor to do it
-if (poolProperties.getJdbcInterceptors()==null ||
poolProperties.getJdbcInterceptors().indexOf(ConnectionState.class.getName())0)
{
+if (poolProperties.getJdbcInterceptors()==null ||
poolProperties.getJdbcInterceptors().indexOf(ConnectionState.class.getName())0
||
+
poolProperties.getJdbcInterceptors().indexOf(ConnectionState.class.getSimpleName())0)
{
if
(poolProperties.getDefaultTransactionIsolation()!=DataSourceFactory.UNKNOWN_TRANSACTIONISOLATION)
connection.setTransactionIsolation(poolProperties.getDefaultTransactionIsolation());
if (poolProperties.getDefaultReadOnly()!=null)
connection.setReadOnly(poolProperties.getDefaultReadOnly().booleanValue());
if (poolProperties.getDefaultAutoCommit()!=null)
connection.setAutoCommit(poolProperties.getDefaultAutoCommit().booleanValue());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1371794 - /tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Author: fhanik
Date: Fri Aug 10 18:11:36 2012
New Revision: 1371794
URL: http://svn.apache.org/viewvc?rev=1371794view=rev
Log:
ConnectionState must supported with short name too.
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1371794r1=1371793r2=1371794view=diff
==
---
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Fri Aug 10 18:11:36 2012
@@ -183,7 +183,8 @@ public class PooledConnection {
}
//set up the default state, unless we expect the interceptor to do it
-if (poolProperties.getJdbcInterceptors()==null ||
poolProperties.getJdbcInterceptors().indexOf(ConnectionState.class.getName())0)
{
+if (poolProperties.getJdbcInterceptors()==null ||
poolProperties.getJdbcInterceptors().indexOf(ConnectionState.class.getName())0
||
+
poolProperties.getJdbcInterceptors().indexOf(ConnectionState.class.getSimpleName())0)
{
if
(poolProperties.getDefaultTransactionIsolation()!=DataSourceFactory.UNKNOWN_TRANSACTIONISOLATION)
connection.setTransactionIsolation(poolProperties.getDefaultTransactionIsolation());
if (poolProperties.getDefaultReadOnly()!=null)
connection.setReadOnly(poolProperties.getDefaultReadOnly().booleanValue());
if (poolProperties.getDefaultAutoCommit()!=null)
connection.setAutoCommit(poolProperties.getDefaultAutoCommit().booleanValue());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1371812 - /tomcat/trunk/java/org/apache/naming/resources/VirtualDirContext.java
Author: markt
Date: Fri Aug 10 19:41:27 2012
New Revision: 1371812
URL: http://svn.apache.org/viewvc?rev=1371812view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53541
Fix JAR scanning when WEB-INF/lib is provided via VirtualDirContext
Patch provided by Philip Zuev
Modified:
tomcat/trunk/java/org/apache/naming/resources/VirtualDirContext.java
Modified: tomcat/trunk/java/org/apache/naming/resources/VirtualDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/VirtualDirContext.java?rev=1371812r1=1371811r2=1371812view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/VirtualDirContext.java
(original)
+++ tomcat/trunk/java/org/apache/naming/resources/VirtualDirContext.java Fri
Aug 10 19:41:27 2012
@@ -296,4 +296,13 @@ public class VirtualDirContext extends F
return retSuper;
}
+@Override
+protected String doGetRealPath(String path) {
+File file = file(path);
+if (null != file) {
+return file.getAbsolutePath();
+} else {
+return null;
+}
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1371816 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/naming/resources/VirtualDirContext.java webapps/docs/changelog.xml
Author: markt
Date: Fri Aug 10 19:54:55 2012
New Revision: 1371816
URL: http://svn.apache.org/viewvc?rev=1371816view=rev
Log:
Fix JAR scanning when WEB-INF/lib is provided via VirtualDirContext
Patch provided by Philip Zuev
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1371812
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java?rev=1371816r1=1371815r2=1371816view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
Fri Aug 10 19:54:55 2012
@@ -296,4 +296,13 @@ public class VirtualDirContext extends F
return retSuper;
}
+@Override
+protected String doGetRealPath(String path) {
+File file = file(path);
+if (null != file) {
+return file.getAbsolutePath();
+} else {
+return null;
+}
+}
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1371816r1=1371815r2=1371816view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Aug 10 19:54:55 2012
@@ -99,6 +99,10 @@
on Context start. Patch provided by Cedomir Igaly. (markt)
/fix
fix
+bug53541/bug: Fix JAR scanning when WEB-INF/lib is provided via
+VirtualDirContext. Patch provided by Philip Zuev. (markt)
+ /fix
+ fix
bug53584/bug: Ignore path parameters when comparing URIs for FORM
authentication. This prevents users being prompted twice for passwords
when logging in when session IDs are being encoded as path parameters.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53541] Bug in virtual webapp feature. Custom tags badly supported. Error is org.apache.jasper.JasperException: The absolute uri: http://java.sun.com/jsp/jstl/core cannot be resolved in either we
https://issues.apache.org/bugzilla/show_bug.cgi?id=53541 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #3 from Mark Thomas ma...@apache.org --- This has been fixed in trunk and 7.0.x and will be included in 7.0.30 onwards. Regarding the test case, it would have been a lot easier to work with if necessary files to recreate this were provided in a zip/tar.gz that matched the necessary file structure. A lot of reverse engineering was required to recreate the test case before the bug could be investigated. -- 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
[Bug 52318] Version in tomcat-jdbc POM is conflicted with Version in MANIFEST for JULI JAR
https://issues.apache.org/bugzilla/show_bug.cgi?id=52318 Filip Hanik fha...@apache.org changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |LATER --- Comment #16 from Filip Hanik fha...@apache.org --- Requested correct manifest was not provided. Closing bug. -- 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: r1371823 - /tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
Author: markt
Date: Fri Aug 10 21:34:13 2012
New Revision: 1371823
URL: http://svn.apache.org/viewvc?rev=1371823view=rev
Log:
Need to reset content length as well to ensure custom error page is not
truncated.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=1371823r1=1371822r2=1371823view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java Fri Aug
10 21:34:13 2012
@@ -438,6 +438,7 @@ final class StandardHostValve extends Va
} else {
// Reset the response (keeping the real error code and message)
response.resetBuffer(true);
+response.setContentLength(-1);
rd.forward(request.getRequest(), response.getResponse());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1371824 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/StandardHostValve.java webapps/docs/changelog.xml
Author: markt
Date: Fri Aug 10 21:36:54 2012
New Revision: 1371824
URL: http://svn.apache.org/viewvc?rev=1371824view=rev
Log:
Need to reset content length as well to ensure custom error page is not
truncated.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1371823
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=1371824r1=1371823r2=1371824view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
Fri Aug 10 21:36:54 2012
@@ -453,6 +453,7 @@ final class StandardHostValve extends Va
} else {
// Reset the response (keeping the real error code and message)
response.resetBuffer(true);
+response.setContentLength(-1);
rd.forward(request.getRequest(), response.getResponse());
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1371824r1=1371823r2=1371824view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Aug 10 21:36:54 2012
@@ -116,6 +116,10 @@
Document the constants that were added to the
codeRequestDispatcher/code interface in Servlet 3.0. (kkolinko)
/scode
+ fix
+Ensure custom error pages are not truncated if the page that triggered
+the error set a content length header. (markt)
+ /fix
/changelog
/subsection
subsection name=Coyote
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53545] jsp:forward action to static resources causes IllegalStateException when inside classic custom tag
https://issues.apache.org/bugzilla/show_bug.cgi?id=53545 --- Comment #3 from Mark Thomas ma...@apache.org --- OK. I see what is going on here now. A bug (now fixed) in the custom error page handling wasn't helping. Tomcat isn't clearing the buffer of the containing page when the forward happens. When Tomcat tries to write that content (after the forward) the ISE happens. I think I have a fix but I need to do some more testing of the behavior with nested tags before I commit the fix. -- 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
[Bug 53541] Bug in virtual webapp feature. Custom tags badly supported. Error is org.apache.jasper.JasperException: The absolute uri: http://java.sun.com/jsp/jstl/core cannot be resolved in either we
https://issues.apache.org/bugzilla/show_bug.cgi?id=53541 --- Comment #4 from Philip philipz...@gmail.com --- (In reply to comment #3) This has been fixed in trunk and 7.0.x and will be included in 7.0.30 onwards. Regarding the test case, it would have been a lot easier to work with if necessary files to recreate this were provided in a zip/tar.gz that matched the necessary file structure. A lot of reverse engineering was required to recreate the test case before the bug could be investigated. Thank you for your response, Mark. It's my pleasure to help you improve Tomcat! Sorry, if test case was non convenient. Next time it will be better. -- 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
