[GUMP@vmgump]: Project tomcat-trunk-validate-eoln (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-eoln has an issue affecting its community integration. This issue affects 1 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-trunk-validate-eoln : 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-eoln/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/gump_work/build_tomcat-trunk_tomcat-trunk-validate-eoln.html Work Name: build_tomcat-trunk_tomcat-trunk-validate-eoln (Type: Build) Work ended in a state of : Failed Elapsed: 1 sec Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml validate-eoln [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/classes:/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 - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/classes [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/bin [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/conf [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/lib [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/logs [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/webapps compile-prepare: [copy] Copying 1 file to /srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/startup [copy] Copying 1 file to /srv/gump/public/workspace/tomcat-trunk/webapps/docs validate-eoln: [javac] Compiling 1 source file to /srv/gump/public/workspace/tomcat-trunk/output/classes [javac] javac: invalid target release: 1.7 [javac] Usage: javac [javac] use -help for a list of possible options BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:523: Compile failed; see the compiler error output for details. Total time: 1 second - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 06000615072012, vmgump.apache.org:vmgump:06000615072012 Gump E-mail Identifier (unique within run) #8. -- 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
Bug report for Taglibs [2012/07/15]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |38193|Ass|Enh|2006-01-09|[RDC] BuiltIn Grammar support for Field | |38600|Ass|Enh|2006-02-10|[RDC] Enable RDCs to be used in X+V markup (X+RDC)| |42413|New|Enh|2007-05-14|[PATCH] Log Taglib enhancements | |46052|New|Nor|2008-10-21|SetLocaleSupport is slow to initialize when many l| |48333|New|Enh|2009-12-02|TLD generator | +-+---+---+--+--+ | Total5 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat 5 [2012/07/15]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |52579|New|Reg|2012-02-02|Tomcat5.5.35?Java1.5 cannot return proper value of| |53050|New|Nor|2012-04-09|org.apache.catalina.session.ManagerBase has issues| +-+---+---+--+--+ | Total2 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat 6 [2012/07/15]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |41679|New|Enh|2007-02-22|SemaphoreValve should be able to filter on url pat| |41883|Ass|Enh|2007-03-18|use abstract wrapper instead of plain X509Certific| |43001|New|Enh|2007-07-30|JspC lacks setMappedFile and setDie for use in Ant| |43400|New|Enh|2007-09-14|enum support for tag libs | |43548|Opn|Enh|2007-10-04|xml schema for tomcat-users.xml | |43682|New|Enh|2007-10-23|JULI: web-inf/classes/logging.properties to suppor| |43742|New|Enh|2007-10-30|.tag compiles performed one at a time -- extremel| |43979|New|Enh|2007-11-27|Add abstraction for Java and Classfile output | |44199|New|Enh|2008-01-10|expose current backlog queue size | |44225|New|Enh|2008-01-14|SSL connector tries to load the private keystore f| |44284|New|Enh|2008-01-23|Support java.lang.Iterable in c:forEach tag | |44294|New|Enh|2008-01-25|Support for EL functions with varargs | |44645|New|Enh|2008-03-20|[Patch] JNDIRealm - Doesn't support JNDI "java.nam| |44787|New|Enh|2008-04-09|provide more error context on "java.lang.IllegalSt| |44818|New|Enh|2008-04-13|tomcat hangs with GET when content-length is defin| |45014|New|Enh|2008-05-15|Request and Response classes should have wrappers | |45282|New|Enh|2008-06-25|NioReceiver doesn't close cleanly, leaving sockets| |45428|New|Enh|2008-07-18|warn if the tomcat stop doesn't complete | |45832|New|Enh|2008-09-18|add DIGEST authentication support to Ant tasks| |45878|New|Enh|2008-09-24|Generated jars do not contain proper manifests or | |45879|Opn|Enh|2008-09-24|Windows installer fails to install NOTICE and RELE| |45931|Opn|Enh|2008-10-01|trimSpaces incorrectly modifies output| |46173|New|Enh|2008-11-09|Small patch for manager app: Setting an optional c| |46263|New|Enh|2008-11-21|Tomcat reloading of context.xml does not update do| |46284|New|Enh|2008-11-24|Add flag to DeltaManager that blocks processing cl| |46350|New|Enh|2008-12-05|Maven repository should contain source bundles| |46727|New|Enh|2009-02-17|DefaultServlet - serving multiple encodings | |46902|New|Enh|2009-03-24|LoginValve to bypass restrictions of j_security_ch| |47214|New|Enh|2009-05-17|Inner classes that are explicitly referenced - sho| |47242|New|Enh|2009-05-22|request for AJP command line client | |47281|New|Enh|2009-05-28|Efficiency of the JDBCStore | |47407|New|Enh|2009-06-23|HttpSessionListener doesn't operate in the session| |47467|New|Enh|2009-07-02|Deployment of the war file by URL when contextpath| |47785|Opn|Enh|2009-09-04|Cluster MBean not registered | |47834|New|Enh|2009-09-14|TldConfig throws Exception when exploring unpacked| |47919|New|Enh|2009-09-30|Log Tomcat & Java environment variables in additio| |48358|Opn|Enh|2009-12-09|JSP-unloading reloaded| |48543|New|Enh|2010-01-14|[Patch] More flexibility in specifying -Dcatalina.| |48672|New|Enh|2010-02-03|Tomcat Virtual Host Manager (/host-manager) have b| |48674|New|Enh|2010-02-03|Tomcat Virtual Host Manager application doesn't pe| |48743|New|Enh|2010-02-15|Make the SLEEP variable in catalina.sh settable fr| |48899|New|Enh|2010-03-12|Guess URI charset should solve lot of problems| |48922|New|Enh|2010-03-16|org.apache.catalina.connector.Request clone static| |48928|New|Enh|2010-03-17|An alternative solution to preloading classes when| |49161|New|Enh|2010-04-21|Unknown Publisher when installing tomcat 6.0.26 | |49176|Opn|Enh|2010-04-23|Jasper in Dev Mode Is Memory Inefficient | |49464|New|Enh|2010-06-18|DefaultServlet and CharacterEncoding | |49531|New|Enh|2010-06-30|singlesignon failover not working on DeltaManager/| |49804|New|Enh|2010-08-23|Allow Embedded.redirectStreams value to be configu| |49939|New|Enh|2010-09-16|Expose a method via JMX which empties the webapp f| |49943|New|Enh|2010-09-16|Logging (via juli) does not reread configuration c| |50285|
Bug report for Tomcat Connectors [2012/07/15]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |34526|Opn|Nor|2005-04-19|Truncated content in decompressed requests from mo| |35959|Opn|Enh|2005-08-01|mod_jk not independant of UseCanonicalName| |43303|New|Enh|2007-09-04|Versioning under Windows not reported by many conn| |43968|Inf|Enh|2007-11-26|[patch] support ipv6 with mod_jk | |44290|Inf|Nor|2008-01-24|mod_jk/1.2.26: retry is not useful for an importan| |44349|Inf|Maj|2008-02-04|mod_jk/1.2.26 module does not read worker.status.s| |44379|New|Enh|2008-02-07|convert the output of strftime into UTF-8 | |44454|New|Nor|2008-02-19|busy count reported in mod_jk inflated, causes inc| |44571|New|Enh|2008-03-10|Limits busy per worker to a threshold | |45063|New|Nor|2008-05-22|JK-1.2.26 IIS ISAPI filter issue when running diff| |45313|New|Nor|2008-06-30|mod_jk 1.2.26 & apache 2.2.9 static compiled on so| |46337|New|Nor|2008-12-04|real worker name is wrong | |46676|New|Enh|2009-02-09|Configurable test request for Watchdog thread | |46767|New|Enh|2009-02-25|mod_jk to send DECLINED in case no fail-over tomca| |47327|New|Enh|2009-06-07|remote_user not logged in apache logfile | |47617|Inf|Enh|2009-07-31|include time spent doing ajp_get_endpoint() in err| |47678|New|Cri|2009-08-11|Unable to allocate shared memory when using isapi_| |47714|New|Cri|2009-08-20|Reponse mixed between users | |47750|New|Maj|2009-08-27|Loss of worker settings when changing via jkstatus| |47795|New|Maj|2009-09-07|service sticky_session not being set correctly wit| |47840|Inf|Min|2009-09-14|A broken worker name is written in the log file. | |48191|New|Maj|2009-11-13|Problem with mod_jk 1.2.28 - Can not render up the| |48460|New|Nor|2009-12-30|mod_proxy_ajp document has three misleading portio| |48490|New|Nor|2010-01-05|Changing a node to stopped in uriworkermap.propert| |48513|New|Enh|2010-01-09|IIS Quick setup instructions | |48564|New|Nor|2010-01-18|Unable to turn off retries for LB worker | |48830|New|Nor|2010-03-01|IIS shutdown blocked in endpoint service when serv| |48891|Opn|Enh|2010-03-11|Missing EOL-style settings in tomcat/jk/trunk | |49035|New|Maj|2010-04-01|data lost when post a multipart/form-data form| |49063|New|Enh|2010-04-07|Please add JkStripSession status in jk-status work| |49135|New|Enh|2010-04-16|SPDY Connector for The Tomcat | |49469|New|Enh|2010-06-19|Workers status page has negative number of connect| |49732|Opn|Nor|2010-08-10|reply_timeout can't wait forever. | |49822|New|Enh|2010-08-25|Add hash lb worker method | |49903|New|Enh|2010-09-09|Make workers file reloadable | |50186|New|Nor|2010-10-31|Wrong documentation of connection_pool_timeout / c| |52334|New|Maj|2011-12-14|recover_time is not properly used | |52483|New|Enh|2012-01-18|Print JkOptions's options in log file and jkstatus| |52651|New|Nor|2012-02-13|JKSHMFile size limitation | |53324|Opn|Nor|2012-05-30|Starting with mod_jk 1.2.35 I cannot modify worker| |53542|New|Min|2012-07-13|Spelling mistake on 503 service unavailable page | +-+---+---+--+--+ | Total 41 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat 7 [2012/07/15]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |16579|New|Enh|2003-01-30|documentation page layout/style breaks wrapping to| |18500|New|Enh|2003-03-30|Host aliases to match by regular expression | |28039|Opn|Enh|2004-03-30|Cluster Support for SingleSignOn | |40728|Inf|Enh|2006-10-11|Catalina MBeans use non-serializable classes | |40881|Opn|Enh|2006-11-02|Unable to receive message through TCP channel -> | |41007|Opn|Enh|2006-11-20|Can't define customized 503 error page| |43866|New|Enh|2007-11-14|add support for session attribute propagation with| |43925|Opn|Enh|2007-11-21|org.apache.jasper.runtime.BodyContentImpl causing | |44216|New|Enh|2008-01-11|Don't reuse session ID even if emptySessionPath=tr| |48550|Inf|Enh|2010-01-14|Update examples and default server.xml to use UTF-| |49395|New|Enh|2010-06-06|manager.findLeaks : display the date when the leak| |49589|New|Enh|2010-07-12|Tag handlers with constant attribute values are al| |49785|New|Enh|2010-08-19|Enabling TLS for JNDIRealm| |49821|New|Enh|2010-08-25|Tomcat CLI| |50019|New|Enh|2010-09-28|Adding JNDI "lookup-name" support In XML and Resou| |50175|New|Enh|2010-10-28|Enhance memory leak detection by selectively apply| |50234|New|Enh|2010-11-08|JspC use servlet 3.0 features | |50504|New|Enh|2010-12-21|Allow setting query string character set trough re| |50670|New|Enh|2011-01-27|Tribes | RpcChannel | Add option to specify extern| |51195|New|Enh|2011-05-13|"Find leaks" reports a false positive memory/class| |51294|Opn|Enh|2011-05-30|Since 7.0.12 do not work option unpackWARs=true fo| |51423|Inf|Enh|2011-06-23|[Patch] to add a path and a version parameters to | |51463|New|Enh|2011-07-01|Tomcat.setBaseDir (package org.apache.catalina.st| |51496|New|Enh|2011-07-11|NSIS - Warn that duplicate service name will resul| |51497|New|Enh|2011-07-11|Use canonical IPv6 text representation in logs| |51526|New|Enh|2011-07-18|Process web application context config with embedd| |51587|New|Enh|2011-07-29|Implement status and uptime commands | |51953|New|Enh|2011-10-04|Proposal: netmask filtering valve and filter | |52092|New|Enh|2011-10-26|Please make AsyncFileHandler and OneLineFormatter | |52235|New|Enh|2011-11-23|Please do a bit of SEO tuning for the web site| |52236|New|Enh|2011-11-23|Idea: support 'overlays' shaped like Maven overlay| |52323|New|Enh|2011-12-13|Cobertura test code coverage support for build.xml| |52381|New|Enh|2011-12-22|Please add OSGi metadata | |52448|New|Enh|2012-01-11|Cache jar indexes in WebappClassLoader to speed up| |52489|New|Enh|2012-01-19|Enhancement request for code signing of war files | |52558|New|Enh|2012-01-30|CometConnectionManagerValve is adding non-serializ| |52688|New|Enh|2012-02-16|Add ability to remove old access log files| |52751|Opn|Enh|2012-02-23|Optimized configuration of the system info display| |52777|New|Enh|2012-02-27|Automatically shut down old versions in parallel d| |52952|New|Enh|2012-03-20|Improve ExtensionValidator handling for embedded s| |53085|New|Enh|2012-04-16|[perf] [concurrency] DefaultInstanceManager.annota| |53387|New|Enh|2012-06-08|SSI: Allow to use $1 to get result of regular expr| |53411|Opn|Enh|2012-06-13|NullPointerException in org.apache.tomcat.util.buf| |53492|New|Enh|2012-07-01|Make JspC shell multithreaded | |53529|New|Nor|2012-07-10|Call interrupt() after InterruptedException instea| |53535|New|Nor|2012-07-11|Out of memory while performing ContextConfig.webCo| |53541|New|Maj|2012-07-12|Bug in virtual webapp feature. Custom tags badly s| |53545|New|Maj|2012-07-13|jsp:forward action to static resources causes Ille| |53547|New|Reg|2012-07-13|javax.servlet.ServletResponse.setContentType( Stri| +-+---+---+--+--+ | Total 49 bugs | +--
Bug report for Tomcat Modules [2012/07/15]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |48240|New|Nor|2009-11-19|Tomcat-Lite missing @Override markers | |48268|New|Nor|2009-11-23|Patch to fix generics in tomcat-lite | |48861|New|Nor|2010-03-04|Files without AL headers | |49685|New|Nor|2010-08-02|Unsafe synchronization in class ManagedBean | |49686|New|Nor|2010-08-02|Using an instance lock to protect static shared da| |50571|Inf|Nor|2011-01-11|Tomcat 7 JDBC connection pool exception enhancemen| |51595|Inf|Nor|2011-08-01|org.apache.tomcat.jdbc.pool.jmx.ConnectionPool sho| |51879|Inf|Enh|2011-09-22|Improve access to Native Connection Methods | |52024|Inf|Enh|2011-10-13|Custom interceptor to support automatic failover o| |52318|Inf|Cri|2011-12-11|Version in tomcat-jdbc POM is conflicted with Vers| |53088|Opn|Min|2012-04-17|Give PoolCleaner TimerTask a better name | |53198|New|Cri|2012-05-07|'driverClassName' Data Source Property Being Manda| |53199|Inf|Enh|2012-05-07|Refactor ConnectionPool to use ScheduledExecutorSe| |53200|New|Enh|2012-05-07|Be able to use SlowQueryReport without reporting f| +-+---+---+--+--+ | Total 14 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat Native [2012/07/15]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |45392|New|Nor|2008-07-14|No OCSP support for client SSL verification | |46179|Opn|Maj|2008-11-10|apr ssl client authentication | |48655|Inf|Nor|2010-02-02|Active multipart downloads prevent tomcat shutdown| |49038|Inf|Nor|2010-04-02|Crash in tcnative | |51655|New|Nor|2011-08-12|Index page does not say what native does | |51813|New|Cri|2011-09-14|Tomcat randomly crashes with [libtcnative-1.so.1+0| |52153|New|Maj|2011-11-08|periodic JVM crash (access violation) on buffer fl| |52231|New|Nor|2011-11-23|Ant Tasks need to reflect changes in manager comma| |52319|New|Maj|2011-12-12|Tomcat 6 crashes with [libapr-1.so.0+0x196da] sig| |52627|New|Min|2012-02-08|Segmentation fault in org.apache.tomcat.jni.File.i| |52856|New|Maj|2012-03-08|High CPU load when the underlying socket error in | |53110|New|Cri|2012-04-20|Access Violation Error while creating SHM | |53481|New|Nor|2012-06-28|Support SSL_OP_CIPHER_SERVER_PREFERENCE / SSLHonor| +-+---+---+--+--+ | Total 13 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-dbcp (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-dbcp has an issue affecting its community integration. This issue affects 3 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-trunk : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... - tomcat-trunk-dbcp : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... - tomcat-trunk-test : 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-dbcp/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Made directory [/srv/gump/public/workspace/tomcat-trunk/tomcat-deps] -INFO- Failed with reason build failed -INFO- Failed to extract fallback artifacts from Gump Repository The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-dbcp/gump_work/build_tomcat-trunk_tomcat-trunk-dbcp.html Work Name: build_tomcat-trunk_tomcat-trunk-dbcp (Type: Build) Work ended in a state of : Failed Elapsed: 2 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-15072012.jar -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps build-tomcat-dbcp [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-openjdk/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/packages/jta-spec1_0_1/jta-spec1_0_1.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 build-manifests: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/manifests [copy] Copying 12 files to /srv/gump/public/workspace/tomcat-trunk/output/manifests build-tomcat-dbcp: [copy] Copying 70 files to /srv/gump/public/workspace/tomcat-trunk/tomcat-deps [patch] patching file src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java [patch] Hunk #1 succeeded at 661 (offset -113 lines). [patch] patching file src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java [patch] patching file src/java/org/apache/commons/dbcp/DelegatingResultSet.java [patch] Hunk #1 succeeded at 1079 (offset -195 lines). [patch] patching file src/java/org/apache/commons/dbcp/PoolingDataSource.java [patch] Hunk #1 succeeded at 437 (offset -52 lines). [patch] patching file src/java/org/apache/commons/dbcp/DelegatingConnection.java [patch] Hunk #1 succeeded at 678 (offset -126 lines). [patch] patching file src/java/org/apache/commons/dbcp/PoolingDriver.java [patch] Hunk #1 succeeded at 497 (offset -4 lines). [patch] patching file src/java/org/apache/commons/dbcp/DelegatingStatement.java [patch] Hunk #1 succeeded at 484 (offset -45 lines). [patch] patching file src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java [patch] Hunk #1 succeeded at 1204 (offset -173 lines). [patch] patching file src/java/org/apache/commons/dbcp/BasicDataSource.java [patch] Hunk #1 succeeded at 28 with fuzz 1. [patch] Hunk #2 succeeded at 1782 (offset -19 lines). [patch] patching file src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java [patch] Hunk #1 succeeded at 887 (offset -1 lines). [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/tomcat-deps/src/java/org/apache/tomcat/dbcp [move] Moving 75 files to /srv/gump/public/workspace/tomcat-trunk/tomcat-deps/src/java/org/apache/tomcat/dbcp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/tomcat-deps/classes [javac] Compiling 66 source files to /srv/
[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, 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-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: 1 sec Command Line: /usr/lib/jvm/java-6-openjdk/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-6-openjdk/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-15072012.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-15072012.jar:/srv/gump/public/workspace/junit/dist/junit-15072012.jar:/srv/gump /public/workspace/junit/dist/junit-dep-15072012.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-*[0-9T].jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-15072012.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-15072012.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-15072012.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-15072012-dep.jar - 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 BUILD FAILED /srv/gump/public/workspace/tomcat-7.0.x/build.xml:450: Could not create type checkstyle due to java.lang.NoClassDefFoundError: com/google/common/collect/Lists at com.puppycrawl.tools.checkstyle.CheckStyleTask.(CheckStyleTask.java:78) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) at java.lang.reflect.Constructor.newInstance(Constructor.java:532) at org.apache.tools.ant.AntTypeDefinition.innerCreateAndSet(AntTypeDefinition.java:328) at org.apache.tools.ant.AntTypeDefinition.createAndSet(AntTypeDefinition.java:274) at org.apache.tools.ant.AntTypeDefinition.icreate(AntTypeDefinition.java:219) at org.apache.tools.ant.AntTypeDefinition.create(AntTypeDefinition.java:206) at org.apache.tools.ant.ComponentHelper.createComponent(ComponentHelper.java:286) at org.apache.tools.ant.ComponentHelper.createComponent(ComponentHelper.java:264) at org.apache.tools.ant.UnknownElement.makeObject(UnknownElement.java:417) at org.apache.tools.ant.UnknownElement.maybeConfigure(UnknownElement.java:163) at org.apache.tools.ant.Task.perform(Task.java:347)
[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, 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-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: 1 sec Command Line: /usr/lib/jvm/java-6-openjdk/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-6-openjdk/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-15072012.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-15072012.jar:/srv/gump/public/workspace/junit/dist/junit-15072012.jar:/srv/gump /public/workspace/junit/dist/junit-dep-15072012.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-*[0-9T].jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-15072012.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-15072012.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-15072012.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-15072012-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 - 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 BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:461: Could not create type checkstyle due to java.lang.NoClassDefFoundError: com/google/common/collect/Lists at com.puppycrawl.tools.checkstyle.CheckStyleTask.(CheckStyleTask.java:78) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) at java.lang.reflect.Constructor.newInstance(Constructor.java:532) at org.apache.tools.ant.AntTypeDefinition.innerCreateAndSet(AntTypeDefinition.java:328) at org.apache.tools.ant.AntTypeDefinition.createAndSet(AntTypeDefinition.java:274) at org.apache.tools.ant.AntTypeDefinition.icreate(AntTypeDefinition.java:219) at org.apache.tools.ant.AntTypeDefinition.create(AntTypeDefinition.java:206) at org.apache.tools.ant.ComponentHelper.createComponent(ComponentHelper.java:286) at org.apache.tools.ant.ComponentHelper.createComponent(ComponentHelper.java:264) at org.apache.tools.ant.UnknownElement.makeObject(UnknownElement.java:417) at org.apache.tools.ant
svn commit: r1361753 - in /tomcat/trunk/java/org/apache/catalina/manager: ./ host/ util/
Author: markt
Date: Sun Jul 15 18:53:13 2012
New Revision: 1361753
URL: http://svn.apache.org/viewvc?rev=1361753&view=rev
Log:
Code clean-up for o.a.catalina.manager
- Add final prompted by UCDetector
- Java 7 use of <>
Modified:
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/JspHelper.java
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/util/ReverseComparator.java
tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java
Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1361753&r1=1361752&r2=1361753&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Sun
Jul 15 18:53:13 2012
@@ -873,7 +873,7 @@ public final class HTMLManagerServlet ex
RequestUtil.filter(cn.getDisplayName(;
}
Manager manager = ctxt.getManager();
-List sessions = new ArrayList();
+List sessions = new ArrayList<>();
sessions.addAll(Arrays.asList(manager.findSessions()));
if (manager instanceof DistributedManager && showProxySessions) {
// Add dummy proxy sessions
Modified: tomcat/trunk/java/org/apache/catalina/manager/JspHelper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/JspHelper.java?rev=1361753&r1=1361752&r2=1361753&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/JspHelper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/JspHelper.java Sun Jul 15
18:53:13 2012
@@ -168,7 +168,8 @@ public class JspHelper {
*/
private static final int HIGHEST_SPECIAL = '>';
-private static char[][] specialCharactersRepresentation = new
char[HIGHEST_SPECIAL + 1][];
+private static final char[][] specialCharactersRepresentation =
+new char[HIGHEST_SPECIAL + 1][];
static {
specialCharactersRepresentation['&'] = "&".toCharArray();
specialCharactersRepresentation['<'] = "<".toCharArray();
Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1361753&r1=1361752&r2=1361753&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Sun Jul
15 18:53:13 2012
@@ -190,7 +190,7 @@ public class ManagerServlet extends Http
/**
* Path used to store context descriptors.
*/
-protected File contextDescriptors = null;
+protected final File contextDescriptors = null;
/**
@@ -202,7 +202,7 @@ public class ManagerServlet extends Http
/**
* The host appBase.
*/
-protected File appBase = null;
+protected final File appBase = null;
/**
Modified:
tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java?rev=1361753&r1=1361752&r2=1361753&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java Sun
Jul 15 18:53:13 2012
@@ -65,25 +65,25 @@ public class StatusManagerServlet
/**
* Vector of protocol handlers object names.
*/
-protected Vector protocolHandlers = new Vector();
+protected final Vector protocolHandlers = new Vector<>();
/**
* Vector of thread pools object names.
*/
-protected Vector threadPools = new Vector();
+protected final Vector threadPools = new Vector<>();
/**
* Vector of request processors object names.
*/
-protected Vector requestProcessors = new Vector();
+protected final Vector requestProcessors = new Vector<>();
/**
* Vector of global request processors object names.
*/
-protected Vector globalRequestProcessors = new
Vector();
+protected final Vector globalRequestProcessors = new
Vector<>();
/**
Modified:
tomcat/trunk/java/org/apache/c
svn commit: r1361754 - /tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Author: markt
Date: Sun Jul 15 18:54:04 2012
New Revision: 1361754
URL: http://svn.apache.org/viewvc?rev=1361754&view=rev
Log:
Deprecate unused code
Modified:
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1361754&r1=1361753&r2=1361754&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Sun Jul
15 18:54:04 2012
@@ -1182,7 +1182,11 @@ public class ManagerServlet extends Http
*
* @param writer Writer to render to
* @param cn Name of the application to list session information for
+ *
+ * @deprecated Use {@link #sessions(PrintWriter, ContextName, int,
+ * StringManager)
*/
+@Deprecated
protected void sessions(PrintWriter writer, ContextName cn,
StringManager smClient) {
sessions(writer, cn, -1, smClient);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361755 - /tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Author: markt
Date: Sun Jul 15 18:54:52 2012
New Revision: 1361755
URL: http://svn.apache.org/viewvc?rev=1361755&view=rev
Log:
Deprecate unused code
Modified:
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1361755&r1=1361754&r2=1361755&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Sun Jul
15 18:54:52 2012
@@ -189,7 +189,9 @@ public class ManagerServlet extends Http
/**
* Path used to store context descriptors.
+ * @deprecated Unused
*/
+@Deprecated
protected final File contextDescriptors = null;
@@ -201,7 +203,9 @@ public class ManagerServlet extends Http
/**
* The host appBase.
+ * @deprecated Unused
*/
+@Deprecated
protected final File appBase = null;
@@ -1176,24 +1180,6 @@ public class ManagerServlet extends Http
/**
- * Session information for the web application at the specified context
path.
- * Displays a profile of session thisAccessedTime listing number
- * of sessions for each 10 minute interval up to 10 hours.
- *
- * @param writer Writer to render to
- * @param cn Name of the application to list session information for
- *
- * @deprecated Use {@link #sessions(PrintWriter, ContextName, int,
- * StringManager)
- */
-@Deprecated
-protected void sessions(PrintWriter writer, ContextName cn,
-StringManager smClient) {
-sessions(writer, cn, -1, smClient);
-}
-
-
-/**
*
* Extract the expiration request parameter
*
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361756 - /tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Author: markt Date: Sun Jul 15 18:55:44 2012 New Revision: 1361756 URL: http://svn.apache.org/viewvc?rev=1361756&view=rev Log: Remove unused code Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1361756&r1=1361755&r2=1361756&view=diff == --- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Sun Jul 15 18:55:44 2012 @@ -188,28 +188,12 @@ public class ManagerServlet extends Http /** - * Path used to store context descriptors. - * @deprecated Unused - */ -@Deprecated -protected final File contextDescriptors = null; - - -/** * The associated host. */ protected transient Host host = null; /** - * The host appBase. - * @deprecated Unused - */ -@Deprecated -protected final File appBase = null; - - -/** * MBean server. */ protected transient MBeanServer mBeanServer = null; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361758 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/ManagerServlet.java
Author: markt
Date: Sun Jul 15 19:01:21 2012
New Revision: 1361758
URL: http://svn.apache.org/viewvc?rev=1361758&view=rev
Log:
Deprecate unused code
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1361754-1361755
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1361758&r1=1361757&r2=1361758&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Sun Jul 15 19:01:21 2012
@@ -193,7 +193,9 @@ public class ManagerServlet extends Http
/**
* Path used to store context descriptors.
+ * @deprecated Unused
*/
+@Deprecated
protected File contextDescriptors = null;
@@ -205,10 +207,12 @@ public class ManagerServlet extends Http
/**
* The host appBase.
+ * @deprecated Unused
*/
+@Deprecated
protected File appBase = null;
-
-
+
+
/**
* MBean server.
*/
@@ -1191,7 +1195,11 @@ public class ManagerServlet extends Http
*
* @param writer Writer to render to
* @param cn Name of the application to list session information for
+ *
+ * @deprecated Use {@link #sessions(PrintWriter, ContextName, int,
+ * StringManager)
*/
+@Deprecated
protected void sessions(PrintWriter writer, ContextName cn,
StringManager smClient) {
sessions(writer, cn, -1, smClient);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361760 - /tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Author: markt
Date: Sun Jul 15 19:05:47 2012
New Revision: 1361760
URL: http://svn.apache.org/viewvc?rev=1361760&view=rev
Log:
Compare integers as integers not Dates.
Modified:
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1361760&r1=1361759&r2=1361760&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Sun
Jul 15 19:05:47 2012
@@ -1072,10 +1072,10 @@ public final class HTMLManagerServlet ex
}
};
} else if ("MaxInactiveInterval".equalsIgnoreCase(sortBy)) {
-comparator = new BaseSessionComparator() {
+comparator = new BaseSessionComparator() {
@Override
-public Comparable getComparableObject(Session session) {
-return new Date(session.getMaxInactiveInterval());
+public Comparable getComparableObject(Session
session) {
+return Integer.valueOf(session.getMaxInactiveInterval());
}
};
} else if ("new".equalsIgnoreCase(sortBy)) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361761 - /tomcat/trunk/java/org/apache/catalina/mbeans/
Author: markt
Date: Sun Jul 15 19:12:31 2012
New Revision: 1361761
URL: http://svn.apache.org/viewvc?rev=1361761&view=rev
Log:
Code clean-up for o.a.catalina.mbeans
- Add final prompted by UCDetector
- Java 7 use of <>
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/RoleMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/UserMBean.java
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java?rev=1361761&r1=1361760&r2=1361761&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java Sun Jul 15
19:12:31 2012
@@ -282,7 +282,7 @@ public class ContainerMBean extends Base
*/
public String[] findLifecycleListenerNames() throws MBeanException {
Container container = null;
-List result = new ArrayList();
+List result = new ArrayList<>();
try {
container = (Container) getManagedResource();
@@ -309,7 +309,7 @@ public class ContainerMBean extends Base
*/
public String[] findContainerListenerNames() throws MBeanException {
Container container = null;
-List result = new ArrayList();
+List result = new ArrayList<>();
try {
container = (Container) getManagedResource();
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java?rev=1361761&r1=1361760&r2=1361761&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
Sun Jul 15 19:12:31 2012
@@ -65,7 +65,7 @@ public class GlobalResourcesLifecycleLis
/**
* The configuration information registry for our managed beans.
*/
-protected static Registry registry = MBeanUtils.createRegistry();
+protected static final Registry registry = MBeanUtils.createRegistry();
// -- LifecycleListener Methods
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java?rev=1361761&r1=1361760&r2=1361761&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java Sun Jul 15
19:12:31 2012
@@ -70,14 +70,13 @@ public class GroupMBean extends BaseMode
/**
* The configuration information registry for our managed beans.
*/
-protected Registry registry = MBeanUtils.createRegistry();
+protected final Registry registry = MBeanUtils.createRegistry();
/**
* The ManagedBean information describing this MBean.
*/
-protected ManagedBean managed =
-registry.findManagedBean("Group");
+protected final ManagedBean managed = registry.findManagedBean("Group");
// - Attributes
@@ -89,7 +88,7 @@ public class GroupMBean extends BaseMode
public String[] getRoles() {
Group group = (Group) this.resource;
-ArrayList results = new ArrayList();
+ArrayList results = new ArrayList<>();
Iterator roles = group.getRoles();
while (roles.hasNext()) {
Role role = null;
@@ -116,7 +115,7 @@ public class GroupMBean extends BaseMode
public String[] getUsers() {
Group group = (Group) this.resource;
-ArrayList results = new ArrayList();
+ArrayList results = new ArrayList<>();
Iterator users = group.getUsers();
while (users.hasNext()) {
User user = null;
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java?rev=1361761&r1=1361760&r2=1361761&view=diff
==
svn commit: r1361762 - /tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
Author: markt
Date: Sun Jul 15 19:13:02 2012
New Revision: 1361762
URL: http://svn.apache.org/viewvc?rev=1361762&view=rev
Log:
Deprecate unused code
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java?rev=1361762&r1=1361761&r2=1361762&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java Sun Jul 15
19:13:02 2012
@@ -109,7 +109,10 @@ public class MBeanFactory {
* Return the managed bean definition for the specified bean type
*
* @param type MBean type
+ *
+ * @deprecated Unused
*/
+@Deprecated
public String findObjectName(String type) {
if (type.equals("org.apache.catalina.core.StandardContext")) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361763 - /tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
Author: markt
Date: Sun Jul 15 19:13:36 2012
New Revision: 1361763
URL: http://svn.apache.org/viewvc?rev=1361763&view=rev
Log:
Remove unused code
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java?rev=1361763&r1=1361762&r2=1361763&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java Sun Jul 15
19:13:36 2012
@@ -105,28 +105,6 @@ public class MBeanFactory {
this.container = container;
}
-/**
- * Return the managed bean definition for the specified bean type
- *
- * @param type MBean type
- *
- * @deprecated Unused
- */
-@Deprecated
-public String findObjectName(String type) {
-
-if (type.equals("org.apache.catalina.core.StandardContext")) {
-return "StandardContext";
-} else if (type.equals("org.apache.catalina.core.StandardEngine")) {
-return "Engine";
-} else if (type.equals("org.apache.catalina.core.StandardHost")) {
-return "Host";
-} else {
-return null;
-}
-
-}
-
/**
* Little convenience method to remove redundant code
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361764 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/mbeans/MBeanFactory.java
Author: markt
Date: Sun Jul 15 19:14:11 2012
New Revision: 1361764
URL: http://svn.apache.org/viewvc?rev=1361764&view=rev
Log:
Deprecate unused code
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1361762
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java?rev=1361764&r1=1361763&r2=1361764&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java Sun
Jul 15 19:14:11 2012
@@ -111,7 +111,10 @@ public class MBeanFactory {
* Return the managed bean definition for the specified bean type
*
* @param type MBean type
+ *
+ * @deprecated Unused
*/
+@Deprecated
public String findObjectName(String type) {
if (type.equals("org.apache.catalina.core.StandardContext")) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361768 - /tomcat/trunk/java/org/apache/catalina/realm/
Author: markt
Date: Sun Jul 15 19:34:05 2012
New Revision: 1361768
URL: http://svn.apache.org/viewvc?rev=1361768&view=rev
Log:
Code clean-up for o.a.catalina.realm
- Add final prompted by UCDetector
- Java 7 use of <>
Modified:
tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
tomcat/trunk/java/org/apache/catalina/realm/JAASCallbackHandler.java
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java
tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java?rev=1361768&r1=1361767&r2=1361768&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java Sun Jul 15
19:34:05 2012
@@ -48,7 +48,7 @@ public class CombinedRealm extends Realm
/**
* The list of Realms contained by this Realm.
*/
-protected List realms = new LinkedList();
+protected final List realms = new LinkedList<>();
/**
* Descriptive information about this Realm implementation.
Modified: tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java?rev=1361768&r1=1361767&r2=1361768&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java Sun Jul 15
19:34:05 2012
@@ -513,7 +513,7 @@ public class DataSourceRealm extends Rea
try {
stmt = roles(dbConnection, username);
rs = stmt.executeQuery();
-list = new ArrayList();
+list = new ArrayList<>();
while (rs.next()) {
String role = rs.getString(1);
Modified: tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java?rev=1361768&r1=1361767&r2=1361768&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java Sun Jul
15 19:34:05 2012
@@ -125,9 +125,10 @@ public class GenericPrincipal implements
this.name = name;
this.password = password;
this.userPrincipal = userPrincipal;
-if (roles != null) {
-this.roles = new String[roles.size()];
-this.roles = roles.toArray(this.roles);
+if (roles == null) {
+this.roles = new String[0];
+} else {
+this.roles = roles.toArray(new String[roles.size()]);
if (this.roles.length > 1)
Arrays.sort(this.roles);
}
@@ -142,7 +143,7 @@ public class GenericPrincipal implements
/**
* The username of the user represented by this Principal.
*/
-protected String name = null;
+protected final String name;
@Override
public String getName() {
@@ -154,7 +155,7 @@ public class GenericPrincipal implements
* The authentication credentials for the user represented by
* this Principal.
*/
-protected String password = null;
+protected final String password;
public String getPassword() {
return (this.password);
@@ -164,7 +165,7 @@ public class GenericPrincipal implements
/**
* The set of roles associated with this user.
*/
-protected String roles[] = new String[0];
+protected final String roles[];
public String[] getRoles() {
return (this.roles);
@@ -174,7 +175,7 @@ public class GenericPrincipal implements
/**
* The authenticated Principal to be exposed to applications.
*/
-protected Principal userPrincipal = null;
+protected final Principal userPrincipal;
@Override
public Principal getUserPrincipal() {
@@ -190,7 +191,7 @@ public class GenericPrincipal implements
* The JAAS LoginContext, if any, used to authenticate this Principal.
* Kept so we can call logout().
*/
-protected LoginContext logi
svn commit: r1361769 - in /tomcat/trunk/java/org/apache/catalina/realm: GenericPrincipal.java JAASRealm.java JDBCRealm.java MemoryRealm.java
Author: markt
Date: Sun Jul 15 19:37:46 2012
New Revision: 1361769
URL: http://svn.apache.org/viewvc?rev=1361769&view=rev
Log:
Deprecate unused code
Remove deprecation markers from JAASReam#setAppName
Modified:
tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java?rev=1361769&r1=1361768&r2=1361769&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java Sun Jul
15 19:37:46 2012
@@ -49,7 +49,10 @@ public class GenericPrincipal implements
*
* @param name The username of the user represented by this Principal
* @param password Credentials used to authenticate this user
+ *
+ * @deprecated Unused
*/
+@Deprecated
public GenericPrincipal(String name, String password) {
this(name, password, null);
Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=1361769&r1=1361768&r2=1361769&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java Sun Jul 15
19:37:46 2012
@@ -171,9 +171,7 @@ public class JAASRealm
/**
* setter for the appName member variable
- * @deprecated JAAS should use the Engine (domain) name and
webpp/host overrides
*/
-@Deprecated
public void setAppName(String name) {
appName = name;
}
Modified: tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=1361769&r1=1361768&r2=1361769&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java Sun Jul 15
19:37:46 2012
@@ -709,7 +709,10 @@ public class JDBCRealm
* Release our use of this connection so that it can be recycled.
*
* @param dbConnection The connection to be released
+ *
+ * @deprecated Unused
*/
+@Deprecated
protected void release(Connection dbConnection) {
// NO-OP since we are not pooling anything
Modified: tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java?rev=1361769&r1=1361768&r2=1361769&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java Sun Jul 15
19:37:46 2012
@@ -239,7 +239,10 @@ public class MemoryRealm extends RealmB
* Returns the principals for this realm.
*
* @return The principals, keyed by user name (a String)
+ *
+ * @deprecated Unused
*/
+@Deprecated
protected Map getPrincipals() {
return principals;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361770 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/realm/GenericPrincipal.java java/org/apache/catalina/realm/JAASRealm.java java/org/apache/catalina/realm/JDBCRealm.java jav
Author: markt
Date: Sun Jul 15 19:38:51 2012
New Revision: 1361770
URL: http://svn.apache.org/viewvc?rev=1361770&view=rev
Log:
Deprecate unused code
Remove deprecation markers from JAASReam#setAppName
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1361769
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java?rev=1361770&r1=1361769&r2=1361770&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
Sun Jul 15 19:38:51 2012
@@ -48,7 +48,10 @@ public class GenericPrincipal implements
*
* @param name The username of the user represented by this Principal
* @param password Credentials used to authenticate this user
+ *
+ * @deprecated Unused
*/
+@Deprecated
public GenericPrincipal(String name, String password) {
this(name, password, null);
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=1361770&r1=1361769&r2=1361770&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java Sun Jul
15 19:38:51 2012
@@ -178,9 +178,7 @@ public class JAASRealm
/**
* setter for the appName member variable
- * @deprecated JAAS should use the Engine (domain) name and
webpp/host overrides
*/
-@Deprecated
public void setAppName(String name) {
appName = name;
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=1361770&r1=1361769&r2=1361770&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java Sun Jul
15 19:38:51 2012
@@ -728,7 +728,10 @@ public class JDBCRealm
* Release our use of this connection so that it can be recycled.
*
* @param dbConnection The connection to be released
+ *
+ * @deprecated Unused
*/
+@Deprecated
protected void release(Connection dbConnection) {
// NO-OP since we are not pooling anything
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java?rev=1361770&r1=1361769&r2=1361770&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java Sun
Jul 15 19:38:51 2012
@@ -266,7 +266,10 @@ public class MemoryRealm extends RealmB
* Returns the principals for this realm.
*
* @return The principals, keyed by user name (a String)
+ *
+ * @deprecated Unused
*/
+@Deprecated
protected Map getPrincipals() {
return principals;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361771 - in /tomcat/trunk/java/org/apache/catalina/realm: GenericPrincipal.java JDBCRealm.java MemoryRealm.java
Author: markt
Date: Sun Jul 15 19:40:18 2012
New Revision: 1361771
URL: http://svn.apache.org/viewvc?rev=1361771&view=rev
Log:
Remove deprecated code
Modified:
tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java?rev=1361771&r1=1361770&r2=1361771&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java Sun Jul
15 19:40:18 2012
@@ -42,24 +42,6 @@ public class GenericPrincipal implements
// --- Constructors
-
-/**
- * Construct a new Principal, associated with the specified Realm, for the
- * specified username and password.
- *
- * @param name The username of the user represented by this Principal
- * @param password Credentials used to authenticate this user
- *
- * @deprecated Unused
- */
-@Deprecated
-public GenericPrincipal(String name, String password) {
-
-this(name, password, null);
-
-}
-
-
/**
* Construct a new Principal, associated with the specified Realm, for the
* specified username and password, with the specified role names
Modified: tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=1361771&r1=1361770&r2=1361771&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java Sun Jul 15
19:40:18 2012
@@ -706,21 +706,6 @@ public class JDBCRealm
/**
- * Release our use of this connection so that it can be recycled.
- *
- * @param dbConnection The connection to be released
- *
- * @deprecated Unused
- */
-@Deprecated
-protected void release(Connection dbConnection) {
-
-// NO-OP since we are not pooling anything
-
-}
-
-
-/**
* Return a PreparedStatement configured to perform the SELECT required
* to retrieve user roles for the specified username.
*
Modified: tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java?rev=1361771&r1=1361770&r2=1361771&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java Sun Jul 15
19:40:18 2012
@@ -235,22 +235,9 @@ public class MemoryRealm extends RealmB
}
-/**
- * Returns the principals for this realm.
- *
- * @return The principals, keyed by user name (a String)
- *
- * @deprecated Unused
- */
-@Deprecated
-protected Map getPrincipals() {
-return principals;
-}
-
// -- Lifecycle Methods
-
/**
* Prepare for the beginning of active use of the public methods of this
* component and implement the requirements of
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361772 - /tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
Author: markt
Date: Sun Jul 15 19:41:52 2012
New Revision: 1361772
URL: http://svn.apache.org/viewvc?rev=1361772&view=rev
Log:
Add getter/setter for roleSearchAsUser
Modified:
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1361772&r1=1361771&r2=1361772&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Sun Jul 15
19:41:52 2012
@@ -775,6 +775,14 @@ public class JNDIRealm extends RealmBase
}
+public boolean isRoleSearchAsUser() {
+return roleSearchAsUser;
+}
+
+public void setRoleSearchAsUser(boolean roleSearchAsUser) {
+this.roleSearchAsUser = roleSearchAsUser;
+}
+
/**
* Return the "search subtree for roles" flag.
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361774 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/realm/JNDIRealm.java webapps/docs/changelog.xml
Author: markt
Date: Sun Jul 15 19:43:28 2012
New Revision: 1361774
URL: http://svn.apache.org/viewvc?rev=1361774&view=rev
Log:
Add getter/setter for roleSearchAsUser
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1361772
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1361774&r1=1361773&r2=1361774&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java Sun Jul
15 19:43:28 2012
@@ -781,6 +781,14 @@ public class JNDIRealm extends RealmBase
}
+public boolean isRoleSearchAsUser() {
+return roleSearchAsUser;
+}
+
+public void setRoleSearchAsUser(boolean roleSearchAsUser) {
+this.roleSearchAsUser = roleSearchAsUser;
+}
+
/**
* Return the "search subtree for roles" flag.
*/
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=1361774&r1=1361773&r2=1361774&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Jul 15 19:43:28 2012
@@ -71,6 +71,10 @@
not always correctly normalize redirect URLs when the redirect URL
included a query string or fragment component. (markt)
+
+Add missing getter and setter for roleSearchAsUser option
+on JNDI Realm. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361776 - in /tomcat/trunk/java/org/apache/catalina/security: SecurityConfig.java SecurityListener.java SecurityUtil.java
Author: markt
Date: Sun Jul 15 19:47:20 2012
New Revision: 1361776
URL: http://svn.apache.org/viewvc?rev=1361776&view=rev
Log:
Code clean-up for o.a.catalina.security
- Add final prompted by UCDetector
- Java 7 use of <>
Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java
tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java
tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java?rev=1361776&r1=1361775&r2=1361776&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java Sun Jul
15 19:47:20 2012
@@ -49,26 +49,31 @@ public final class SecurityConfig{
/**
* List of protected package from conf/catalina.properties
*/
-private String packageDefinition;
+private final String packageDefinition;
/**
* List of protected package from conf/catalina.properties
*/
-private String packageAccess;
+private final String packageAccess;
/**
* Create a single instance of this class.
*/
-private SecurityConfig(){
+private SecurityConfig() {
+String definition = null;
+String access = null;
try{
-packageDefinition =
CatalinaProperties.getProperty("package.definition");
-packageAccess = CatalinaProperties.getProperty("package.access");
+definition = CatalinaProperties.getProperty("package.definition");
+access = CatalinaProperties.getProperty("package.access");
} catch (java.lang.Exception ex){
if (log.isDebugEnabled()){
log.debug("Unable to load properties using
CatalinaProperties", ex);
}
+} finally {
+packageDefinition = definition;
+packageAccess = access;
}
}
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java?rev=1361776&r1=1361775&r2=1361776&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java Sun
Jul 15 19:47:20 2012
@@ -42,7 +42,7 @@ public class SecurityListener implements
/**
* The list of operating system users not permitted to run Tomcat.
*/
-private Set checkedOsUsers = new HashSet();
+private final Set checkedOsUsers = new HashSet<>();
/**
* The minimum umask that must be configured for the operating system user
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java?rev=1361776&r1=1361775&r2=1361776&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java (original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java Sun Jul 15
19:47:20 2012
@@ -69,12 +69,12 @@ public final class SecurityUtil{
* Cache every object for which we are creating method on it.
*/
private static final Map objectCache =
-new ConcurrentHashMap();
+new ConcurrentHashMap<>();
private static final org.apache.juli.logging.Log log=
org.apache.juli.logging.LogFactory.getLog( SecurityUtil.class );
-private static boolean packageDefinitionEnabled =
+private static final boolean packageDefinitionEnabled =
(System.getProperty("package.definition") == null &&
System.getProperty("package.access") == null) ? false : true;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1360729 - in /tomcat/trunk: ./ modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ res/dbcp/
not sure if they want to make Java 7 minimum requirement - Original Message - > From: "sebb" > To: "Tomcat Developers List" > Sent: Saturday, July 14, 2012 8:04:42 PM > Subject: Re: svn commit: r1360729 - in /tomcat/trunk: ./ > modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ res/dbcp/ > > Do these patches need to be fed back to Commons DBCP? > > Or do they only apply to the version embedded by Tomcat? > > On 14 July 2012 21:47, Rainer Jung wrote: > > On 14.07.2012 22:25, Filip Hanik Mailing Lists wrote: > >> > >> I know, it's the same patch for DBCP as for DBCP2. > > > > > > Roger that. > > > > > >> we can fix it, not urgent though > > > > > > No hurry, maybe we'll be on DBCP2 until the first TC 8 release. > > > > Rainer > > > > > >> - Original Message - > >>> > >>> From: "Rainer Jung" > >>> To: dev@tomcat.apache.org > >>> Sent: Friday, July 13, 2012 3:47:27 AM > >>> Subject: Re: svn commit: r1360729 - in /tomcat/trunk: ./ > >>> modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ > >>> res/dbcp/ > >>> > >>> On 12.07.2012 17:38, fha...@apache.org wrote: > > Author: fhanik > Date: Thu Jul 12 15:38:28 2012 > New Revision: 1360729 > > URL: http://svn.apache.org/viewvc?rev=1360729&view=rev > Log: > Configure Tomcat trunk to build with Java 7. > This includes adding a patch to the Commons-DBCP code from > res/dbcp > > > Added: > tomcat/trunk/res/dbcp/ > tomcat/trunk/res/dbcp/dbcp-java-7.patch (with props) > >>> > >>> > >>> Just an info: when compiling TC trunk with Java 7 and ant 1.8.2 a > >>> few > >>> minutes ago, many of the offsets when applying the patch were > >>> quite > >>> big: > >>> > >>>[copy] Copying 68 files to > >>> /shared/build/dev/tomcat/deps/tomcat8-deps/tomcat8-deps/dbcp > >>> [patch] patching file > >>> src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java > >>> [patch] Hunk #1 succeeded at 660 (offset -114 lines). > >>> [patch] patching file > >>> src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java > >>> [patch] patching file > >>> src/java/org/apache/commons/dbcp/DelegatingResultSet.java > >>> [patch] Hunk #1 succeeded at 1078 (offset -196 lines). > >>> [patch] patching file > >>> src/java/org/apache/commons/dbcp/PoolingDataSource.java > >>> [patch] Hunk #1 succeeded at 437 (offset -52 lines). > >>> [patch] patching file > >>> src/java/org/apache/commons/dbcp/DelegatingConnection.java > >>> [patch] Hunk #1 succeeded at 678 (offset -126 lines). > >>> [patch] patching file > >>> src/java/org/apache/commons/dbcp/PoolingDriver.java > >>> [patch] Hunk #1 succeeded at 496 (offset -5 lines). > >>> [patch] patching file > >>> src/java/org/apache/commons/dbcp/DelegatingStatement.java > >>> [patch] Hunk #1 succeeded at 385 (offset -144 lines). > >>> [patch] patching file > >>> src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java > >>> [patch] Hunk #1 succeeded at 1206 (offset -171 lines). > >>> [patch] patching file > >>> src/java/org/apache/commons/dbcp/BasicDataSource.java > >>> [patch] Hunk #1 succeeded at 28 with fuzz 1. > >>> [patch] Hunk #2 succeeded at 1580 (offset -221 lines). > >>> [patch] patching file > >>> src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java > >>> [patch] Hunk #1 succeeded at 887 (offset -1 lines). > >>> > >>> Compilation for everything including DBCP works though. > >>> > >>> Regards, > >>> > >>> Rainer > > > > > > - > > 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 > > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361779 - in /tomcat/trunk/java/org/apache/catalina/servlets: CGIServlet.java DefaultServlet.java WebdavServlet.java
Author: markt
Date: Sun Jul 15 19:53:24 2012
New Revision: 1361779
URL: http://svn.apache.org/viewvc?rev=1361779&view=rev
Log:
Code clean-up for o.a.catalina.servlets
- Add final prompted by UCDetector
- Java 7 use of <>
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1361779&r1=1361778&r2=1361779&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Sun Jul 15
19:53:24 2012
@@ -273,10 +273,10 @@ public final class CGIServlet extends Ht
private long stderrTimeout = 2000;
/** object used to ensure multiple threads don't try to expand same file */
-static Object expandFileLock = new Object();
+private static final Object expandFileLock = new Object();
/** the shell environment variables to be passed to the CGI script */
-static Hashtable shellEnv = new Hashtable();
+private static final Hashtable shellEnv = new Hashtable<>();
/**
* Sets instance variables.
@@ -314,7 +314,7 @@ public final class CGIServlet extends Ht
}
if (getServletConfig().getInitParameter("executable-arg-1") != null) {
-List args = new ArrayList();
+List args = new ArrayList<>();
for (int i = 1;; i++) {
String arg = getServletConfig().getInitParameter(
"executable-arg-" + i);
@@ -678,13 +678,13 @@ public final class CGIServlet extends Ht
private String command = null;
/** cgi command's desired working directory */
-private File workingDirectory = null;
+private final File workingDirectory;
/** cgi command's command line parameters */
-private ArrayList cmdLineParameters = new ArrayList();
+private final ArrayList cmdLineParameters = new ArrayList<>();
/** whether or not this object is valid or not */
-private boolean valid = false;
+private final boolean valid;
/**
@@ -707,8 +707,9 @@ public final class CGIServlet extends Ht
if (this.valid) {
workingDirectory = new File(command.substring(0,
command.lastIndexOf(File.separator)));
+} else {
+workingDirectory = null;
}
-
}
@@ -933,7 +934,7 @@ public final class CGIServlet extends Ht
* (apologies to Marv Albert regarding MJ)
*/
-Hashtable envp = new Hashtable();
+Hashtable envp = new Hashtable<>();
// Add the shell environment variables (if any)
envp.putAll(shellEnv);
@@ -1384,16 +1385,16 @@ public final class CGIServlet extends Ht
protected class CGIRunner {
/** script/command to be executed */
-private String command = null;
+private final String command;
/** environment used when invoking the cgi script */
-private Hashtable env = null;
+private final Hashtable env;
/** working directory used when invoking the cgi script */
-private File wd = null;
+private final File wd;
/** command line parameters to be passed to the invoked script */
-private ArrayList params = null;
+private final ArrayList params;
/** stdin to be passed to cgi script */
private InputStream stdin = null;
@@ -1495,7 +1496,7 @@ public final class CGIServlet extends Ht
*/
protected String[] hashToStringArray(Hashtable h)
throws NullPointerException {
-Vector v = new Vector();
+Vector v = new Vector<>();
Enumeration e = h.keys();
while (e.hasMoreElements()) {
String k = e.nextElement();
@@ -1596,7 +1597,7 @@ public final class CGIServlet extends Ht
Process proc = null;
int bufRead = -1;
-List cmdAndArgs = new ArrayList();
+List cmdAndArgs = new ArrayList<>();
if (cgiExecutable.length() != 0) {
cmdAndArgs.add(cgiExecutable);
}
@@ -1842,7 +1843,7 @@ public final class CGIServlet extends Ht
private static final int STATE_SECOND_CR = 3;
private static final int STATE_HEADER_END = 4;
-private InputStream input;
+private final InputStream input;
private int state;
HTTPHeaderInputStream(InputStream theInput) {
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.
Re: svn commit: r1360729 - in /tomcat/trunk: ./ modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ res/dbcp/
On 15/07/2012 20:49, Filip Hanik Mailing Lists wrote: > not sure if they want to make Java 7 minimum requirement That will need a discussion on the commons dev list. If no-one brings it up sooner, I'll bring it up once Pool2 is sorted as work will naturally move to dbcp2 at that point. Mark > > - Original Message - >> From: "sebb" >> To: "Tomcat Developers List" >> Sent: Saturday, July 14, 2012 8:04:42 PM >> Subject: Re: svn commit: r1360729 - in /tomcat/trunk: ./ >> modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ res/dbcp/ >> >> Do these patches need to be fed back to Commons DBCP? >> >> Or do they only apply to the version embedded by Tomcat? >> >> On 14 July 2012 21:47, Rainer Jung wrote: >>> On 14.07.2012 22:25, Filip Hanik Mailing Lists wrote: I know, it's the same patch for DBCP as for DBCP2. >>> >>> >>> Roger that. >>> >>> we can fix it, not urgent though >>> >>> >>> No hurry, maybe we'll be on DBCP2 until the first TC 8 release. >>> >>> Rainer >>> >>> - Original Message - > > From: "Rainer Jung" > To: dev@tomcat.apache.org > Sent: Friday, July 13, 2012 3:47:27 AM > Subject: Re: svn commit: r1360729 - in /tomcat/trunk: ./ > modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ > res/dbcp/ > > On 12.07.2012 17:38, fha...@apache.org wrote: >> >> Author: fhanik >> Date: Thu Jul 12 15:38:28 2012 >> New Revision: 1360729 >> >> URL: http://svn.apache.org/viewvc?rev=1360729&view=rev >> Log: >> Configure Tomcat trunk to build with Java 7. >> This includes adding a patch to the Commons-DBCP code from >> res/dbcp >> >> >> Added: >> tomcat/trunk/res/dbcp/ >> tomcat/trunk/res/dbcp/dbcp-java-7.patch (with props) > > > Just an info: when compiling TC trunk with Java 7 and ant 1.8.2 a > few > minutes ago, many of the offsets when applying the patch were > quite > big: > >[copy] Copying 68 files to > /shared/build/dev/tomcat/deps/tomcat8-deps/tomcat8-deps/dbcp > [patch] patching file > src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java > [patch] Hunk #1 succeeded at 660 (offset -114 lines). > [patch] patching file > src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java > [patch] patching file > src/java/org/apache/commons/dbcp/DelegatingResultSet.java > [patch] Hunk #1 succeeded at 1078 (offset -196 lines). > [patch] patching file > src/java/org/apache/commons/dbcp/PoolingDataSource.java > [patch] Hunk #1 succeeded at 437 (offset -52 lines). > [patch] patching file > src/java/org/apache/commons/dbcp/DelegatingConnection.java > [patch] Hunk #1 succeeded at 678 (offset -126 lines). > [patch] patching file > src/java/org/apache/commons/dbcp/PoolingDriver.java > [patch] Hunk #1 succeeded at 496 (offset -5 lines). > [patch] patching file > src/java/org/apache/commons/dbcp/DelegatingStatement.java > [patch] Hunk #1 succeeded at 385 (offset -144 lines). > [patch] patching file > src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java > [patch] Hunk #1 succeeded at 1206 (offset -171 lines). > [patch] patching file > src/java/org/apache/commons/dbcp/BasicDataSource.java > [patch] Hunk #1 succeeded at 28 with fuzz 1. > [patch] Hunk #2 succeeded at 1580 (offset -221 lines). > [patch] patching file > src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java > [patch] Hunk #1 succeeded at 887 (offset -1 lines). > > Compilation for everything including DBCP works though. > > Regards, > > Rainer >>> >>> >>> - >>> 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 >> >> > > - > 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
svn commit: r1361796 - in /tomcat/trunk/java/org/apache/catalina: servlets/WebdavServlet.java util/ConcurrentDateFormat.java
Author: markt
Date: Sun Jul 15 21:03:04 2012
New Revision: 1361796
URL: http://svn.apache.org/viewvc?rev=1361796&view=rev
Log:
Fix Find Bugs warnings - thread safety of data formatting
Added:
tomcat/trunk/java/org/apache/catalina/util/ConcurrentDateFormat.java
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1361796&r1=1361795&r2=1361796&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Sun Jul
15 21:03:04 2012
@@ -26,7 +26,6 @@ import java.io.StringWriter;
import java.io.Writer;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Enumeration;
import java.util.Hashtable;
@@ -49,6 +48,7 @@ import javax.xml.parsers.DocumentBuilder
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import org.apache.catalina.util.ConcurrentDateFormat;
import org.apache.catalina.util.DOMWriter;
import org.apache.catalina.util.MD5Encoder;
import org.apache.catalina.util.XMLWriter;
@@ -199,8 +199,9 @@ public class WebdavServlet
/**
* Simple date format for the creation date ISO representation (partial).
*/
-protected static final SimpleDateFormat creationDateFormat =
-new SimpleDateFormat("-MM-dd'T'HH:mm:ss'Z'", Locale.US);
+protected static final ConcurrentDateFormat creationDateFormat =
+new ConcurrentDateFormat("-MM-dd'T'HH:mm:ss'Z'", Locale.US,
+TimeZone.getTimeZone("GMT"));
/**
@@ -215,15 +216,8 @@ public class WebdavServlet
protected static final MD5Encoder md5Encoder = new MD5Encoder();
-
-static {
-creationDateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
-}
-
-
// - Instance Variables
-
/**
* Repository of the locks put on single resources.
*
@@ -2606,27 +2600,7 @@ public class WebdavServlet
* Get creation date in ISO format.
*/
private String getISOCreationDate(long creationDate) {
-StringBuilder creationDateValue = new StringBuilder
-(creationDateFormat.format
- (new Date(creationDate)));
-/*
-int offset = Calendar.getInstance().getTimeZone().getRawOffset()
-/ 360; // FIXME ?
-if (offset < 0) {
-creationDateValue.append("-");
-offset = -offset;
-} else if (offset > 0) {
-creationDateValue.append("+");
-}
-if (offset != 0) {
-if (offset < 10)
-creationDateValue.append("0");
-creationDateValue.append(offset + ":00");
-} else {
-creationDateValue.append("Z");
-}
-*/
-return creationDateValue.toString();
+return creationDateFormat.format(new Date(creationDate));
}
/**
Added: tomcat/trunk/java/org/apache/catalina/util/ConcurrentDateFormat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ConcurrentDateFormat.java?rev=1361796&view=auto
==
--- tomcat/trunk/java/org/apache/catalina/util/ConcurrentDateFormat.java (added)
+++ tomcat/trunk/java/org/apache/catalina/util/ConcurrentDateFormat.java Sun
Jul 15 21:03:04 2012
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ */
+package org.apache.catalina.util;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Queue;
+import java.util.TimeZone;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+/**
+ * A thread safe wrapper around {@link SimpleDateFormat} that does not make use
+ * of ThreadLocal and - broadly - only creates enough Simp
svn commit: r1361802 - /tomcat/trunk/java/org/apache/catalina/session/
Author: markt
Date: Sun Jul 15 21:18:36 2012
New Revision: 1361802
URL: http://svn.apache.org/viewvc?rev=1361802&view=rev
Log:
Code clean-up for o.a.catalina.session
- Add final prompted by UCDetector
- Java 7 use of <>
Modified:
tomcat/trunk/java/org/apache/catalina/session/FileStore.java
tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/PersistentManager.java
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/trunk/java/org/apache/catalina/session/StandardSessionFacade.java
tomcat/trunk/java/org/apache/catalina/session/StoreBase.java
tomcat/trunk/java/org/apache/catalina/session/TooManyActiveSessionsException.java
Modified: tomcat/trunk/java/org/apache/catalina/session/FileStore.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/FileStore.java?rev=1361802&r1=1361801&r2=1361802&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/FileStore.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/FileStore.java Sun Jul 15
21:18:36 2012
@@ -205,7 +205,7 @@ public final class FileStore extends Sto
}
// Build and return the list of session identifiers
-ArrayList list = new ArrayList();
+ArrayList list = new ArrayList<>();
int n = FILE_EXT.length();
for (int i = 0; i < files.length; i++) {
if (files[i].endsWith(FILE_EXT)) {
Modified: tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java?rev=1361802&r1=1361801&r2=1361802&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java Sun Jul 15
21:18:36 2012
@@ -64,12 +64,12 @@ public class JDBCStore extends StoreBase
/**
* Name to register for this Store, used for logging.
*/
-protected static String storeName = "JDBCStore";
+protected static final String storeName = "JDBCStore";
/**
* Name to register for the background thread.
*/
-protected String threadName = "JDBCStore";
+protected final String threadName = "JDBCStore";
/**
* The connection username to use when trying to connect to the database.
@@ -490,7 +490,7 @@ public class JDBCStore extends StoreBase
preparedKeysSql.setString(1, getName());
rst = preparedKeysSql.executeQuery();
-ArrayList tmpkeys = new ArrayList();
+ArrayList tmpkeys = new ArrayList<>();
if (rst != null) {
while (rst.next()) {
tmpkeys.add(rst.getString(1));
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=1361802&r1=1361801&r2=1361802&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Sun Jul 15
21:18:36 2012
@@ -137,10 +137,10 @@ public abstract class ManagerBase extend
protected static final int TIMING_STATS_CACHE_SIZE = 100;
protected final Deque sessionCreationTiming =
-new LinkedList();
+new LinkedList<>();
protected final Deque sessionExpirationTiming =
-new LinkedList();
+new LinkedList<>();
/**
* Number of sessions that have expired.
@@ -152,7 +152,7 @@ public abstract class ManagerBase extend
* The set of currently active Sessions for this Manager, keyed by
* session identifier.
*/
-protected Map sessions = new ConcurrentHashMap();
+protected Map sessions = new ConcurrentHashMap<>();
// Number of sessions created by this manager
protected long sessionCounter=0;
@@ -978,7 +978,7 @@ public abstract class ManagerBase extend
@Override
public int getSessionAverageAliveTime() {
// Copy current stats
-List copy = new ArrayList();
+List copy = new ArrayList<>();
synchronized (sessionExpirationTiming) {
copy.addAll(sessionExpirationTiming);
}
@@ -1014,7 +1014,7 @@ public abstract class ManagerBase extend
public int getSessionCreateRate() {
long now = System.currentTimeMillis();
// Copy current stats
-List copy = new ArrayLis
svn commit: r1361817 - /tomcat/trunk/java/org/apache/catalina/InstanceEvent.java
Author: markt
Date: Sun Jul 15 21:51:10 2012
New Revision: 1361817
URL: http://svn.apache.org/viewvc?rev=1361817&view=rev
Log:
Clean-up: UCDetector
Modified:
tomcat/trunk/java/org/apache/catalina/InstanceEvent.java
Modified: tomcat/trunk/java/org/apache/catalina/InstanceEvent.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/InstanceEvent.java?rev=1361817&r1=1361816&r2=1361817&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/InstanceEvent.java (original)
+++ tomcat/trunk/java/org/apache/catalina/InstanceEvent.java Sun Jul 15
21:51:10 2012
@@ -144,12 +144,7 @@ public final class InstanceEvent extends
* @param type Event type (required)
*/
public InstanceEvent(Wrapper wrapper, Filter filter, String type) {
-
- super(wrapper);
- this.filter = filter;
- this.servlet = null;
- this.type = type;
-
+this(wrapper, filter, type, null, null, null);
}
@@ -164,13 +159,7 @@ public final class InstanceEvent extends
*/
public InstanceEvent(Wrapper wrapper, Filter filter, String type,
Throwable exception) {
-
- super(wrapper);
- this.filter = filter;
- this.servlet = null;
- this.type = type;
- this.exception = exception;
-
+this(wrapper, filter, type, null, null, exception);
}
@@ -186,14 +175,7 @@ public final class InstanceEvent extends
*/
public InstanceEvent(Wrapper wrapper, Filter filter, String type,
ServletRequest request, ServletResponse response) {
-
- super(wrapper);
- this.filter = filter;
- this.servlet = null;
- this.type = type;
- this.request = request;
- this.response = response;
-
+this(wrapper, filter, type, request, response, null);
}
@@ -232,12 +214,7 @@ public final class InstanceEvent extends
* @param type Event type (required)
*/
public InstanceEvent(Wrapper wrapper, Servlet servlet, String type) {
-
- super(wrapper);
- this.filter = null;
- this.servlet = servlet;
- this.type = type;
-
+this(wrapper, servlet, type, null, null, null);
}
@@ -252,13 +229,7 @@ public final class InstanceEvent extends
*/
public InstanceEvent(Wrapper wrapper, Servlet servlet, String type,
Throwable exception) {
-
- super(wrapper);
- this.filter = null;
- this.servlet = servlet;
- this.type = type;
- this.exception = exception;
-
+this(wrapper, servlet, type, null, null, exception);
}
@@ -274,14 +245,7 @@ public final class InstanceEvent extends
*/
public InstanceEvent(Wrapper wrapper, Servlet servlet, String type,
ServletRequest request, ServletResponse response) {
-
- super(wrapper);
- this.filter = null;
- this.servlet = servlet;
- this.type = type;
- this.request = request;
- this.response = response;
-
+this(wrapper, servlet, type, request, response, null);
}
@@ -319,41 +283,41 @@ public final class InstanceEvent extends
* by this event (AFTER_INIT_EVENT, AFTER_SERVICE_EVENT,
* AFTER_DESTROY_EVENT, AFTER_DISPATCH_EVENT, and AFTER_FILTER_EVENT only).
*/
-private Throwable exception = null;
+private final Throwable exception;
/**
* The Filter instance for which this event occurred (BEFORE_FILTER_EVENT
* and AFTER_FILTER_EVENT only).
*/
-private transient Filter filter = null;
+private final transient Filter filter;
/**
* The servlet request being processed (BEFORE_FILTER_EVENT,
* AFTER_FILTER_EVENT, BEFORE_SERVICE_EVENT, and AFTER_SERVICE_EVENT).
*/
-private transient ServletRequest request = null;
+private final transient ServletRequest request;
/**
* The servlet response being processed (BEFORE_FILTER_EVENT,
* AFTER_FILTER_EVENT, BEFORE_SERVICE_EVENT, and AFTER_SERVICE_EVENT).
*/
-private transient ServletResponse response = null;
+private final transient ServletResponse response;
/**
* The Servlet instance for which this event occurred (not present on
* BEFORE_FILTER_EVENT or AFTER_FILTER_EVENT events).
*/
-private transient Servlet servlet = null;
+private final transient Servlet servlet;
/**
* The event type this instance represents.
*/
-private String type = null;
+private final String type;
// - Properties
@@ -429,6 +393,4 @@ public final class InstanceEvent extends
return (Wrapper) getSource();
}
-
-
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361818 - /tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java
Author: markt Date: Sun Jul 15 21:51:26 2012 New Revision: 1361818 URL: http://svn.apache.org/viewvc?rev=1361818&view=rev Log: Clean-up: UCDetector Modified: tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java Modified: tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java?rev=1361818&r1=1361817&r2=1361818&view=diff == --- tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java (original) +++ tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java Sun Jul 15 21:51:26 2012 @@ -60,13 +60,13 @@ public final class LifecycleEvent extend /** * The event data associated with this event. */ -private Object data = null; +private final Object data; /** * The event type this instance represents. */ -private String type = null; +private final String type; // - Properties - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361820 - /tomcat/trunk/java/org/apache/catalina/SessionEvent.java
Author: markt Date: Sun Jul 15 21:56:01 2012 New Revision: 1361820 URL: http://svn.apache.org/viewvc?rev=1361820&view=rev Log: Clean-up: UCDetector Modified: tomcat/trunk/java/org/apache/catalina/SessionEvent.java Modified: tomcat/trunk/java/org/apache/catalina/SessionEvent.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/SessionEvent.java?rev=1361820&r1=1361819&r2=1361820&view=diff == --- tomcat/trunk/java/org/apache/catalina/SessionEvent.java (original) +++ tomcat/trunk/java/org/apache/catalina/SessionEvent.java Sun Jul 15 21:56:01 2012 @@ -37,19 +37,19 @@ public final class SessionEvent extends /** * The event data associated with this event. */ -private Object data = null; +private final Object data; /** * The Session on which this event occurred. */ -private Session session = null; +private final Session session; /** * The event type this instance represents. */ -private String type = null; +private final String type; /** - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361823 - /tomcat/trunk/java/org/apache/catalina/ssi/
Author: markt
Date: Sun Jul 15 22:16:06 2012
New Revision: 1361823
URL: http://svn.apache.org/viewvc?rev=1361823&view=rev
Log:
Code clean-up for o.a.catalina.ssi
- Add final prompted by UCDetector
- Java 7 use of <>
Modified:
tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java
tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java
tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIExec.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIProcessor.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
Modified:
tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java?rev=1361823&r1=1361822&r2=1361823&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
Sun Jul 15 22:16:06 2012
@@ -35,7 +35,7 @@ public class ByteArrayServletOutputStrea
/**
* Our buffer to hold the stream.
*/
-protected ByteArrayOutputStream buf = null;
+protected final ByteArrayOutputStream buf;
/**
Modified: tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java?rev=1361823&r1=1361822&r2=1361823&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java Sun Jul
15 22:16:06 2012
@@ -33,12 +33,12 @@ public class ExpressionParseTree {
* Contains the current set of completed nodes. This is a workspace for the
* parser.
*/
-private LinkedList nodeStack = new LinkedList();
+private final LinkedList nodeStack = new LinkedList<>();
/**
* Contains operator nodes that don't yet have values. This is a workspace
* for the parser.
*/
-private LinkedList oppStack = new LinkedList();
+private final LinkedList oppStack = new LinkedList<>();
/**
* The root node after the expression has been parsed.
*/
@@ -46,7 +46,7 @@ public class ExpressionParseTree {
/**
* The SSIMediator to use when evaluating the expressions.
*/
-private SSIMediator ssiMediator;
+private final SSIMediator ssiMediator;
/**
Modified: tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java?rev=1361823&r1=1361822&r2=1361823&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java Sun Jul
15 22:16:06 2012
@@ -39,10 +39,10 @@ public class ExpressionTokenizer {
public static final int TOKEN_GT = 10;
public static final int TOKEN_LT = 11;
public static final int TOKEN_END = 12;
-private char[] expr;
+private final char[] expr;
private String tokenVal = null;
private int index;
-private int length;
+private final int length;
/**
Modified: tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java?rev=1361823&r1=1361822&r2=1361823&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java Sun
Jul 15 22:16:06 2012
@@ -56,12 +56,12 @@ public class ResponseIncludeWrapper exte
/**
* Our ServletOutputStream
*/
-protected ServletOutputStream captureServletOutputStream;
+protected final ServletOutputStream captureServletOutputStream;
protected ServletOutputStream servletOutputStream;
protected PrintWriter printWriter;
-private ServletContext context;
-private HttpServletRequest request;
+private final ServletContext context;
+private final HttpServletRequest request;
static {
RFC1123_FORMAT = new SimpleDateFormat(RFC1123_PATTERN, Locale.US);
@@ -163,17 +163,6 @@ public class ResponseIncludeWrapper exte
}
/**
- * Sets the value of the last-modified header field.
-
