[Bug 53777] Ability to bundle JAAS Configuration in Webappp
https://issues.apache.org/bugzilla/show_bug.cgi?id=53777 --- Comment #5 from eolivelli eolive...@gmail.com --- Sorry, I was using TomEE (Tomcat + OpenEJB). With a raw Tomcat the problem does not happen, I reported this problem on OpenEJB list -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-taglibs-standard (in module tomcat-taglibs) failed
To whom it may engage...
This is an automated request, but not an unsolicited one. For
more information please visit http://gump.apache.org/nagged.html,
and/or contact the folk at gene...@gump.apache.org.
Project tomcat-taglibs-standard has an issue affecting its community
integration.
This issue affects 2 projects,
and has been outstanding for 35 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-taglibs-standard : Standard Taglib
- tomcat-taglibs-standard-install : JSP Taglibs
Full details are available at:
http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/index.html
That said, some information snippets are provided here.
The following annotations (debug/informational/warning/error messages) were
provided:
-INFO- Optional dependency httpunit failed with reason build failed
-DEBUG- (Apache Gump generated) Apache Maven Settings in:
/srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml
-INFO- Failed with reason build failed
-DEBUG- Maven POM in:
/srv/gump/public/workspace/tomcat-taglibs/standard/pom.xml
-INFO- Failed to extract fallback artifacts from Gump Repository
The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/gump_work/build_tomcat-taglibs_tomcat-taglibs-standard.html
Work Name: build_tomcat-taglibs_tomcat-taglibs-standard (Type: Build)
Work ended in a state of : Failed
Elapsed: 20 secs
Command Line: /opt/maven2/bin/mvn --batch-mode -DskipTests=true --settings
/srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml
install
[Working Directory: /srv/gump/public/workspace/tomcat-taglibs/standard]
M2_HOME: /opt/maven2
-
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Nothing to compile - all classes are up to date
[debug] execute contextualize
[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory
/srv/gump/public/workspace/tomcat-taglibs/standard/spec/src/test/resources
[INFO] Copying 3 resources
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] No sources to compile
[INFO] [surefire:test {execution: default-test}]
[INFO] Tests are skipped.
[INFO] [bundle:bundle {execution: default-bundle}]
[INFO] [install:install {execution: default-install}]
[INFO] Installing
/srv/gump/public/workspace/tomcat-taglibs/standard/spec/target/taglibs-standard-spec-1.2-SNAPSHOT.jar
to
/srv/gump/public/workspace/mvnlocalrepo/shared/org/apache/taglibs/taglibs-standard-spec/1.2-SNAPSHOT/taglibs-standard-spec-1.2-SNAPSHOT.jar
[INFO] [bundle:install {execution: default-install}]
[INFO] Parsing
file:/srv/gump/public/workspace/mvnlocalrepo/shared/repository.xml
[INFO] Installing
org/apache/taglibs/taglibs-standard-spec/1.2-SNAPSHOT/taglibs-standard-spec-1.2-SNAPSHOT.jar
[INFO] Writing OBR metadata
[INFO]
[INFO] Building JSTL Implementation
[INFO]task-segment: [install]
[INFO]
[INFO] [remote-resources:process {execution: default}]
[INFO] snapshot org.apache.taglibs:taglibs-standard-spec:1.2-SNAPSHOT: checking
for updates from apache.snapshots
[debug] execute contextualize
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 14 resources
[INFO] Copying 3 resources
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 96 source files to
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/target/classes
[INFO] -
[ERROR] COMPILATION ERROR :
[INFO] -
[ERROR]
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java:[38,7]
error: DataSourceWrapper is not abstract and does not override abstract method
getParentLogger() in CommonDataSource
[INFO] 1 error
[INFO] -
[INFO]
[ERROR] BUILD FAILURE
[INFO]
[INFO] Compilation failure
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java:[38,7]
error: DataSourceWrapper is not abstract and does not override abstract method
getParentLogger() in CommonDataSource
[INFO]
[INFO] For more information, run Maven with the -e switch
[INFO]
Bug report for Tomcat 5 [2012/08/26]
+---+ | 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| |53712|New|Nor|2012-08-13|localvariabletable length error reintroduced? | +-+---+---+--+--+ | Total3 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Taglibs [2012/08/26]
+---+ | 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 Connectors [2012/08/26]
+---+ | 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 | |53762|New|Nor|2012-08-22|JK status manager: mass nodes handling doesn't wor| +-+---+---+--+--+ | Total 42 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/08/26]
+---+ | 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|
Bug report for Tomcat 7 [2012/08/26]
+---+ | 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| |53469|Opn|Nor|2012-06-26|possible bug in Response.normalize(CharChunk cc) | |53492|New|Enh|2012-07-01|Make JspC shell multithreaded | |53553|New|Enh|2012-07-16|[PATCH] Deploy uploaded WAR with context.xml from | |53602|New|Enh|2012-07-25|Support for HTTP status code 451 | |53620|New|Enh|2012-07-30|[juli] delay opening a file until something gets l| |53665|New|Enh|2012-08-06|Minor JNDI Howto document enhancement concerning m| |53713|Inf|Enh|2012-08-14|Performance tuning solution for JspReader | |53756|New|Enh|2012-08-21|org.apache.catalina.realm.JDBCRealm should have an|
Bug report for Tomcat Modules [2012/08/26]
+---+ | 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| |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| |53565|New|Min|2012-07-18|deprecated| +-+---+---+--+--+ | 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/08/26]
+---+ | 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 | |53605|New|Nor|2012-07-26|use tcnative-1.1.24 Tomcat shutdown still crash | +-+---+---+--+--+ | Total 13 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Release date of tomcat7-maven-plugin 2.0
Hi Something to release first on maven side. Then should be ok. -- Olivier Send from a vt100 phone console Le 23 août 2012 14:37, Franken, Arne arne.fran...@coremedia.com a écrit : Hi, I wanted to inquire again about the 2.0 release date, in your last email you said it would probably be this week. Is this still the case? I guess that I may be responsible for any delays by raising https://issues.apache.org/jira/browse/MTOMCAT-173 against version 2.0 ;-) My last comment describes a workaround that is currently working for me, so the bug could be fixed in 2.1. Cheers, Arne Am 8/8/12 11:58 PM schrieb Olivier Lamy unter ol...@apache.org: Hi, Sure I wanted to release 2.0 soon. I have a week vacations next week. So will be week after :-). 2012/8/8 Franken, Arne arne.fran...@coremedia.com: Hi, I was wondering when I could expect a 2.0 release (or at least a new beta release) of the tomcat7-maven-plugin. Did you already set a release date? I am asking because the fix for https://issues.apache.org/jira/browse/MTOMCAT-136 Isn¹t included in 2.0-beta-1. Cheers, Arne -- Arne Franken Software Engineer tel +49.40.325587.240 fax +49.40.325587.999 arne.fran...@coremedia.com CoreMedia AG content | context | conversion Ludwig-Erhard-Str. 18 20459 Hamburg, Germany www.coremedia.com Executive Board: Gerrit Kolb (CEO), Dr. Klemens Kleiminger (CFO) Supervisory Board: Prof. Dr. Florian Matthes (Chairman) Trade Register: Amtsgericht Hamburg, HR B 76277 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of PoweredBy by veysel
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Tomcat Wiki for change
notification.
The PoweredBy page has been changed by veysel:
http://wiki.apache.org/tomcat/PoweredBy?action=diffrev1=435rev2=436
{{http://www.esagegroup.com/images/logoAnimation.gif}}
[[http://www.esagegroup.com|eSage Group]] - A consulting company, most of our
projects are built on Tomcat.
=== Temizlik ===
- [[http://www.temizlikportali.com/|http://www.temizlikportali.com]] uses
Tomcat for own production systems and development services.
+ [[http://www.temizlikportali.com/|Temizlik]]
[[http://www.temizlikportali.com/|Temizlik şirketleri]]
[[http://www.temizlikportali.com/|Temizlik firmaları]] uses Tomcat for own
production systems and development services.
=== eTools.ch ===
{{http://www.etools.ch/images/logo.gif}} [[http://www.etools.ch/|eTools.ch]]
is a fast and transparent metasearch engine that simultaneously queries major
search engines.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377433 - /tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
Author: kkolinko
Date: Sun Aug 26 13:23:35 2012
New Revision: 1377433
URL: http://svn.apache.org/viewvc?rev=1377433view=rev
Log:
Fix typos etc. in code that prints merged web.xml
jsp-property-group elements were printed in the wrong order,
so that XML validation against schema was failing for the merged web.xml of
examples webapp.
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=1377433r1=1377432r2=1377433view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java Sun Aug 26
13:23:35 2012
@@ -549,7 +549,7 @@ public class WebXml {
return messageDestinations;
}
-// locale-encoging-mapping-list
+// locale-encoding-mapping-list
private final MapString,String localeEncodingMappings = new HashMap();
public void addLocaleEncodingMapping(String locale, String encoding) {
localeEncodingMappings.put(locale, encoding);
@@ -601,7 +601,8 @@ public class WebXml {
sb.append( xmlns:xsi=);
sb.append(\http://www.w3.org/2001/XMLSchema-instance\\n;);
sb.append( xsi:schemaLocation=);
-sb.append(\http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd\\n;);
+sb.append(\http://java.sun.com/xml/ns/javaee; +
+ http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd\\n;);
sb.append( version=\);
sb.append(getVersion());
sb.append(\\n);
@@ -616,7 +617,7 @@ public class WebXml {
for (Map.EntryString, String entry : contextParams.entrySet()) {
sb.append( context-param\n);
appendElement(sb, INDENT4, param-name, entry.getKey());
-appendElement(sb, INDENT4, param-valuee, entry.getValue());
+appendElement(sb, INDENT4, param-value, entry.getValue());
sb.append( /context-param\n);
}
sb.append('\n');
@@ -805,17 +806,17 @@ public class WebXml {
appendElement(sb, INDENT6, url-pattern, urlPattern);
}
appendElement(sb, INDENT6, el-ignored, jpg.getElIgnored());
-appendElement(sb, INDENT6, scripting-invalid,
-jpg.getScriptingInvalid());
appendElement(sb, INDENT6, page-encoding,
jpg.getPageEncoding());
+appendElement(sb, INDENT6, scripting-invalid,
+jpg.getScriptingInvalid());
+appendElement(sb, INDENT6, is-xml, jpg.getIsXml());
for (String prelude : jpg.getIncludePreludes()) {
appendElement(sb, INDENT6, include-prelude, prelude);
}
for (String coda : jpg.getIncludeCodas()) {
appendElement(sb, INDENT6, include-coda, coda);
}
-appendElement(sb, INDENT6, is-xml, jpg.getIsXml());
appendElement(sb, INDENT6,
deferred-syntax-allowed-as-literal,
jpg.getDeferredSyntax());
appendElement(sb, INDENT6, trim-directive-whitespaces,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377434 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/deploy/WebXml.java webapps/docs/changelog.xml
Author: kkolinko
Date: Sun Aug 26 13:36:39 2012
New Revision: 1377434
URL: http://svn.apache.org/viewvc?rev=1377434view=rev
Log:
Merged revision 1377433 from tomcat/trunk:
Fix typos etc. in code that prints merged web.xml
jsp-property-group elements were printed in the wrong order,
so that XML validation against schema was failing for the merged web.xml of
examples webapp.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1377433
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=1377434r1=1377433r2=1377434view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java Sun Aug 26
13:36:39 2012
@@ -557,7 +557,7 @@ public class WebXml {
return messageDestinations;
}
-// locale-encoging-mapping-list
+// locale-encoding-mapping-list
private MapString,String localeEncodingMappings =
new HashMapString,String();
public void addLocaleEncodingMapping(String locale, String encoding) {
@@ -610,7 +610,8 @@ public class WebXml {
sb.append( xmlns:xsi=);
sb.append(\http://www.w3.org/2001/XMLSchema-instance\\n;);
sb.append( xsi:schemaLocation=);
-sb.append(\http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd\\n;);
+sb.append(\http://java.sun.com/xml/ns/javaee; +
+ http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd\\n;);
sb.append( version=\);
sb.append(getVersion());
sb.append(\\n);
@@ -625,7 +626,7 @@ public class WebXml {
for (Map.EntryString, String entry : contextParams.entrySet()) {
sb.append( context-param\n);
appendElement(sb, INDENT4, param-name, entry.getKey());
-appendElement(sb, INDENT4, param-valuee, entry.getValue());
+appendElement(sb, INDENT4, param-value, entry.getValue());
sb.append( /context-param\n);
}
sb.append('\n');
@@ -814,17 +815,17 @@ public class WebXml {
appendElement(sb, INDENT6, url-pattern, urlPattern);
}
appendElement(sb, INDENT6, el-ignored, jpg.getElIgnored());
-appendElement(sb, INDENT6, scripting-invalid,
-jpg.getScriptingInvalid());
appendElement(sb, INDENT6, page-encoding,
jpg.getPageEncoding());
+appendElement(sb, INDENT6, scripting-invalid,
+jpg.getScriptingInvalid());
+appendElement(sb, INDENT6, is-xml, jpg.getIsXml());
for (String prelude : jpg.getIncludePreludes()) {
appendElement(sb, INDENT6, include-prelude, prelude);
}
for (String coda : jpg.getIncludeCodas()) {
appendElement(sb, INDENT6, include-coda, coda);
}
-appendElement(sb, INDENT6, is-xml, jpg.getIsXml());
appendElement(sb, INDENT6,
deferred-syntax-allowed-as-literal,
jpg.getDeferredSyntax());
appendElement(sb, INDENT6, trim-directive-whitespaces,
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=1377434r1=1377433r2=1377434view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Aug 26 13:36:39 2012
@@ -158,6 +158,10 @@
Add several JDK libraries to the value of codejarsToSkip/code
property in the codecatalina.properties/code file. (markt,
kkolinko)
/update
+ fix
+Fix typos etc. in the code that logs merged web.xml (as enabled by
+codelogEffectiveWebXml/code option on Context). (kkolinko)
+ /fix
/changelog
/subsection
subsection name=Coyote
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377444 - /tomcat/trunk/webapps/docs/config/realm.xml
Author: kkolinko Date: Sun Aug 26 14:01:57 2012 New Revision: 1377444 URL: http://svn.apache.org/viewvc?rev=1377444view=rev Log: For https://issues.apache.org/bugzilla/show_bug.cgi?id=53047 Update documentation. Thanks to the changes introduced by implementing BZ 53047, the roleNameCol and userRoleTable attributes in JDBCRealm and DataSourceRealm became optional ones. Modified: tomcat/trunk/webapps/docs/config/realm.xml Modified: tomcat/trunk/webapps/docs/config/realm.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/realm.xml?rev=1377444r1=1377443r2=1377444view=diff == --- tomcat/trunk/webapps/docs/config/realm.xml (original) +++ tomcat/trunk/webapps/docs/config/realm.xml Sun Aug 26 14:01:57 2012 @@ -116,6 +116,11 @@ authenticated and no check will be made for assigned roles unless roles are defined in web.xml in which case the user must be assigned at least one of those roles./p +pWhen this attribute has the value of codeauthOnly/code or +codestrictAuthOnly/code, the strongroleNameCol/strong and +stronguserRoleTable/strong attributes become optional. If those two +attributes are omitted, the user's roles will not be loaded by this +Realm./p /attribute attribute name=connectionName required=true @@ -149,9 +154,12 @@ used to connect to the authentication database./p /attribute - attribute name=roleNameCol required=true + attribute name=roleNameCol required=false pName of the column, in the user roles table, which contains a role name assigned to the corresponding user./p +pThis attribute is strongrequired/strong in majority of +configurations. See strongallRolesMode/strong attribute for +a rare case when it can be omitted./p /attribute attribute name=stripRealmForGss required=false @@ -174,10 +182,13 @@ that contains the user's username./p /attribute - attribute name=userRoleTable required=true + attribute name=userRoleTable required=false pName of the user roles table, which must contain columns named by the codeuserNameCol/code and coderoleNameCol/code attributes./p +pThis attribute is strongrequired/strong in majority of +configurations. See strongallRolesMode/strong attribute for +a rare case when it can be omitted./p /attribute attribute name=userTable required=true @@ -238,6 +249,11 @@ authenticated and no check will be made for assigned roles unless roles are defined in web.xml in which case the user must be assigned at least one of those roles./p +pWhen this attribute has the value of codeauthOnly/code or +codestrictAuthOnly/code, the strongroleNameCol/strong and +stronguserRoleTable/strong attributes become optional. If those two +attributes are omitted, the user's roles will not be loaded by this +Realm./p /attribute attribute name=dataSourceName required=true @@ -257,9 +273,12 @@ global DataSource./p /attribute - attribute name=roleNameCol required=true + attribute name=roleNameCol required=false pName of the column, in the user roles table, which contains a role name assigned to the corresponding user./p +pThis attribute is strongrequired/strong in majority of +configurations. See strongallRolesMode/strong attribute for +a rare case when it can be omitted./p /attribute attribute name=stripRealmForGss required=false @@ -282,10 +301,13 @@ that contains the user's username./p /attribute - attribute name=userRoleTable required=true + attribute name=userRoleTable required=false pName of the user roles table, which must contain columns named by the codeuserNameCol/code and coderoleNameCol/code attributes./p +pThis attribute is strongrequired/strong in majority of +configurations. See strongallRolesMode/strong attribute for +a rare case when it can be omitted./p /attribute attribute name=userTable required=true - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377445 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/realm.xml
Author: kkolinko Date: Sun Aug 26 14:29:51 2012 New Revision: 1377445 URL: http://svn.apache.org/viewvc?rev=1377445view=rev Log: Merged revision 1377444 from tomcat/trunk: For https://issues.apache.org/bugzilla/show_bug.cgi?id=53047 Update documentation. Thanks to the changes introduced by implementing BZ 53047, the roleNameCol and userRoleTable attributes in JDBCRealm and DataSourceRealm became optional ones. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1377444 Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml?rev=1377445r1=1377444r2=1377445view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml Sun Aug 26 14:29:51 2012 @@ -116,6 +116,11 @@ authenticated and no check will be made for assigned roles unless roles are defined in web.xml in which case the user must be assigned at least one of those roles./p +pWhen this attribute has the value of codeauthOnly/code or +codestrictAuthOnly/code, the strongroleNameCol/strong and +stronguserRoleTable/strong attributes become optional. If those two +attributes are omitted, the user's roles will not be loaded by this +Realm./p /attribute attribute name=connectionName required=true @@ -149,9 +154,12 @@ used to connect to the authentication database./p /attribute - attribute name=roleNameCol required=true + attribute name=roleNameCol required=false pName of the column, in the user roles table, which contains a role name assigned to the corresponding user./p +pThis attribute is strongrequired/strong in majority of +configurations. See strongallRolesMode/strong attribute for +a rare case when it can be omitted./p /attribute attribute name=stripRealmForGss required=false @@ -174,10 +182,13 @@ that contains the user's username./p /attribute - attribute name=userRoleTable required=true + attribute name=userRoleTable required=false pName of the user roles table, which must contain columns named by the codeuserNameCol/code and coderoleNameCol/code attributes./p +pThis attribute is strongrequired/strong in majority of +configurations. See strongallRolesMode/strong attribute for +a rare case when it can be omitted./p /attribute attribute name=userTable required=true @@ -238,6 +249,11 @@ authenticated and no check will be made for assigned roles unless roles are defined in web.xml in which case the user must be assigned at least one of those roles./p +pWhen this attribute has the value of codeauthOnly/code or +codestrictAuthOnly/code, the strongroleNameCol/strong and +stronguserRoleTable/strong attributes become optional. If those two +attributes are omitted, the user's roles will not be loaded by this +Realm./p /attribute attribute name=dataSourceName required=true @@ -257,9 +273,12 @@ global DataSource./p /attribute - attribute name=roleNameCol required=true + attribute name=roleNameCol required=false pName of the column, in the user roles table, which contains a role name assigned to the corresponding user./p +pThis attribute is strongrequired/strong in majority of +configurations. See strongallRolesMode/strong attribute for +a rare case when it can be omitted./p /attribute attribute name=stripRealmForGss required=false @@ -282,10 +301,13 @@ that contains the user's username./p /attribute - attribute name=userRoleTable required=true + attribute name=userRoleTable required=false pName of the user roles table, which must contain columns named by the codeuserNameCol/code and coderoleNameCol/code attributes./p +pThis attribute is strongrequired/strong in majority of +configurations. See strongallRolesMode/strong attribute for +a rare case when it can be omitted./p /attribute attribute name=userTable required=true - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53047] JDBCRealm allRolesMode=authOnly still needs role table
https://issues.apache.org/bugzilla/show_bug.cgi?id=53047 --- Comment #13 from Konstantin Kolinko knst.koli...@gmail.com --- Updated Tomcat 7 documentation for Realm in r1377445. The documentation update is in 7.0.30 and later. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377446 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sun Aug 26 14:40:59 2012 New Revision: 1377446 URL: http://svn.apache.org/viewvc?rev=1377446view=rev Log: Update BZ 53047 proposal. Propose fix for BZ 53725. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1377446r1=1377445r2=1377446view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Aug 26 14:40:59 2012 @@ -113,10 +113,8 @@ PATCHES PROPOSED TO BACKPORT: Allow database realms configured with an all roles mode that is authentication only to not have to define a role table http://svn.apache.org/viewvc?rev=1348498view=rev - +1: markt, kfujino - +1: kkolinko (docs update would be needed: - at least set required=false on roleNameCol, userRoleTable - in config/realm.html), schultz + http://svn.apache.org/viewvc?rev=1377444view=rev (documentation) + +1: markt, kfujino, kkolinko, schultz -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53513 @@ -184,6 +182,13 @@ PATCHES PROPOSED TO BACKPORT: was extended in 1361263 and 1361962. I would be +1 to backport those two as well. kkolinko: +1 for 1361263 and 1361962 as well. + ++ Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53725 + Fix possible corruption of GZIP'd output. + http://svn.apache.org/viewvc?rev=1377342view=rev + (r1377343 in 7.0) + +1: kkolinko + -1: PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53725] Some GZipped responses result in java.io.IOException: Corrupt GZIP trailer during gunzip.
https://issues.apache.org/bugzilla/show_bug.cgi?id=53725 --- Comment #2 from Konstantin Kolinko knst.koli...@gmail.com --- Good catch. I proposed backport of this fix (r1377342) to Tomcat 6.0. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53777] Ability to bundle JAAS Configuration in Webappp
https://issues.apache.org/bugzilla/show_bug.cgi?id=53777 eolivelli eolive...@gmail.com changed: What|Removed |Added Attachment #29275|0 |1 is obsolete|| --- Comment #6 from eolivelli eolive...@gmail.com --- Created attachment 29280 -- https://issues.apache.org/bugzilla/attachment.cgi?id=29280action=edit Patch on JAASRealm (tomcat 7 trunk) Updating the patch, without the workaround for TomEE cl bug (that has been resolved too, in openejb trunk) -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377488 - /tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
Author: markt
Date: Sun Aug 26 19:22:47 2012
New Revision: 1377488
URL: http://svn.apache.org/viewvc?rev=1377488view=rev
Log:
Code clean-up
- Java 7
- UCDetector use of final
- suppress invalid warning
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java?rev=1377488r1=1377487r2=1377488view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java Sun Aug 26
19:22:47 2012
@@ -42,7 +42,7 @@ public class JspConfig {
private final Log log = LogFactory.getLog(JspConfig.class);
private VectorJspPropertyGroup jspProperties = null;
-private ServletContext ctxt;
+private final ServletContext ctxt;
private volatile boolean initialized = false;
private static final String defaultIsXml = null;// unspecified
@@ -98,7 +98,7 @@ public class JspConfig {
return;
}
-jspProperties = new VectorJspPropertyGroup();
+jspProperties = new Vector();
IteratorTreeNode jspPropertyList =
jspConfig.findChildren(jsp-property-group);
while (jspPropertyList.hasNext()) {
@@ -106,13 +106,13 @@ public class JspConfig {
TreeNode element = jspPropertyList.next();
IteratorTreeNode list = element.findChildren();
-VectorString urlPatterns = new VectorString();
+VectorString urlPatterns = new Vector();
String pageEncoding = null;
String scriptingInvalid = null;
String elIgnored = null;
String isXml = null;
-VectorString includePrelude = new VectorString();
-VectorString includeCoda = new VectorString();
+VectorString includePrelude = new Vector();
+VectorString includeCoda = new Vector();
String deferredSyntaxAllowedAsLiteral = null;
String trimDirectiveWhitespaces = null;
String defaultContentType = null;
@@ -248,6 +248,7 @@ public class JspConfig {
* Select the property group that has more restrictive url-pattern.
* In case of tie, select the first.
*/
+@SuppressWarnings(null) // NPE not possible
private JspPropertyGroup selectProperty(JspPropertyGroup prev,
JspPropertyGroup curr) {
if (prev == null) {
@@ -306,8 +307,8 @@ public class JspConfig {
uriExtension = uri.substring(index+1);
}
-VectorString includePreludes = new VectorString();
-VectorString includeCodas = new VectorString();
+VectorString includePreludes = new Vector();
+VectorString includeCodas = new Vector();
JspPropertyGroup isXmlMatch = null;
JspPropertyGroup elIgnoredMatch = null;
@@ -491,9 +492,9 @@ public class JspConfig {
}
public static class JspPropertyGroup {
-private String path;
-private String extension;
-private JspProperty jspProperty;
+private final String path;
+private final String extension;
+private final JspProperty jspProperty;
JspPropertyGroup(String path, String extension,
JspProperty jspProperty) {
@@ -517,17 +518,17 @@ public class JspConfig {
public static class JspProperty {
-private String isXml;
-private String elIgnored;
-private String scriptingInvalid;
-private String pageEncoding;
-private VectorString includePrelude;
-private VectorString includeCoda;
-private String deferedSyntaxAllowedAsLiteral;
-private String trimDirectiveWhitespaces;
-private String defaultContentType;
-private String buffer;
-private String errorOnUndeclaredNamespace;
+private final String isXml;
+private final String elIgnored;
+private final String scriptingInvalid;
+private final String pageEncoding;
+private final VectorString includePrelude;
+private final VectorString includeCoda;
+private final String deferedSyntaxAllowedAsLiteral;
+private final String trimDirectiveWhitespaces;
+private final String defaultContentType;
+private final String buffer;
+private final String errorOnUndeclaredNamespace;
public JspProperty(String isXml, String elIgnored,
String scriptingInvalid, String pageEncoding,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377509 - in /tomcat/trunk/java/org/apache/jasper/compiler: JspConfig.java TldLocationsCache.java WebXml.java
Author: markt
Date: Sun Aug 26 20:25:30 2012
New Revision: 1377509
URL: http://svn.apache.org/viewvc?rev=1377509view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53737
Access JSP configuration information via the ServletContext rather than
re-parsing web.xml
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/trunk/java/org/apache/jasper/compiler/WebXml.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java?rev=1377509r1=1377508r2=1377509view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java Sun Aug 26
20:25:30 2012
@@ -17,14 +17,14 @@
package org.apache.jasper.compiler;
+import java.util.Collection;
import java.util.Iterator;
import java.util.Vector;
import javax.servlet.ServletContext;
+import javax.servlet.descriptor.JspConfigDescriptor;
+import javax.servlet.descriptor.JspPropertyGroupDescriptor;
-import org.apache.jasper.JasperException;
-import org.apache.jasper.xmlparser.ParserUtils;
-import org.apache.jasper.xmlparser.TreeNode;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -59,171 +59,105 @@ public class JspConfig {
this.ctxt = ctxt;
}
-private double getVersion(TreeNode webApp) {
-String v = webApp.findAttribute(version);
-if (v != null) {
-try {
-return Double.parseDouble(v);
-} catch (NumberFormatException e) {
-}
-}
-return 2.3;
-}
-
-private void processWebDotXml() throws JasperException {
-
-WebXml webXml = null;
-
-try {
-webXml = new WebXml(ctxt);
-
-TreeNode webApp = null;
-if (webXml.getInputSource() != null) {
-ParserUtils pu = new ParserUtils();
-webApp = pu.parseXMLDocument(webXml.getSystemId(),
-webXml.getInputSource());
-}
+private void processWebDotXml() {
-if (webApp == null
-|| getVersion(webApp) 2.4) {
-defaultIsELIgnored = true;
-defaultDeferedSyntaxAllowedAsLiteral = true;
-return;
-}
-if (getVersion(webApp) 2.5) {
+// Very, very unlikely but just in case...
+if (ctxt.getMajorVersion() 2) {
+defaultIsELIgnored = true;
+defaultDeferedSyntaxAllowedAsLiteral = true;
+return;
+}
+if (ctxt.getMajorVersion() == 2) {
+if (ctxt.getMinorVersion() 5) {
defaultDeferedSyntaxAllowedAsLiteral = true;
}
-TreeNode jspConfig = webApp.findChild(jsp-config);
-if (jspConfig == null) {
+if (ctxt.getMinorVersion() 4) {
+defaultIsELIgnored = true;
return;
}
+}
-jspProperties = new Vector();
-IteratorTreeNode jspPropertyList =
-jspConfig.findChildren(jsp-property-group);
-while (jspPropertyList.hasNext()) {
-
-TreeNode element = jspPropertyList.next();
-IteratorTreeNode list = element.findChildren();
-
-VectorString urlPatterns = new Vector();
-String pageEncoding = null;
-String scriptingInvalid = null;
-String elIgnored = null;
-String isXml = null;
-VectorString includePrelude = new Vector();
-VectorString includeCoda = new Vector();
-String deferredSyntaxAllowedAsLiteral = null;
-String trimDirectiveWhitespaces = null;
-String defaultContentType = null;
-String buffer = null;
-String errorOnUndeclaredNamespace = null;
-
-while (list.hasNext()) {
-
-element = list.next();
-String tname = element.getName();
-
-if (url-pattern.equals(tname))
-urlPatterns.addElement( element.getBody() );
-else if (page-encoding.equals(tname))
-pageEncoding = element.getBody();
-else if (is-xml.equals(tname))
-isXml = element.getBody();
-else if (el-ignored.equals(tname))
-elIgnored = element.getBody();
-else if (scripting-invalid.equals(tname))
-scriptingInvalid = element.getBody();
-else if (include-prelude.equals(tname))
-
svn commit: r1377511 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/JspConfig.java java/org/apache/jasper/compiler/TldLocationsCache.java java/org/apache/jasper/compiler/WebXml.java we
Author: markt
Date: Sun Aug 26 20:29:27 2012
New Revision: 1377511
URL: http://svn.apache.org/viewvc?rev=1377511view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53737
Access JSP configuration information via the ServletContext rather than
re-parsing web.xml
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/WebXml.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1377509
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java?rev=1377511r1=1377510r2=1377511view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java Sun Aug
26 20:29:27 2012
@@ -17,14 +17,14 @@
package org.apache.jasper.compiler;
+import java.util.Collection;
import java.util.Iterator;
import java.util.Vector;
import javax.servlet.ServletContext;
+import javax.servlet.descriptor.JspConfigDescriptor;
+import javax.servlet.descriptor.JspPropertyGroupDescriptor;
-import org.apache.jasper.JasperException;
-import org.apache.jasper.xmlparser.ParserUtils;
-import org.apache.jasper.xmlparser.TreeNode;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -59,171 +59,105 @@ public class JspConfig {
this.ctxt = ctxt;
}
-private double getVersion(TreeNode webApp) {
-String v = webApp.findAttribute(version);
-if (v != null) {
-try {
-return Double.parseDouble(v);
-} catch (NumberFormatException e) {
-}
-}
-return 2.3;
-}
-
-private void processWebDotXml() throws JasperException {
-
-WebXml webXml = null;
-
-try {
-webXml = new WebXml(ctxt);
-
-TreeNode webApp = null;
-if (webXml.getInputSource() != null) {
-ParserUtils pu = new ParserUtils();
-webApp = pu.parseXMLDocument(webXml.getSystemId(),
-webXml.getInputSource());
-}
+private void processWebDotXml() {
-if (webApp == null
-|| getVersion(webApp) 2.4) {
-defaultIsELIgnored = true;
-defaultDeferedSyntaxAllowedAsLiteral = true;
-return;
-}
-if (getVersion(webApp) 2.5) {
+// Very, very unlikely but just in case...
+if (ctxt.getMajorVersion() 2) {
+defaultIsELIgnored = true;
+defaultDeferedSyntaxAllowedAsLiteral = true;
+return;
+}
+if (ctxt.getMajorVersion() == 2) {
+if (ctxt.getMinorVersion() 5) {
defaultDeferedSyntaxAllowedAsLiteral = true;
}
-TreeNode jspConfig = webApp.findChild(jsp-config);
-if (jspConfig == null) {
+if (ctxt.getMinorVersion() 4) {
+defaultIsELIgnored = true;
return;
}
+}
-jspProperties = new VectorJspPropertyGroup();
-IteratorTreeNode jspPropertyList =
-jspConfig.findChildren(jsp-property-group);
-while (jspPropertyList.hasNext()) {
-
-TreeNode element = jspPropertyList.next();
-IteratorTreeNode list = element.findChildren();
-
-VectorString urlPatterns = new VectorString();
-String pageEncoding = null;
-String scriptingInvalid = null;
-String elIgnored = null;
-String isXml = null;
-VectorString includePrelude = new VectorString();
-VectorString includeCoda = new VectorString();
-String deferredSyntaxAllowedAsLiteral = null;
-String trimDirectiveWhitespaces = null;
-String defaultContentType = null;
-String buffer = null;
-String errorOnUndeclaredNamespace = null;
-
-while (list.hasNext()) {
-
-element = list.next();
-String tname = element.getName();
-
-if (url-pattern.equals(tname))
-urlPatterns.addElement( element.getBody() );
-else if (page-encoding.equals(tname))
-pageEncoding = element.getBody();
-else if (is-xml.equals(tname))
-isXml =
[Bug 53737] Use ServletContext.getJspConfigDescriptor() in Jasper instead of XML-parsing of merged web.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=53737 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas ma...@apache.org --- Fixed in trunk and 7.0.x and will be included in 7.0.30 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377512 - /tomcat/trunk/java/org/apache/jasper/compiler/WebXml.java
Author: markt Date: Sun Aug 26 20:30:19 2012 New Revision: 1377512 URL: http://svn.apache.org/viewvc?rev=1377512view=rev Log: Remove unused class Removed: tomcat/trunk/java/org/apache/jasper/compiler/WebXml.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377516 - /tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/
Author: markt
Date: Sun Aug 26 20:58:03 2012
New Revision: 1377516
URL: http://svn.apache.org/viewvc?rev=1377516view=rev
Log:
Remove unused dump() method
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java?rev=1377516r1=1377515r2=1377516view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
Sun Aug 26 20:58:03 2012
@@ -18,7 +18,6 @@
package org.apache.tomcat.util.bcel.classfile;
import java.io.DataInputStream;
-import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.tomcat.util.bcel.Constants;
@@ -86,11 +85,4 @@ public class AnnotationDefault extends A
{
throw new RuntimeException(Not implemented yet!);
}
-
-@Override
-public final void dump(DataOutputStream dos) throws IOException
-{
- super.dump(dos);
- default_value.dump(dos);
-}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java?rev=1377516r1=1377515r2=1377516view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java Sun
Aug 26 20:58:03 2012
@@ -18,7 +18,6 @@
package org.apache.tomcat.util.bcel.classfile;
import java.io.DataInputStream;
-import java.io.DataOutputStream;
import java.io.IOException;
import java.io.Serializable;
import java.util.HashMap;
@@ -69,19 +68,6 @@ public abstract class Attribute implemen
this.constant_pool = constant_pool;
}
-/**
- * Dump attribute to file stream in binary format.
- *
- * @param file
- *Output file stream
- * @throws IOException
- */
-public void dump(DataOutputStream file) throws IOException
-{
-file.writeShort(name_index);
-file.writeInt(length);
-}
-
private static final MapString,AttributeReader readers =
new HashMapString,AttributeReader();
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java?rev=1377516r1=1377515r2=1377516view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java Sun Aug
26 20:58:03 2012
@@ -18,7 +18,6 @@
package org.apache.tomcat.util.bcel.classfile;
import java.io.DataInputStream;
-import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.tomcat.util.bcel.Constants;
@@ -115,30 +114,6 @@ public final class Code extends Attribut
/**
- * Dump code attribute to file stream in binary format.
- *
- * @param file Output file stream
- * @throws IOException
- */
-@Override
-public final
svn commit: r1377517 - in /tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile: AnnotationEntry.java Attribute.java JavaClass.java Unknown.java
Author: markt
Date: Sun Aug 26 20:59:26 2012
New Revision: 1377517
URL: http://svn.apache.org/viewvc?rev=1377517view=rev
Log:
Java 7
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java?rev=1377517r1=1377516r2=1377517view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
Sun Aug 26 20:59:26 2012
@@ -54,7 +54,7 @@ public class AnnotationEntry implements
final AnnotationEntry annotationEntry = new
AnnotationEntry(file.readUnsignedShort(), constant_pool);
final int num_element_value_pairs = (file.readUnsignedShort());
-annotationEntry.element_value_pairs = new
ArrayListElementValuePair();
+annotationEntry.element_value_pairs = new ArrayList();
for (int i = 0; i num_element_value_pairs; i++) {
annotationEntry.element_value_pairs.add(new
ElementValuePair(file.readUnsignedShort(), ElementValue.readElementValue(file,
constant_pool),
constant_pool));
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java?rev=1377517r1=1377516r2=1377517view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java Sun
Aug 26 20:59:26 2012
@@ -68,8 +68,7 @@ public abstract class Attribute implemen
this.constant_pool = constant_pool;
}
-private static final MapString,AttributeReader readers =
-new HashMapString,AttributeReader();
+private static final MapString,AttributeReader readers = new HashMap();
/*
* Class method reads one attribute from the input data stream. This method
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java?rev=1377517r1=1377516r2=1377517view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java Sun
Aug 26 20:59:26 2012
@@ -156,7 +156,7 @@ public class JavaClass extends AccessFla
if (annotationsOutOfDate) {
// Find attributes that contain annotation data
Attribute[] attrs = getAttributes();
-ListAnnotationEntry accumulatedAnnotations = new
ArrayListAnnotationEntry();
+ListAnnotationEntry accumulatedAnnotations = new ArrayList();
for (int i = 0; i attrs.length; i++) {
Attribute attribute = attrs[i];
if (attribute instanceof Annotations) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java?rev=1377517r1=1377516r2=1377517view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java Sun
Aug 26 20:59:26 2012
@@ -46,7 +46,7 @@ public final class Unknown extends Attri
private byte[] bytes;
private String name;
private static final MapString, Unknown unknown_attributes =
-new HashMapString, Unknown();
+new HashMap();
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377518 - /tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java
Author: markt
Date: Sun Aug 26 21:01:46 2012
New Revision: 1377518
URL: http://svn.apache.org/viewvc?rev=1377518view=rev
Log:
Remove unused attributes
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java?rev=1377518r1=1377517r2=1377518view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java
Sun Aug 26 21:01:46 2012
@@ -29,35 +29,18 @@ public class EnclosingMethod extends Att
private static final long serialVersionUID = 6755214228300933233L;
-// Pointer to the CONSTANT_Class_info structure representing the
-// innermost class that encloses the declaration of the current class.
-private int classIndex;
-
-// If the current class is not immediately enclosed by a method or
-// constructor, then the value of the method_index item must be zero.
-// Otherwise, the value of the method_index item must point to a
-// CONSTANT_NameAndType_info structure representing the name and the
-// type of a method in the class referenced by the class we point
-// to in the class_index. *It is the compiler responsibility* to
-// ensure that the method identified by this index is the closest
-// lexically enclosing method that includes the local/anonymous class.
-private int methodIndex;
-
// Ctors - and code to read an attribute in.
-public EnclosingMethod(int nameIndex, int len, DataInputStream dis,
ConstantPool cpool) throws IOException {
-this(nameIndex, len, dis.readUnsignedShort(), dis.readUnsignedShort(),
cpool);
-}
-
-private EnclosingMethod(int nameIndex, int len, int classIdx,int
methodIdx, ConstantPool cpool) {
+public EnclosingMethod(int nameIndex, int len, DataInputStream dis,
+ConstantPool cpool) throws IOException {
super(Constants.ATTR_ENCLOSING_METHOD, nameIndex, len, cpool);
-classIndex = classIdx;
-methodIndex = methodIdx;
+// Unused class index
+dis.readUnsignedShort();
+// Unused method index
+dis.readUnsignedShort();
}
@Override
public Attribute copy(ConstantPool constant_pool) {
throw new RuntimeException(Not implemented yet!);
-// is this next line sufficient?
-// return (EnclosingMethod)clone();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377519 - /tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/
Author: markt
Date: Sun Aug 26 21:05:39 2012
New Revision: 1377519
URL: http://svn.apache.org/viewvc?rev=1377519view=rev
Log:
Remove unused dump() method
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java?rev=1377519r1=1377518r2=1377519view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java Sun
Aug 26 21:05:39 2012
@@ -18,7 +18,6 @@
package org.apache.tomcat.util.bcel.classfile;
import java.io.DataInputStream;
-import java.io.DataOutputStream;
import java.io.IOException;
import java.io.Serializable;
@@ -68,9 +67,6 @@ public abstract class Constant implement
}
-public abstract void dump( DataOutputStream file ) throws IOException;
-
-
/**
* @return Tag of constant, i.e., its type. No setTag() method to avoid
* confusion.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java?rev=1377519r1=1377518r2=1377519view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java Sun
Aug 26 21:05:39 2012
@@ -18,7 +18,6 @@
package org.apache.tomcat.util.bcel.classfile;
import java.io.DataInput;
-import java.io.DataOutputStream;
import java.io.IOException;
/**
@@ -62,20 +61,6 @@ public abstract class ConstantCP extends
/**
- * Dump constant field reference to file stream in binary format.
- *
- * @param file Output file stream
- * @throws IOException
- */
-@Override
-public final void dump( DataOutputStream file ) throws IOException {
-file.writeByte(tag);
-file.writeShort(class_index);
-file.writeShort(name_and_type_index);
-}
-
-
-/**
* @return Reference (index) to class this field or method belongs to.
*/
public final int getClassIndex() {
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java?rev=1377519r1=1377518r2=1377519view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
Sun Aug 26 21:05:39 2012
@@ -18,7 +18,6 @@
package org.apache.tomcat.util.bcel.classfile;
import java.io.DataInput;
-import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.tomcat.util.bcel.Constants;
@@ -60,19 +59,6 @@ public final class ConstantClass extends
/**
- * Dump constant class to file stream in binary format.
- *
- * @param file Output file stream
- * @throws IOException
- */
-@Override
-public final void dump( DataOutputStream file ) throws IOException {
-file.writeByte(tag);
-file.writeShort(name_index);
-}
-
-
-/**
* @return Name index in constant pool of class name.
*/
public final int getNameIndex() {
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java?rev=1377519r1=1377518r2=1377519view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
Sun Aug 26 21:05:39 2012
@@ -18,7 +18,6 @@
package org.apache.tomcat.util.bcel.classfile;
import java.io.DataInput;
-import
Re: svn commit: r1377511 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/JspConfig.java java/org/apache/jasper/compiler/TldLocationsCache.java java/org/apache/jasper/compiler/WebXml.jav
2012/8/27 ma...@apache.org: Author: markt Date: Sun Aug 26 20:29:27 2012 New Revision: 1377511 URL: http://svn.apache.org/viewvc?rev=1377511view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53737 Access JSP configuration information via the ServletContext rather than re-parsing web.xml Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/WebXml.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml I have not tested yet, but there are two things that I wonder regarding this change 1) Is JspC still working? It uses JspCServletContext which implementation of #getJspConfigDescriptor() always returns null. 2) Can we stop publishing merged web.xml as context attribute (make this publishing off by default)? org.apache.tomcat.util.scan.Constants.MERGED_WEB_XML Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1377511 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/JspConfig.java java/org/apache/jasper/compiler/TldLocationsCache.java java/org/apache/jasper/compiler/WebXml.jav
On 26/08/2012 22:16, Konstantin Kolinko wrote: 2012/8/27 ma...@apache.org: Author: markt Date: Sun Aug 26 20:29:27 2012 New Revision: 1377511 URL: http://svn.apache.org/viewvc?rev=1377511view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53737 Access JSP configuration information via the ServletContext rather than re-parsing web.xml Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/WebXml.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml I have not tested yet, but there are two things that I wonder regarding this change 1) Is JspC still working? It uses JspCServletContext which implementation of #getJspConfigDescriptor() always returns null. I haven't tested that. On the face of it, this change may need to be reverted / modified. 2) Can we stop publishing merged web.xml as context attribute (make this publishing off by default)? Potentially, yes. Mark org.apache.tomcat.util.scan.Constants.MERGED_WEB_XML Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377532 - in /tomcat/trunk/java/org/apache/tomcat/util/bcel: ./ Constants.java classfile/Constant.java classfile/ConstantInvokeDynamic.java classfile/ConstantMethodHandle.java classfile/C
Author: markt
Date: Sun Aug 26 22:15:41 2012
New Revision: 1377532
URL: http://svn.apache.org/viewvc?rev=1377532view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51661
Merge updates from Commons BCEL that provide the limited Java 7 support
required for Tomcat's cut-down BCEL fork.
Added:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
- copied, changed from r1377530,
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantInvokeDynamic.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java
- copied, changed from r1377530,
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantMethodHandle.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java
- copied, changed from r1377530,
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantMethodType.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/ (props changed)
tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
Propchange: tomcat/trunk/java/org/apache/tomcat/util/bcel/
--
Merged
/commons/proper/bcel/trunk/src/main/java/org/apache/bcel:r1343597-1377530
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java?rev=1377532r1=1377531r2=1377532view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java Sun Aug 26
22:15:41 2012
@@ -94,13 +94,23 @@ public interface Constants {
/** Marks a constant pool entry as a name and type. */
public static final byte CONSTANT_NameAndType= 12;
+ /** Marks a constant pool entry as a Method Handle. */
+ public static final byte CONSTANT_MethodHandle = 15;
+
+ /** Marks a constant pool entry as a Method Type.*/
+ public static final byte CONSTANT_MethodType = 16;
+
+ /** Marks a constant pool entry as an Invoke Dynamic */
+ public static final byte CONSTANT_InvokeDynamic = 18;
+
/** The names of the types of entries in a constant pool. */
public static final String[] CONSTANT_NAMES = {
, CONSTANT_Utf8, , CONSTANT_Integer,
CONSTANT_Float, CONSTANT_Long, CONSTANT_Double,
CONSTANT_Class, CONSTANT_String, CONSTANT_Fieldref,
CONSTANT_Methodref, CONSTANT_InterfaceMethodref,
-CONSTANT_NameAndType };
+CONSTANT_NameAndType, CONSTANT_MethodHandle,
+CONSTANT_MethodType, CONSTANT_InvokeDynamic };
/** Java VM opcode.
* @see a
href=http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html;Opcode
definitions in The Java Virtual Machine Specification/a */
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java?rev=1377532r1=1377531r2=1377532view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java Sun
Aug 26 22:15:41 2012
@@ -123,6 +123,12 @@ public abstract class Constant implement
return new ConstantNameAndType(file);
case Constants.CONSTANT_Utf8:
return new ConstantUtf8(file);
+case Constants.CONSTANT_MethodHandle:
+return new ConstantMethodHandle(file);
+case Constants.CONSTANT_MethodType:
+return new ConstantMethodType(file);
+case Constants.CONSTANT_InvokeDynamic:
+return new ConstantInvokeDynamic(file);
default:
throw new ClassFormatException(Invalid byte tag in constant
pool: + b);
}
Copied:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
(from r1377530,
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantInvokeDynamic.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java?p2=tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.javap1=commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantInvokeDynamic.javar1=1377530r2=1377532rev=1377532view=diff
==
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantInvokeDynamic.java
(original)
+++
svn commit: r1377533 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/bcel/classfile/ webapps/docs/
Author: markt
Date: Sun Aug 26 22:22:59 2012
New Revision: 1377533
URL: http://svn.apache.org/viewvc?rev=1377533view=rev
Log:
Remove unused dump() method and attributes
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1377516,1377518-1377519
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java?rev=1377533r1=1377532r2=1377533view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
Sun Aug 26 22:22:59 2012
@@ -18,7 +18,6 @@
package org.apache.tomcat.util.bcel.classfile;
import java.io.DataInputStream;
-import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.tomcat.util.bcel.Constants;
@@ -86,11 +85,4 @@ public class AnnotationDefault extends A
{
throw new RuntimeException(Not implemented yet!);
}
-
-@Override
-public final void dump(DataOutputStream dos) throws IOException
-{
- super.dump(dos);
- default_value.dump(dos);
-}
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java?rev=1377533r1=1377532r2=1377533view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
Sun Aug 26 22:22:59 2012
@@ -18,7 +18,6 @@
package org.apache.tomcat.util.bcel.classfile;
import java.io.DataInputStream;
-import java.io.DataOutputStream;
import java.io.IOException;
import java.io.Serializable;
import java.util.HashMap;
@@ -69,19 +68,6 @@ public abstract class Attribute implemen
this.constant_pool =
svn commit: r1377534 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/bcel/ java/org/apache/tomcat/util/bcel/classfile/ webapps/docs/
Author: markt
Date: Sun Aug 26 22:26:10 2012
New Revision: 1377534
URL: http://svn.apache.org/viewvc?rev=1377534view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53735
Merge updates from Commons BCEL that provide the limited Java 7 support
required for Tomcat's cut-down BCEL fork.
Added:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
- copied unchanged from r1377532,
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java
- copied unchanged from r1377532,
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java
- copied unchanged from r1377532,
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1377532
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java?rev=1377534r1=1377533r2=1377534view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java Sun
Aug 26 22:26:10 2012
@@ -94,13 +94,23 @@ public interface Constants {
/** Marks a constant pool entry as a name and type. */
public static final byte CONSTANT_NameAndType= 12;
+ /** Marks a constant pool entry as a Method Handle. */
+ public static final byte CONSTANT_MethodHandle = 15;
+
+ /** Marks a constant pool entry as a Method Type.*/
+ public static final byte CONSTANT_MethodType = 16;
+
+ /** Marks a constant pool entry as an Invoke Dynamic */
+ public static final byte CONSTANT_InvokeDynamic = 18;
+
/** The names of the types of entries in a constant pool. */
public static final String[] CONSTANT_NAMES = {
, CONSTANT_Utf8, , CONSTANT_Integer,
CONSTANT_Float, CONSTANT_Long, CONSTANT_Double,
CONSTANT_Class, CONSTANT_String, CONSTANT_Fieldref,
CONSTANT_Methodref, CONSTANT_InterfaceMethodref,
-CONSTANT_NameAndType };
+CONSTANT_NameAndType, CONSTANT_MethodHandle,
+CONSTANT_MethodType, CONSTANT_InvokeDynamic };
/** Java VM opcode.
* @see a
href=http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html;Opcode
definitions in The Java Virtual Machine Specification/a */
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java?rev=1377534r1=1377533r2=1377534view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
Sun Aug 26 22:26:10 2012
@@ -123,6 +123,12 @@ public abstract class Constant implement
return new ConstantNameAndType(file);
case Constants.CONSTANT_Utf8:
return new ConstantUtf8(file);
+case Constants.CONSTANT_MethodHandle:
+return new ConstantMethodHandle(file);
+case Constants.CONSTANT_MethodType:
+return new ConstantMethodType(file);
+case Constants.CONSTANT_InvokeDynamic:
+return new ConstantInvokeDynamic(file);
default:
throw new ClassFormatException(Invalid byte tag in constant
pool: + b);
}
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=1377534r1=1377533r2=1377534view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Aug 26 22:26:10 2012
@@ -265,6 +265,11 @@
Remove some unused code from Tomcatapos;s package renamed, cut-down
copy of Commons BCEL used for annotation scanning. (markt)
/scode
+ add
+bug53735/bugAdd support for Java 7 byte code to Tomcatapos;s
+package renamed, cut-down copy of Commons BCEL used for annotation
+scanning. (markt)
+
[Bug 53735] Update annotation scanning to be compatible with Java 7 class files
https://issues.apache.org/bugzilla/show_bug.cgi?id=53735 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas ma...@apache.org --- Fixed in trunk and 7.0.x and will be included in 7.0.30 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377535 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java
Author: markt
Date: Sun Aug 26 22:29:04 2012
New Revision: 1377535
URL: http://svn.apache.org/viewvc?rev=1377535view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53758
Fix Dynamic Filter Registration mapping logic inverted
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java?rev=1377535r1=1377534r2=1377535view=diff
==
---
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java
Sun Aug 26 22:29:04 2012
@@ -72,9 +72,9 @@ public class ApplicationFilterRegistrati
}
if (isMatchAfter) {
-context.addFilterMapBefore(filterMap);
-} else {
context.addFilterMap(filterMap);
+} else {
+context.addFilterMapBefore(filterMap);
}
}
// else error?
@@ -101,9 +101,9 @@ public class ApplicationFilterRegistrati
}
if (isMatchAfter) {
-context.addFilterMapBefore(filterMap);
-} else {
context.addFilterMap(filterMap);
+} else {
+context.addFilterMapBefore(filterMap);
}
}
// else error?
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377536 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationFilterRegistration.java webapps/docs/changelog.xml
Author: markt
Date: Sun Aug 26 22:30:59 2012
New Revision: 1377536
URL: http://svn.apache.org/viewvc?rev=1377536view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53758
Fix Dynamic Filter Registration mapping logic inverted
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1377535
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java?rev=1377536r1=1377535r2=1377536view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java
Sun Aug 26 22:30:59 2012
@@ -72,9 +72,9 @@ public class ApplicationFilterRegistrati
}
if (isMatchAfter) {
-context.addFilterMapBefore(filterMap);
-} else {
context.addFilterMap(filterMap);
+} else {
+context.addFilterMapBefore(filterMap);
}
}
// else error?
@@ -101,9 +101,9 @@ public class ApplicationFilterRegistrati
}
if (isMatchAfter) {
-context.addFilterMapBefore(filterMap);
-} else {
context.addFilterMap(filterMap);
+} else {
+context.addFilterMapBefore(filterMap);
}
}
// else error?
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=1377536r1=1377535r2=1377536view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Aug 26 22:30:59 2012
@@ -162,6 +162,12 @@
Fix typos etc. in the code that logs merged web.xml (as enabled by
codelogEffectiveWebXml/code option on Context). (kkolinko)
/fix
+ fix
+bug53758/bug: When adding filters via
+codeFilterRegistration.Dynamic/code the filters were added at the
+wrong point because the codeisMatchAfter /code logic was inverted.
+(markt)
+ /fix
/changelog
/subsection
subsection name=Coyote
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53758] Dynamic Filter Registration mapping logic inverted
https://issues.apache.org/bugzilla/show_bug.cgi?id=53758 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas ma...@apache.org --- Thanks for the report and the analysis to pin-point the root cause. This has been fixed in trunk and 7.0.x and will be included in 7.0.30 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377537 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sun Aug 26 22:32:01 2012 New Revision: 1377537 URL: http://svn.apache.org/viewvc?rev=1377537view=rev Log: Vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1377537r1=1377536r2=1377537view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Aug 26 22:32:01 2012 @@ -187,7 +187,7 @@ PATCHES PROPOSED TO BACKPORT: Fix possible corruption of GZIP'd output. http://svn.apache.org/viewvc?rev=1377342view=rev (r1377343 in 7.0) - +1: kkolinko + +1: kkolinko, markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1377511 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/JspConfig.java java/org/apache/jasper/compiler/TldLocationsCache.java java/org/apache/jasper/compiler/WebXml.jav
On 26/08/2012 22:23, Mark Thomas wrote: On 26/08/2012 22:16, Konstantin Kolinko wrote: 2012/8/27 ma...@apache.org: Author: markt Date: Sun Aug 26 20:29:27 2012 New Revision: 1377511 URL: http://svn.apache.org/viewvc?rev=1377511view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53737 Access JSP configuration information via the ServletContext rather than re-parsing web.xml Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/WebXml.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml I have not tested yet, but there are two things that I wonder regarding this change 1) Is JspC still working? It uses JspCServletContext which implementation of #getJspConfigDescriptor() always returns null. I haven't tested that. On the face of it, this change may need to be reverted / modified. I don't see a quick way around this problem and I'd rather get 7.0.30 out. I'll revert this change in 7.0.x and trunk. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377538 - /tomcat/trunk/java/org/apache/jasper/compiler/WebXml.java
Author: markt Date: Sun Aug 26 22:47:49 2012 New Revision: 1377538 URL: http://svn.apache.org/viewvc?rev=1377538view=rev Log: Revert r1377512 Added: tomcat/trunk/java/org/apache/jasper/compiler/WebXml.java - copied unchanged from r1377511, tomcat/trunk/java/org/apache/jasper/compiler/WebXml.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53737] Use ServletContext.getJspConfigDescriptor() in Jasper instead of XML-parsing of merged web.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=53737 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- --- Comment #2 from Mark Thomas ma...@apache.org --- The fix wasn't as simple as it first appeared due to having to support JspC. The original fix has been reverted pending a re-think. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377539 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/JspConfig.java java/org/apache/jasper/compiler/TldLocationsCache.java java/org/apache/jasper/compiler/WebXml.java we
Author: markt
Date: Sun Aug 26 22:49:30 2012
New Revision: 1377539
URL: http://svn.apache.org/viewvc?rev=1377539view=rev
Log:
Revert r1377511
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/WebXml.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Reverse-merged /tomcat/trunk:r1377509
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java?rev=1377539r1=1377538r2=1377539view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java Sun Aug
26 22:49:30 2012
@@ -17,14 +17,14 @@
package org.apache.jasper.compiler;
-import java.util.Collection;
import java.util.Iterator;
import java.util.Vector;
import javax.servlet.ServletContext;
-import javax.servlet.descriptor.JspConfigDescriptor;
-import javax.servlet.descriptor.JspPropertyGroupDescriptor;
+import org.apache.jasper.JasperException;
+import org.apache.jasper.xmlparser.ParserUtils;
+import org.apache.jasper.xmlparser.TreeNode;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -59,105 +59,171 @@ public class JspConfig {
this.ctxt = ctxt;
}
-private void processWebDotXml() {
-
-// Very, very unlikely but just in case...
-if (ctxt.getMajorVersion() 2) {
-defaultIsELIgnored = true;
-defaultDeferedSyntaxAllowedAsLiteral = true;
-return;
+private double getVersion(TreeNode webApp) {
+String v = webApp.findAttribute(version);
+if (v != null) {
+try {
+return Double.parseDouble(v);
+} catch (NumberFormatException e) {
+}
}
-if (ctxt.getMajorVersion() == 2) {
-if (ctxt.getMinorVersion() 5) {
-defaultDeferedSyntaxAllowedAsLiteral = true;
+return 2.3;
+}
+
+private void processWebDotXml() throws JasperException {
+
+WebXml webXml = null;
+
+try {
+webXml = new WebXml(ctxt);
+
+TreeNode webApp = null;
+if (webXml.getInputSource() != null) {
+ParserUtils pu = new ParserUtils();
+webApp = pu.parseXMLDocument(webXml.getSystemId(),
+webXml.getInputSource());
}
-if (ctxt.getMinorVersion() 4) {
+
+if (webApp == null
+|| getVersion(webApp) 2.4) {
defaultIsELIgnored = true;
+defaultDeferedSyntaxAllowedAsLiteral = true;
+return;
+}
+if (getVersion(webApp) 2.5) {
+defaultDeferedSyntaxAllowedAsLiteral = true;
+}
+TreeNode jspConfig = webApp.findChild(jsp-config);
+if (jspConfig == null) {
return;
}
-}
-
-JspConfigDescriptor jspConfig = ctxt.getJspConfigDescriptor();
-
-CollectionJspPropertyGroupDescriptor jspPropertyGroups =
-jspConfig.getJspPropertyGroups();
-for (JspPropertyGroupDescriptor jspPropertyGroup : jspPropertyGroups) {
+jspProperties = new VectorJspPropertyGroup();
+IteratorTreeNode jspPropertyList =
+jspConfig.findChildren(jsp-property-group);
+while (jspPropertyList.hasNext()) {
+
+TreeNode element = jspPropertyList.next();
+IteratorTreeNode list = element.findChildren();
+
+VectorString urlPatterns = new VectorString();
+String pageEncoding = null;
+String scriptingInvalid = null;
+String elIgnored = null;
+String isXml = null;
+VectorString includePrelude = new VectorString();
+VectorString includeCoda = new VectorString();
+String deferredSyntaxAllowedAsLiteral = null;
+String trimDirectiveWhitespaces = null;
+String defaultContentType = null;
+String buffer = null;
+String errorOnUndeclaredNamespace = null;
+
+while (list.hasNext()) {
+
+element = list.next();
+String tname = element.getName();
+
+if (url-pattern.equals(tname))
+urlPatterns.addElement( element.getBody() );
+else if
svn commit: r1377540 - in /tomcat/trunk/java/org/apache/jasper/compiler: JspConfig.java TldLocationsCache.java WebXml.java
Author: markt
Date: Sun Aug 26 22:50:13 2012
New Revision: 1377540
URL: http://svn.apache.org/viewvc?rev=1377540view=rev
Log:
Revert r1377509
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/trunk/java/org/apache/jasper/compiler/WebXml.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java?rev=1377540r1=1377539r2=1377540view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java Sun Aug 26
22:50:13 2012
@@ -17,14 +17,14 @@
package org.apache.jasper.compiler;
-import java.util.Collection;
import java.util.Iterator;
import java.util.Vector;
import javax.servlet.ServletContext;
-import javax.servlet.descriptor.JspConfigDescriptor;
-import javax.servlet.descriptor.JspPropertyGroupDescriptor;
+import org.apache.jasper.JasperException;
+import org.apache.jasper.xmlparser.ParserUtils;
+import org.apache.jasper.xmlparser.TreeNode;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -59,105 +59,171 @@ public class JspConfig {
this.ctxt = ctxt;
}
-private void processWebDotXml() {
-
-// Very, very unlikely but just in case...
-if (ctxt.getMajorVersion() 2) {
-defaultIsELIgnored = true;
-defaultDeferedSyntaxAllowedAsLiteral = true;
-return;
+private double getVersion(TreeNode webApp) {
+String v = webApp.findAttribute(version);
+if (v != null) {
+try {
+return Double.parseDouble(v);
+} catch (NumberFormatException e) {
+}
}
-if (ctxt.getMajorVersion() == 2) {
-if (ctxt.getMinorVersion() 5) {
-defaultDeferedSyntaxAllowedAsLiteral = true;
+return 2.3;
+}
+
+private void processWebDotXml() throws JasperException {
+
+WebXml webXml = null;
+
+try {
+webXml = new WebXml(ctxt);
+
+TreeNode webApp = null;
+if (webXml.getInputSource() != null) {
+ParserUtils pu = new ParserUtils();
+webApp = pu.parseXMLDocument(webXml.getSystemId(),
+webXml.getInputSource());
}
-if (ctxt.getMinorVersion() 4) {
+
+if (webApp == null
+|| getVersion(webApp) 2.4) {
defaultIsELIgnored = true;
+defaultDeferedSyntaxAllowedAsLiteral = true;
+return;
+}
+if (getVersion(webApp) 2.5) {
+defaultDeferedSyntaxAllowedAsLiteral = true;
+}
+TreeNode jspConfig = webApp.findChild(jsp-config);
+if (jspConfig == null) {
return;
}
-}
-
-JspConfigDescriptor jspConfig = ctxt.getJspConfigDescriptor();
-
-CollectionJspPropertyGroupDescriptor jspPropertyGroups =
-jspConfig.getJspPropertyGroups();
-for (JspPropertyGroupDescriptor jspPropertyGroup : jspPropertyGroups) {
+jspProperties = new Vector();
+IteratorTreeNode jspPropertyList =
+jspConfig.findChildren(jsp-property-group);
+while (jspPropertyList.hasNext()) {
+
+TreeNode element = jspPropertyList.next();
+IteratorTreeNode list = element.findChildren();
+
+VectorString urlPatterns = new Vector();
+String pageEncoding = null;
+String scriptingInvalid = null;
+String elIgnored = null;
+String isXml = null;
+VectorString includePrelude = new Vector();
+VectorString includeCoda = new Vector();
+String deferredSyntaxAllowedAsLiteral = null;
+String trimDirectiveWhitespaces = null;
+String defaultContentType = null;
+String buffer = null;
+String errorOnUndeclaredNamespace = null;
+
+while (list.hasNext()) {
+
+element = list.next();
+String tname = element.getName();
+
+if (url-pattern.equals(tname))
+urlPatterns.addElement( element.getBody() );
+else if (page-encoding.equals(tname))
+pageEncoding = element.getBody();
+else if (is-xml.equals(tname))
+isXml = element.getBody();
+else if (el-ignored.equals(tname))
+elIgnored = element.getBody();
+else if (scripting-invalid.equals(tname))
+
Tagging 7.0.30
Hi, I have all the open bugs fixed for 7.0.x with the exception of BZ53469 that is pending input from the Servlet EG before a final fix (if any) is applied. I have a few other bits and pieces I want to do before I tag 7.0.30 but (assuming no more bugs are opened) I anticipate tagging in the next few days. If you have anything you would like to see in 7.0.30 now is the time to commit :) Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53758] Dynamic Filter Registration mapping logic inverted
https://issues.apache.org/bugzilla/show_bug.cgi?id=53758 --- Comment #2 from David Graff djgraff...@gmail.com --- Glad I could help -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377543 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java webapps/docs/config/systemprops.xml
Author: fhanik
Date: Sun Aug 26 23:44:19 2012
New Revision: 1377543
URL: http://svn.apache.org/viewvc?rev=1377543view=rev
Log:
Per patches supplied in
https://issues.apache.org/bugzilla/show_bug.cgi?id=53267
Don't hard code the value, make the default the same as the hard coded value
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?rev=1377543r1=1377542r2=1377543view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Sun Aug 26 23:44:19 2012
@@ -297,7 +297,7 @@ public class JreMemoryLeakPreventionList
Method method = clazz.getDeclaredMethod(
requestLatency,
new Class[] {long.class});
-method.invoke(null, Long.valueOf(Long.MAX_VALUE - 1));
+method.invoke(null,
Long.getLong(org.apache.catalina.core.jreMemoryLeakPreventionGCDaemonPeriod,
Long.valueOf(Long.MAX_VALUE-1)));
} catch (ClassNotFoundException e) {
if (System.getProperty(java.vendor).startsWith(
Sun)) {
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml?rev=1377543r1=1377542r2=1377543view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml Sun Aug 26
23:44:19 2012
@@ -637,6 +637,11 @@
code$CATALINA_BASE/catalina.properties/code file./p
/property
+property name=org.apache.catalina.core.
jreMemoryLeakPreventionGCDaemonPeriod
+ pThe timeout period set when the leak prevention code triggers the GC
Daemon./p
+ pIf not specified, the default value of codeLong.MAX_VALUE-1/code
will be used./p
+/property
+
/properties
/section
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53267] The JreMemoryLeakPreventionListener causes a full GC every hour when gcDaemonProtection=true
https://issues.apache.org/bugzilla/show_bug.cgi?id=53267 --- Comment #10 from Filip Hanik fha...@apache.org --- Configurable value added in r1377543 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377544 - in /tomcat/trunk: java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java webapps/docs/config/systemprops.xml
Author: fhanik
Date: Sun Aug 26 23:48:01 2012
New Revision: 1377544
URL: http://svn.apache.org/viewvc?rev=1377544view=rev
Log:
don't hard code values, no need to
https://issues.apache.org/bugzilla/show_bug.cgi?id=53267
Modified:
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/trunk/webapps/docs/config/systemprops.xml
Modified:
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?rev=1377544r1=1377543r2=1377544view=diff
==
---
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Sun Aug 26 23:48:01 2012
@@ -297,7 +297,7 @@ public class JreMemoryLeakPreventionList
Method method = clazz.getDeclaredMethod(
requestLatency,
new Class[] {long.class});
-method.invoke(null, Long.valueOf(Long.MAX_VALUE - 1));
+method.invoke(null,
Long.getLong(org.apache.catalina.core.jreMemoryLeakPreventionGCDaemonPeriod,
Long.valueOf(Long.MAX_VALUE-1)));
} catch (ClassNotFoundException e) {
if (System.getProperty(java.vendor).startsWith(
Sun)) {
Modified: tomcat/trunk/webapps/docs/config/systemprops.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=1377544r1=1377543r2=1377544view=diff
==
--- tomcat/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/trunk/webapps/docs/config/systemprops.xml Sun Aug 26 23:48:01 2012
@@ -443,6 +443,11 @@
else the default value will be codefalse/code./p
/property
+property name=org.apache.catalina.core.
jreMemoryLeakPreventionGCDaemonPeriod
+ pThe timeout period set when the leak prevention code triggers the GC
Daemon./p
+ pIf not specified, the default value of codeLong.MAX_VALUE-1/code
will be used./p
+/property
+
/properties
/section
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
