Bug report for Taglibs [2011/11/14]

[bugzilla]

+---+
| 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 |
|50825|New|Nor|2011-02-24|Site still has links to Jakarta for mailing lists |
|51234|New|Nor|2011-05-20|NumberFormatException in fmt:formatNumber tag |
|51382|New|Blk|2011-06-15|Link to download pages are broken |
+-+---+---+--+--+
| Total8 bugs   |
+---+

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Bug report for Tomcat 5 [2011/11/14]

[bugzilla]

+---+
| 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  |
| |   |   |  |  |
|28039|Opn|Enh|2004-03-30|Cluster Support for SingleSignOn  |
|38216|Inf|Enh|2006-01-10|Extend Jmxproxy to allow call of MBean Operations |
|40728|New|Enh|2006-10-11|Catalina MBeans use non-serializable classes  |
|40766|New|Enh|2006-10-16|Using an unsecure jsessionid with mod_proxy_ajp ov|
|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|
|41697|Ver|Enh|2007-02-25|make visible in debug output if charset from brows|
|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|
|44904|New|Enh|2008-04-29|Provide warning message when DataSource's maxActiv|
|52059|Opn|Nor|2011-10-19|Windows Registry are not removed after uninstall  |
+-+---+---+--+--+
| Total   12 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 [2011/11/14]

[bugzilla]

+---+
| 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|
|44264|New|Enh|2008-01-18|Clustering - Support for disabling multicasting an|
|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 |
|44312|New|Enh|2008-01-28|Warn when overwritting docBase of the default Host|
|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|
|45283|Opn|Enh|2008-06-25|Provide a JSR196 implementation   |
|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|
|45995|New|Enh|2008-10-13|RFE - MIME type extension not case sensitive  |
|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 does not update contex|
|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|
|46497|New|Enh|2009-01-08|Install Tomcat Deployer/ANT on Windows Platform   |
|46655|New|Enh|2009-02-03|keystore's password handler   |
|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|
|47230|New|Enh|2009-05-21|Include sample cert attributes for SSL connectors |
|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|
|48543|New|Enh|2010-01-14|[Patch] More flexibility in specifying -Dcatalina.|
|48600|Opn|Enh|2010-01-22|Performance issue with tags   |
|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|

Bug report for Tomcat 7 [2011/11/14]

[bugzilla]

+---+
| 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  |
| |   |   |  |  |
|10021|New|Enh|2002-06-19|Include upgrade option in installer   |
|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   |
|48358|Opn|Enh|2009-12-09|JSP-unloading reloaded|
|48550|Inf|Enh|2010-01-14|Update examples and default server.xml to use UTF-|
|48892|New|Enh|2010-03-11|Use URIEncoding from server.xml for decoding post |
|49290|New|Enh|2010-05-14|Using a JarScanner with scanAllDirectories=true ca|
|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|
|51181|New|Enh|2011-05-10|Add support for Web Sockets   |
|51195|New|Enh|2011-05-13|"Find leaks" reports a false positive memory/class|
|51334|New|Enh|2011-06-07|Web SSO support based on WS-Federation Passive Req|
|51408|Opn|Enh|2011-06-21|String.getBytes() and new String(byte[]) use defau|
|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|
|51500|New|Enh|2011-07-12|NSIS - Allow configuration of more service propert|
|51526|New|Enh|2011-07-18|Process web application context config with embedd|
|51587|New|Enh|2011-07-29|Implement status and uptime commands  |
|51717|New|Enh|2011-08-24|Provide a way to disable EL cache |
|51741|Opn|Enh|2011-08-29|Eclipse WTP "Serve modules without publishing" bro|
|51953|New|Enh|2011-10-04|Proposal: netmask filtering valve and filter  |
|52028|New|Enh|2011-10-14|Embeded Tomcat using a Connector with a random por|
|52092|New|Enh|2011-10-26|Please make AsyncFileHandler and OneLineFormatter |
|52134|New|Enh|2011-11-04|HostConfig#deployDirectories Deploys Every Directo|
|52172|New|Nor|2011-11-13|The build instructions could be a trifle clearer a|
|52173|New|Nor|2011-11-13|Add a drop of additional clarification to doc on t|
+-+---+---+--+--+
| Total   35 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 [2011/11/14]

[bugzilla]

+---+
| 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|
|50511|Inf|Nor|2010-12-22|WARNING about Internal Dummy Connection of Apache |
|51235|Inf|Maj|2011-05-20|Access Violation in httpd.exe originating in mod_j|
|51767|New|Maj|2011-09-06|isapi_redirect intermittently crashes iis worker p|
|52074|New|Maj|2011-10-23|PATH_INFO not passed from IIS7 to Tomcat7 |
+-+---+---+--+--+
| Total   40 bugs   |
+---+

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Bug report for Tomcat Modules [2011/11/14]

[bugzilla]

+---+
| 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|
|49953|Opn|Nor|2010-09-17|Missing @Override annotations |
|50565|New|Min|2011-01-10|Static variables should be accessed in a static wa|
|50566|New|Nor|2011-01-10|Duplicate assignment to connection variable   |
|50571|Inf|Nor|2011-01-11|Tomcat 7 JDBC connection pool exception enhancemen|
|50660|New|Min|2011-01-26|Improve validationQuery error handling|
|50860|New|Nor|2011-03-03|In case of invalid or empty slqQuery connection ar|
|50864|New|Nor|2011-03-03|Reconfigure pool on the fly using JMX |
|51198|New|Nor|2011-05-13|Trunk Version : Performance enhancement in Connect|
|51237|New|Nor|2011-05-20|SlowQueryReport interceptor does not log anything |
|51388|New|Enh|2011-06-16|SlowQueryReport should respect Statement.getQueryT|
|51582|New|Maj|2011-07-29|NPE in SlowQueryReport|
|51595|New|Nor|2011-08-01|org.apache.tomcat.jdbc.pool.jmx.ConnectionPool sho|
|51879|New|Enh|2011-09-22|Improve access to Native Connection Methods   |
|51893|New|Nor|2011-09-26|JMX notification/Exception for empty/exhausted con|
|52002|New|Nor|2011-10-10|Pool re-opens and re-issues closed connection |
|52024|New|Enh|2011-10-13|Custom interceptor to support automatic failover o|
|52066|New|Nor|2011-10-20|ConnectionPool.borrowConnection swallows interrupt|
+-+---+---+--+--+
| Total   22 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 [2011/11/14]

[bugzilla]

+---+
| 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 |
|51477|Opn|Enh|2011-07-05|Support all protocol combinations in SSLProtocol o|
|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|
|52119|New|Nor|2011-11-01|Add Diablo JDK to default JDK location search path|
|52153|New|Maj|2011-11-08|periodic JVM crash (access violation) on buffer fl|
+-+---+---+--+--+
| Total9 bugs   |
+---+

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1201683 - /tomcat/tc6.0.x/trunk/STATUS.txt

[kkolinko]

Author: kkolinko
Date: Mon Nov 14 12:39:12 2011
New Revision: 1201683

URL: http://svn.apache.org/viewvc?rev=1201683&view=rev
Log:
proposal

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1201683&r1=1201682&r2=1201683&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Nov 14 12:39:12 2011
@@ -94,6 +94,14 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko
   -1:
 
+* Fix autodeployment of applications that have configuration errors.
+  If autodeployment fails, create DeployedApplication object and register
+  what we deployed (xml or war or dir - a single file) as redeployResource.
+  If it is updated the application will be redeployed.
+  http://people.apache.org/~kkolinko/patches/2011-11-14_tc6_HostConfig.patch
+  +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

svn commit: r1201716 - /tomcat/tc6.0.x/trunk/STATUS.txt

[kkolinko]

Author: kkolinko
Date: Mon Nov 14 14:17:36 2011
New Revision: 1201716

URL: http://svn.apache.org/viewvc?rev=1201716&view=rev
Log:
Additional patch to cover display and control of failed apps in manager webapp

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=1201716&r1=1201715&r2=1201716&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Nov 14 14:17:36 2011
@@ -98,7 +98,10 @@ PATCHES PROPOSED TO BACKPORT:
   If autodeployment fails, create DeployedApplication object and register
   what we deployed (xml or war or dir - a single file) as redeployResource.
   If it is updated the application will be redeployed.
+  + ContainerBase patch adds display of failed apps in manager. They can be
+  listed and undeployed.
   http://people.apache.org/~kkolinko/patches/2011-11-14_tc6_HostConfig.patch
+  http://people.apache.org/~kkolinko/patches/2011-11-14_tc6_ContainerBase.patch
   +1: kkolinko
   -1:
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1201733 - in /tomcat/jk/trunk/native/iis: Makefile.amd64 Makefile.ia64 Makefile.x86 isapi.dsp

[mturk]

Author: mturk
Date: Mon Nov 14 14:52:51 2011
New Revision: 1201733

URL: http://svn.apache.org/viewvc?rev=1201733&view=rev
Log:
Axe jni worker from build files, and remove jni build dependency

Modified:
tomcat/jk/trunk/native/iis/Makefile.amd64
tomcat/jk/trunk/native/iis/Makefile.ia64
tomcat/jk/trunk/native/iis/Makefile.x86
tomcat/jk/trunk/native/iis/isapi.dsp

Modified: tomcat/jk/trunk/native/iis/Makefile.amd64
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.amd64?rev=1201733&r1=1201732&r2=1201733&view=diff
==
--- tomcat/jk/trunk/native/iis/Makefile.amd64 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.amd64 Mon Nov 14 14:52:51 2011
@@ -57,7 +57,6 @@ CLEAN :
-@erase "$(INTDIR)\jk_connect.obj"
-@erase "$(INTDIR)\jk_context.obj"
-@erase "$(INTDIR)\jk_isapi_plugin.obj"
-   -@erase "$(INTDIR)\jk_jni_worker.obj"
-@erase "$(INTDIR)\jk_lb_worker.obj"
-@erase "$(INTDIR)\jk_map.obj"
-@erase "$(INTDIR)\jk_md5.obj"
@@ -97,7 +96,6 @@ LINK32_OBJS= \
"$(INTDIR)\jk_connect.obj" \
"$(INTDIR)\jk_context.obj" \
"$(INTDIR)\jk_isapi_plugin.obj" \
-   "$(INTDIR)\jk_jni_worker.obj" \
"$(INTDIR)\jk_lb_worker.obj" \
"$(INTDIR)\jk_map.obj" \
"$(INTDIR)\jk_md5.obj" \
@@ -121,7 +119,7 @@ LINK32_OBJS= \
IF EXIST $(OUTDIR)\$(TARGET).manifest \
mt -nologo -manifest $(OUTDIR)\$(TARGET).manifest 
-outputresource:$(OUTDIR)\$(TARGET).dll;2
 
-CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I "pcre" /I 
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" 
/D "_WINDOWS" /D "_AMD64_=1" -DWIN64 /D "_WIN64" /D "JK_ISAPI" /D 
"ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" $(CFLAGS) /Fo"$(INTDIR)\\" 
/Fd"$(INTDIR)\isapi_redirector_src" /FD /c
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I "pcre" /D 
"WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AMD64_=1" -DWIN64 /D "_WIN64" /D 
"JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" $(CFLAGS) 
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c
 
 .c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -215,12 +213,6 @@ SOURCE=.\jk_isapi_plugin.c
 "$(INTDIR)\jk_isapi_plugin.obj" : $(SOURCE) "$(INTDIR)"
 
 
-SOURCE=..\common\jk_jni_worker.c
-
-"$(INTDIR)\jk_jni_worker.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
 SOURCE=..\common\jk_lb_worker.c
 
 "$(INTDIR)\jk_lb_worker.obj" : $(SOURCE) "$(INTDIR)"

Modified: tomcat/jk/trunk/native/iis/Makefile.ia64
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.ia64?rev=1201733&r1=1201732&r2=1201733&view=diff
==
--- tomcat/jk/trunk/native/iis/Makefile.ia64 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.ia64 Mon Nov 14 14:52:51 2011
@@ -57,7 +57,6 @@ CLEAN :
-@erase "$(INTDIR)\jk_connect.obj"
-@erase "$(INTDIR)\jk_context.obj"
-@erase "$(INTDIR)\jk_isapi_plugin.obj"
-   -@erase "$(INTDIR)\jk_jni_worker.obj"
-@erase "$(INTDIR)\jk_lb_worker.obj"
-@erase "$(INTDIR)\jk_map.obj"
-@erase "$(INTDIR)\jk_md5.obj"
@@ -97,7 +96,6 @@ LINK32_OBJS= \
"$(INTDIR)\jk_connect.obj" \
"$(INTDIR)\jk_context.obj" \
"$(INTDIR)\jk_isapi_plugin.obj" \
-   "$(INTDIR)\jk_jni_worker.obj" \
"$(INTDIR)\jk_lb_worker.obj" \
"$(INTDIR)\jk_map.obj" \
"$(INTDIR)\jk_md5.obj" \
@@ -121,7 +119,7 @@ LINK32_OBJS= \
IF EXIST $(OUTDIR)\$(TARGET).manifest \
mt -nologo -manifest $(OUTDIR)\$(TARGET).manifest 
-outputresource:$(OUTDIR)\$(TARGET).dll;2
 
-CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Zi -EHsc /I "..\common" /I "pcre" /I 
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" 
/D "_WINDOWS" /D "_IA64_=1" -DWIN64 /D "_WIN64" /D "JK_ISAPI" /D 
"ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" $(CFLAGS) /Fo"$(INTDIR)\\" 
/Fd"$(INTDIR)\isapi_redirector_src" /FD /c 
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Zi -EHsc /I "..\common" /I "pcre" /D 
"WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_IA64_=1" -DWIN64 /D "_WIN64" /D 
"JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" $(CFLAGS) 
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c 
 
 .c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -215,12 +213,6 @@ SOURCE=.\jk_isapi_plugin.c
 "$(INTDIR)\jk_isapi_plugin.obj" : $(SOURCE) "$(INTDIR)"
 
 
-SOURCE=..\common\jk_jni_worker.c
-
-"$(INTDIR)\jk_jni_worker.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
 SOURCE=..\common\jk_lb_worker.c
 
 "$(INTDIR)\jk_lb_worker.obj" : $(SOURCE) "$(INTDIR)"

Modified: tomcat/jk/trunk/native/iis/Makefile.x86
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.x86?rev=1201733&r1=1201732&r2=1201733&view=diff
=

svn commit: r1201734 - in /tomcat/jk/trunk/native/apache-2.0: Makefile.vc mod_jk.dsp

[mturk]

Author: mturk
Date: Mon Nov 14 14:56:52 2011
New Revision: 1201734

URL: http://svn.apache.org/viewvc?rev=1201734&view=rev
Log:
Axe jni worker from build files, and remove jni build dependency

Modified:
tomcat/jk/trunk/native/apache-2.0/Makefile.vc
tomcat/jk/trunk/native/apache-2.0/mod_jk.dsp

Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.vc?rev=1201734&r1=1201733&r2=1201734&view=diff
==
--- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original)
+++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Mon Nov 14 14:56:52 2011
@@ -57,7 +57,6 @@ CLEAN :
-@erase "$(INTDIR)\jk_ajp_common.obj"
-@erase "$(INTDIR)\jk_connect.obj"
-@erase "$(INTDIR)\jk_context.obj"
-   -@erase "$(INTDIR)\jk_jni_worker.obj"
-@erase "$(INTDIR)\jk_lb_worker.obj"
-@erase "$(INTDIR)\jk_map.obj"
-@erase "$(INTDIR)\jk_md5.obj"
@@ -96,7 +95,6 @@ LINK32_OBJS= \
"$(INTDIR)\jk_ajp_common.obj" \
"$(INTDIR)\jk_connect.obj" \
"$(INTDIR)\jk_context.obj" \
-   "$(INTDIR)\jk_jni_worker.obj" \
"$(INTDIR)\jk_lb_worker.obj" \
"$(INTDIR)\jk_map.obj" \
"$(INTDIR)\jk_md5.obj" \
@@ -120,7 +118,7 @@ LINK32_OBJS= \
mt -nologo -manifest $(OUTDIR)\$(TARGET).manifest 
-outputresource:$(OUTDIR)\$(TARGET).so;2
 
 
-CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I 
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I 
"$(APACHE2_HOME)\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" 
/Fd"$(INTDIR)\mod_jk_src" /FD /c
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I 
"$(APACHE2_HOME)\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" 
/Fd"$(INTDIR)\mod_jk_src" /FD /c
 
 .c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -209,12 +207,6 @@ SOURCE=..\common\jk_context.c
$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=..\common\jk_jni_worker.c
-
-"$(INTDIR)\jk_jni_worker.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
 SOURCE=..\common\jk_lb_worker.c
 
 "$(INTDIR)\jk_lb_worker.obj" : $(SOURCE) "$(INTDIR)"

Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.dsp
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.dsp?rev=1201734&r1=1201733&r2=1201734&view=diff
==
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.dsp (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.dsp Mon Nov 14 14:56:52 2011
@@ -45,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /Zi /O2 /Oy- /D "WIN32" /D "NDEBUG" /D 
"_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "..\common" /I 
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I 
"$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\srclib\apr\include" /I 
"$(APACHE2_HOME)\srclib\apr-util\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" 
/D "HAVE_APR" /Fd"Release/mod_jk_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "..\common" /I 
"$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\srclib\apr\include" /I 
"$(APACHE2_HOME)\srclib\apr-util\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" 
/D "HAVE_APR" /Fd"Release/mod_jk_src" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D 
"_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\common" /I 
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I 
"$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\srclib\apr\include" /I 
"$(APACHE2_HOME)\srclib\apr-util\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" 
/D "HAVE_APR" /Fd"Debug/mod_jk_src" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\common" /I 
"$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\srclib\apr\include" /I 
"$(APACHE2_HOME)\srclib\apr-util\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" 
/D "HAVE_APR" /Fd"Debug/mod_jk_src" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -97,7 +97,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /Zi /O2 /Oy- /D "WIN32" /D "NDEBUG" /D 
"_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "..\common" /I 
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I 
"$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\srclib\apr\include" /I 
"$(APACHE2_HOME)\srclib\apr-util\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" 
/D "HAVE_APR" /Fd"Release22/mod_jk_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "..\common" /I 
"$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\srclib\ap

svn commit: r1201736 - in /tomcat/jk/trunk/native: apache-1.3/Makefile.vc apache-1.3/mod_jk.dsp netscape/Makefile.vc netscape/nsapi.dsp

[mturk]

Author: mturk
Date: Mon Nov 14 15:02:15 2011
New Revision: 1201736

URL: http://svn.apache.org/viewvc?rev=1201736&view=rev
Log:
Axe jni worker from build files, and remove jni build dependency

Modified:
tomcat/jk/trunk/native/apache-1.3/Makefile.vc
tomcat/jk/trunk/native/apache-1.3/mod_jk.dsp
tomcat/jk/trunk/native/netscape/Makefile.vc
tomcat/jk/trunk/native/netscape/nsapi.dsp

Modified: tomcat/jk/trunk/native/apache-1.3/Makefile.vc
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/Makefile.vc?rev=1201736&r1=1201735&r2=1201736&view=diff
==
--- tomcat/jk/trunk/native/apache-1.3/Makefile.vc (original)
+++ tomcat/jk/trunk/native/apache-1.3/Makefile.vc Mon Nov 14 15:02:15 2011
@@ -31,7 +31,6 @@ CLEAN :
-@erase "$(INTDIR)\jk_ajp_common.obj"
-@erase "$(INTDIR)\jk_connect.obj"
-@erase "$(INTDIR)\jk_context.obj"
-   -@erase "$(INTDIR)\jk_jni_worker.obj"
-@erase "$(INTDIR)\jk_lb_worker.obj"
-@erase "$(INTDIR)\jk_map.obj"
-@erase "$(INTDIR)\jk_md5.obj"
@@ -70,7 +69,6 @@ LINK32_OBJS= \
"$(INTDIR)\jk_ajp_common.obj" \
"$(INTDIR)\jk_connect.obj" \
"$(INTDIR)\jk_context.obj" \
-   "$(INTDIR)\jk_jni_worker.obj" \
"$(INTDIR)\jk_lb_worker.obj" \
"$(INTDIR)\jk_map.obj" \
"$(INTDIR)\jk_md5.obj" \
@@ -90,7 +88,7 @@ LINK32_OBJS= \
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
 
-CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I 
"$(APACHE1_HOME)\include" /I "$(JAVA_HOME)\include" /I 
"$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D 
"_USRDLL" $(DEF_EAPI) /D "MOD_JK_EXPORTS" /Fo"$(INTDIR)\\" 
/Fd"$(INTDIR)\mod_jk_src" /FD /c 
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I 
"$(APACHE1_HOME)\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D 
"_USRDLL" $(DEF_EAPI) /D "MOD_JK_EXPORTS" /Fo"$(INTDIR)\\" 
/Fd"$(INTDIR)\mod_jk_src" /FD /c 
 
 .c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -173,12 +171,6 @@ SOURCE=..\common\jk_context.c
$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=..\common\jk_jni_worker.c
-
-"$(INTDIR)\jk_jni_worker.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
 SOURCE=..\common\jk_lb_worker.c
 
 "$(INTDIR)\jk_lb_worker.obj" : $(SOURCE) "$(INTDIR)"

Modified: tomcat/jk/trunk/native/apache-1.3/mod_jk.dsp
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/mod_jk.dsp?rev=1201736&r1=1201735&r2=1201736&view=diff
==
--- tomcat/jk/trunk/native/apache-1.3/mod_jk.dsp (original)
+++ tomcat/jk/trunk/native/apache-1.3/mod_jk.dsp Mon Nov 14 15:02:15 2011
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /Zi /O2 /Oy- /D "WIN32" /D "NDEBUG" /D 
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MOD_JK_EXPORTS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "..\common" /I 
"$(APACHE1_HOME)\include" /I "$(APACHE1_HOME)\src\include" /I 
"$(APACHE1_HOME)\src\os\win32" /I "$(JAVA_HOME)\include" /I 
"$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D 
"_USRDLL" /D "MOD_JK_EXPORTS" /Fd"Release\mod_jk_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "..\common" /I 
"$(APACHE1_HOME)\include" /I "$(APACHE1_HOME)\src\include" /I 
"$(APACHE1_HOME)\src\os\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" 
/D "_USRDLL" /D "MOD_JK_EXPORTS" /Fd"Release\mod_jk_src" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D 
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MOD_JK_EXPORTS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\common" /I 
"$(APACHE1_HOME)\include" /I "$(APACHE1_HOME)\src\include" /I 
"$(APACHE1_HOME)\src\os\win32" /I "$(JAVA_HOME)\include" /I 
"$(JAVA_HOME)\include\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D 
"_USRDLL" /D "MOD_JK_EXPORTS" /Fd"Debug\mod_jk_src" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\common" /I 
"$(APACHE1_HOME)\include" /I "$(APACHE1_HOME)\src\include" /I 
"$(APACHE1_HOME)\src\os\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" 
/D "_USRDLL" /D "MOD_JK_EXPORTS" /Fd"Debug\mod_jk_src" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -124,10 +124,6 @@ SOURCE=..\common\jk_context.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\common\jk_jni_worker.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\common\jk_lb_worker.c
 # End Source File
 # Begin Source File
@@ -220,10 +216,6 @@ SOURCE=..\common\jk_global.h
 # End Source File
 # Begin Source File

Re: Add daemon.sh to bin/ for both trunk and 7.0.x

[Mladen Truk]

On 10/29/2011 06:42 PM, Mladen Truk wrote:


I propose we move that script from daemon to tomcat
since it belongs here.

Comments?



No comments -> lazy consensus.
I'll add daemon.sh both to 7.0.x and trunk and axe
that file from next commons-daemon release (1.0.8)


Regards
--
^TM

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 52172] The build instructions could be a trifle clearer about /usr/share/java

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52172

Mark Thomas  changed:

   What|Removed |Added

  Component|Documentation   |Webapps:Documentation
Version|trunk   |5.5.34
Product|Tomcat 7|Tomcat 5

--- Comment #2 from Mark Thomas  2011-11-14 20:00:29 UTC ---
Updating version

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Redeploy on context.xml changes (Was: Tagging 7.0.23)

[Mark Thomas]

On 14/11/2011 05:54, Konstantin Kolinko wrote:

Note: "Fixed" below means I have fixed the issue locally and will
include it in the commit.

> 1) s/Redploy/Redeploy/ in several comments.
Fixed.

> 2) In HostConfig.checkResources() there are three occurrences of the
> following code:
Fixed.

> 3) Testing redeployment.
Thanks for this. It is a useful recipe.

> Tests:
> 1. touch context.xml  -> OK, all redeployed
> 2. touch context.xml.default -> OK, all redeployed
> 3. touch examples.xml -> FAIL, redeployed examples app, but it deleted
> "context.xml.default" (causing redeployment of all other webapps)
> Now shutdown Tomcat, restore "context.xml.default" and start Tomcat
Fixed as a result of the fix for 2) above.

> 4. delete examples.xml -> Examples app is undeployed, but is instantly
> deployed again as "web application directory". It is strange. Is it
> expected?
On first inspection, not what I expected. On reflection, I think it is.
Consider the sequence (when context.xml files are copied to
conf/Catalina/localhost
- new dir with META-INF/context.xml is copied to appBase
- context.xml is copied to conf/Catalina/localhost during deploy
- conf/Catalina/localhost/newapp.xml is edited (redploy)
- conf/Catalina/localhost/newapp.xml is deleted (redploy)
- At this point the original context.xml is copied from META-INF

I think an argument can be made for this to work either way. Given the
current approach has been like this since the early days of 5.5.x, I
plan on leaving it as is.

> 5. rename "context.xml.default" -> OK, all redeployed
> 6. rename "context.xml" -> OK, all redeployed
> 
> I have not tested what happens if I deploy a war file.

I repeated the above with examples -> examples.war and all behaved the
same way.

> 4) There is StandardContext#setDefaultContextXml() method.
> I do not see it being called by Tomcat code, nor I see it documented
> in config/context.html.

I assume this is for the embedded case.

> 5) FailedContext is used in HostConfig class only.
> 
> Actually HostConfig#digester just preparses the context.xml file: it
> processes only the root  element and its attributes.

This is by design. If the Context element and attributes are OK then a
valid context object can be created. Whether or not it can start is a
different problem. FailedContext is intended for use when the config is
so badly broken that Tomcat can't determine what class it should be
using for the Context object or there is some issue configuring it.


Is there scope for further improvement, clarification around deployment?
Sure. But I don't think this issue is place to make those changes.

I'll be committing the amended patch shortly.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1201921 - in /tomcat/trunk: java/org/apache/catalina/core/ java/org/apache/catalina/startup/ java/org/apache/catalina/util/ webapps/docs/

[markt]

Author: markt
Date: Mon Nov 14 21:51:23 2011
New Revision: 1201921

URL: http://svn.apache.org/viewvc?rev=1201921&view=rev
Log:
Improve handling of failed deployments
- Allow failed configurations to be fixed via JMX
- Ensure once a deployment fails, the context is not deployed
- Ensure changes to any context.xml file trigger redeployment rather than 
reloading
- Tweak base lifecycle implementation to allow failed components to be 
restarted once they have been fixed

Added:
tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties
tomcat/trunk/webapps/docs/deployer-howto.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1201921&r1=1201920&r2=1201921&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Mon Nov 14 
21:51:23 2011
@@ -840,20 +840,12 @@ public abstract class ContainerBase exte
 if ((getState().isAvailable() ||
 LifecycleState.STARTING_PREP.equals(getState())) &&
 startChildren) {
-boolean success = false;
 try {
 child.start();
-success = true;
 } catch (LifecycleException e) {
 log.error("ContainerBase.addChild: start: ", e);
 throw new IllegalStateException
 ("ContainerBase.addChild: start: " + e);
-} finally {
-if (!success) {
-synchronized (children) {
-children.remove(child.getName());
-}
-}
 }
 }
 

Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1201921&r1=1201920&r2=1201921&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Mon Nov 14 
21:51:23 2011
@@ -569,13 +569,6 @@ public class ContextConfig
 try {
 source = new InputSource(contextXml.toString());
 stream = contextXml.openStream();
-
-// Add as watched resource so that cascade reload occurs if a 
default
-// config file is modified/added/removed
-if ("file".equals(contextXml.getProtocol())) {
-context.addWatchedResource(
-(new File(contextXml.toURI())).getAbsolutePath());
-}
 } catch (Exception e) {
 log.error(sm.getString("contextConfig.contextMissing",
   contextXml) , e);
@@ -1710,7 +1703,6 @@ public class ContextConfig
 } else {
 source = new 
InputSource(file.getAbsoluteFile().toURI().toString());
 stream = new FileInputStream(file);
-context.addWatchedResource(file.getAbsolutePath());
 }
 
 if (stream != null && source != null) {

Added: tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java?rev=1201921&view=auto
==
--- tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java (added)
+++ tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java Mon Nov 14 
21:51:23 2011
@@ -0,0 +1,643 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitatio

svn commit: r1201922 - /tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java

[markt]

Author: markt
Date: Mon Nov 14 21:52:59 2011
New Revision: 1201922

URL: http://svn.apache.org/viewvc?rev=1201922&view=rev
Log:
Fix line endings

Modified:
tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java   
(contents, props changed)

Modified: tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java?rev=1201922&r1=1201921&r2=1201922&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java Mon Nov 14 
21:52:59 2011
@@ -1,643 +1,643 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.catalina.startup;
-
-import java.beans.PropertyChangeListener;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Set;
-
-import javax.naming.directory.DirContext;
-import javax.servlet.ServletContainerInitializer;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletSecurityElement;
-import javax.servlet.descriptor.JspConfigDescriptor;
-
-import org.apache.catalina.AccessLog;
-import org.apache.catalina.Authenticator;
-import org.apache.catalina.Cluster;
-import org.apache.catalina.Container;
-import org.apache.catalina.ContainerListener;
-import org.apache.catalina.Context;
-import org.apache.catalina.LifecycleException;
-import org.apache.catalina.Loader;
-import org.apache.catalina.Manager;
-import org.apache.catalina.Pipeline;
-import org.apache.catalina.Realm;
-import org.apache.catalina.Valve;
-import org.apache.catalina.Wrapper;
-import org.apache.catalina.connector.Request;
-import org.apache.catalina.connector.Response;
-import org.apache.catalina.core.ApplicationServletRegistration;
-import org.apache.catalina.deploy.ApplicationParameter;
-import org.apache.catalina.deploy.ErrorPage;
-import org.apache.catalina.deploy.FilterDef;
-import org.apache.catalina.deploy.FilterMap;
-import org.apache.catalina.deploy.LoginConfig;
-import org.apache.catalina.deploy.NamingResources;
-import org.apache.catalina.deploy.SecurityConstraint;
-import org.apache.catalina.mbeans.MBeanUtils;
-import org.apache.catalina.util.CharsetMapper;
-import org.apache.catalina.util.LifecycleMBeanBase;
-import org.apache.juli.logging.Log;
-import org.apache.tomcat.JarScanner;
-import org.apache.tomcat.util.http.mapper.Mapper;
-import org.apache.tomcat.util.res.StringManager;
-
-/**
- * An implementation of {@link Context} that is used as a place-holder for
- * deployed applications when their deployment fails and a Context instance
- * (usually {@link org.apache.catalina.core.StandardContext} but may be any
- * Context implementation) cannot be created.
- */
-public class FailedContext extends LifecycleMBeanBase implements Context {
-
-protected static final StringManager sm =
-StringManager.getManager(Constants.Package);
-
-
-// - Methods that need to work even for a failed 
context
-
-private URL configFile;
-@Override
-public URL getConfigFile() { return configFile; }
-@Override
-public void setConfigFile(URL configFile) { this.configFile = configFile; }
-
-
-private String docBase;
-@Override
-public String getDocBase() { return docBase; }
-@Override
-public void setDocBase(String docBase) { this.docBase = docBase; }
-
-
-
-private String name = null;
-@Override
-public String getName() { return name; }
-@Override
-public void setName(String name) { this.name = name; }
-
-
-private Container parent;
-@Override
-public Container getParent() { return parent; }
-@Override
-public void setParent(Container parent) { this.parent = parent; }
-
-
-private String path = null;
-@Override
-public String getPath() { return path; }
-@Override
-public void setPath(String path) { this.path = path; }
-
-
-private String webappVersion = null;
-@Override
-public String getWebappVersion() { return webappVersion; }
-@Override

svn commit: r1201928 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ java/org/apache/catalina/util/ webapps/docs/

[markt]

Author: markt
Date: Mon Nov 14 22:07:08 2011
New Revision: 1201928

URL: http://svn.apache.org/viewvc?rev=1201928&view=rev
Log:
Improve handling of failed deployments
- Allow failed configurations to be fixed via JMX
- Ensure once a deployment fails, the context is not deployed
- Ensure changes to any context.xml file trigger redeployment rather than 
reloading
- Tweak base lifecycle implementation to allow failed components to be 
restarted once they have been fixed

Added:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java   
(with props)
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/LifecycleBase.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/LocalStrings.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 14 22:07:08 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187
 
753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,

svn commit: r1201931 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java

[markt]

Author: markt
Date: Mon Nov 14 22:13:32 2011
New Revision: 1201931

URL: http://svn.apache.org/viewvc?rev=1201931&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52173
Improve Javadoc for delgate attribute of WebappClassLoader
Based on a patch by bmargulies

Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java

Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1201931&r1=1201930&r2=1201931&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Mon Nov 
14 22:13:32 2011
@@ -85,14 +85,16 @@ import org.apache.tomcat.util.res.String
  * compatible with a normal URLClassLoader, although its internal
  * behavior may be completely different.
  * 
- * IMPLEMENTATION NOTE - This class loader faithfully follows
- * the delegation model recommended in the specification. The system class
+ * IMPLEMENTATION NOTE - By default, this class loader follows
+ * the delegation model required by the specification. The system class
  * loader will be queried first, then the local repositories, and only then
  * delegation to the parent class loader will occur. This allows the web
  * application to override any shared class except the classes from J2SE.
  * Special handling is provided from the JAXP XML parser interfaces, the JNDI
  * interfaces, and the classes from the servlet API, which are never loaded
- * from the webapp repository.
+ * from the webapp repositories. The delegate property
+ * allows an application to modify this behavior to move the parent class 
loader
+ * ahead of the local repositories.
  * 
  * IMPLEMENTATION NOTE - Due to limitations in Jasper
  * compilation technology, any repository which contains classes from
@@ -291,7 +293,8 @@ public class WebappClassLoader
  * usual Java2 delegation model)?  If set to false,
  * this class loader will search its own repositories first, and
  * delegate to the parent only if the class or resource is not
- * found locally.
+ * found locally. Note that the default, false, is
+ * the behavior called for by the servlet specification.
  */
 protected boolean delegate = false;
 
@@ -535,6 +538,14 @@ public class WebappClassLoader
 
 /**
  * Set the "delegate first" flag for this class loader.
+ * If this flag is true, this class loader delegates
+ * to the parent class loader
+ * before searching its own repositories, as
+ * in an ordinary (non-servlet) chain of of Java class loaders.
+ * If set to false (the default),
+ * this class loader will search its own repositories first, and
+ * delegate to the parent only if the class or resource is not
+ * found locally, as per the servlet specification.
  *
  * @param delegate The new "delegate first" flag
  */



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1201934 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Nov 14 22:16:26 2011
New Revision: 1201934

URL: http://svn.apache.org/viewvc?rev=1201934&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52173
Improve Javadoc for delgate attribute of WebappClassLoader
Based on a patch by bmargulies

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 14 22:16:26 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187
 
753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,

DO NOT REPLY [Bug 52173] Add a drop of additional clarification to doc on the delegate setting of the WebappClassLoader

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52173

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas  2011-11-14 22:16:48 UTC ---
Fixed in 7.0.x and will be included in 7.0.23 onwards.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 52184] New: Reduce log level for invalid cookies

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52184

 Bug #: 52184
   Summary: Reduce log level for invalid cookies
   Product: Tomcat 7
   Version: 7.0.22
  Platform: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Connectors
AssignedTo: dev@tomcat.apache.org
ReportedBy: fha...@apache.org
Classification: Unclassified


Invalid cookies are fairly common. Firefox has them all the time. Tomcat logs
fill up very quickly with this input. Tomcat doesn't log when there is an
invalid HTTP request, as that would yield the same problem.co 

Nov 14, 2011 3:15:27 PM org.apache.tomcat.util.http.Cookies processCookieHeader
INFO: Cookies: Invalid cookie. Value not a token or quoted value

http://vmc-ssrc-rh56.eng.vmware.com:8080/

GET / HTTP/1.1
Host: vmc-ssrc-rh56.eng.vmware.com:8080
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:7.0.1) Gecko/20100101
Firefox/7.0.1
Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
Accept-Language: en-us,en;q=0.5
Accept-Encoding: gzip, deflate
Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7
Connection: keep-alive
Cookie: __utma=106857756.14479066.1321292743.1321296794.1321304211.3;
__utmz=106857756.1321304211.3.2.utmcsr=communities.example.com|utmccn=(referral)|utmcmd=referral|utmcct=/community/vmtn/appplatform/testapp_fire;
s_nr=1321293934221; s_vi=[CS]v1|2760A9C4851D0F77-610260007567[CE]
Cache-Control: max-age=0

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1202032 - /tomcat/tc6.0.x/trunk/build.properties.default

[jfclere]

Author: jfclere
Date: Tue Nov 15 04:14:05 2011
New Revision: 1202032

URL: http://svn.apache.org/viewvc?rev=1202032&view=rev
Log:
Ready for 6.0.34

Modified:
tomcat/tc6.0.x/trunk/build.properties.default

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1202032&r1=1202031&r2=1202032&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Tue Nov 15 04:14:05 2011
@@ -27,9 +27,10 @@
 # - Version Control Flags -
 version.major=6
 version.minor=0
-version.build=33
+version.build=34
 version.patch=0
 version.suffix=-dev
+version=6.0.34
 
 # - Default Base Path for Dependent Packages -
 # Please note this path must be absolute, not relative,



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1202033 - /tomcat/tc6.0.x/tags/TOMCAT_6_0_34/

[jfclere]

Author: jfclere
Date: Tue Nov 15 04:17:16 2011
New Revision: 1202033

URL: http://svn.apache.org/viewvc?rev=1202033&view=rev
Log:
6.0.34

Added:
tomcat/tc6.0.x/tags/TOMCAT_6_0_34/   (props changed)
  - copied from r1202032, tomcat/tc6.0.x/trunk/

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_34/
--
--- svn:ignore (added)
+++ svn:ignore Tue Nov 15 04:17:16 2011
@@ -0,0 +1,7 @@
+.classpath
+.project
+.settings
+output
+build.properties
+work
+logs

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_34/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Nov 15 04:17:16 2011
@@ -0,0 +1 @@
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
 
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
 
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841
 
,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575
 
,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471,1152601,1156171,1156519,1164567,1167394,1172233-1172234,1172236,1173614,1174353,1174882,1174884,1175158,

svn commit: r1202035 - in /tomcat/trunk: BUILDING.txt java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/building.xml

[kkolinko]

Author: kkolinko
Date: Tue Nov 15 04:23:40 2011
New Revision: 1202035

URL: http://svn.apache.org/viewvc?rev=1202035&view=rev
Log:
Correct typo in Javadoc.
Add note to BUILDING.txt, that you do not need to build Tomcat if you just want 
to run it.
Move warning earlier than note, so that it is more visible.

Modified:
tomcat/trunk/BUILDING.txt
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/trunk/webapps/docs/building.xml

Modified: tomcat/trunk/BUILDING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1202035&r1=1202034&r2=1202035&view=diff
==
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Tue Nov 15 04:23:40 2011
@@ -23,9 +23,14 @@ $Id$
 
 This subproject contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a 
container that
 implements the Servlet 3.0 and JSP 2.1 specifications from the Java
-Community Process .  In order to build a binary
-distribution version of the container from a source distribution,
-do the following:
+Community Process .
+
+Note: If you just need to run Apache Tomcat, it is not necessary to build
+it. You may simply download a binary distribution. It is cross-platform.
+Read RUNNING.txt for the instruction on how to run it.
+
+In order to build a binary distribution version of Apache Tomcat from a
+source distribution, do the following:
 
 
 (0) Download and Install a Java Development Kit
@@ -87,9 +92,6 @@ do the following:
 cd ${tomcat.source}
 ant
 
-* NOTE: Users accessing the Internet through a proxy must use a properties
-  file to indicate to Ant the proxy configuration. Read below.
-
 * WARNING: Running this command will download binaries to the /usr/share/java
   directory.  On a typical Linux or MacOX system an ordinary user
   will not have access to write to this directory, and, even if you do,
@@ -99,6 +101,9 @@ do the following:
   directory, unless Cygwin is used. Read the next section to learn how
   to customize the directory used to download the binaries.
 
+* NOTE: Users accessing the Internet through a proxy must use a properties
+  file to indicate to Ant the proxy configuration. Read below.
+
 * The build can be controlled by creating a ${tomcat.source}/build.properties
   file, and adding the following content to it:
 

Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1202035&r1=1202034&r2=1202035&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Tue Nov 
15 04:23:40 2011
@@ -541,7 +541,7 @@ public class WebappClassLoader
  * If this flag is true, this class loader delegates
  * to the parent class loader
  * before searching its own repositories, as
- * in an ordinary (non-servlet) chain of of Java class loaders.
+ * in an ordinary (non-servlet) chain of Java class loaders.
  * If set to false (the default),
  * this class loader will search its own repositories first, and
  * delegate to the parent only if the class or resource is not

Modified: tomcat/trunk/webapps/docs/building.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/building.xml?rev=1202035&r1=1202034&r2=1202035&view=diff
==
--- tomcat/trunk/webapps/docs/building.xml (original)
+++ tomcat/trunk/webapps/docs/building.xml Tue Nov 15 04:23:40 2011
@@ -112,11 +112,6 @@ Use the following commands to build Tomc
 
 
 
-NOTE: Users accessing the Internet through a proxy must use a properties
-  file to indicate to Ant the proxy configuration. Read below for details.
-
-
-
 WARNING: Running this command will download binary binaries to the
   /usr/share/java directory by default.
   On a typical Linux or MacOX system, an ordinary user
@@ -128,6 +123,11 @@ Use the following commands to build Tomc
 
 
 
+NOTE: Users accessing the Internet through a proxy must use a properties
+  file to indicate to Ant the proxy configuration. Read below for details.
+
+
+
   The build can be controlled by creating a 
${tomcat.source}/build.properties
   file and adding the following content to it:
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1202038 - in /tomcat/tc7.0.x/trunk: ./ BUILDING.txt java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/building.xml webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Tue Nov 15 04:30:21 2011
New Revision: 1202038

URL: http://svn.apache.org/viewvc?rev=1202038&view=rev
Log:
Merged revision 1202035 from tomcat/trunk:
Correct typo in Javadoc and changelog.
Add note to BUILDING.txt, that you do not need to build Tomcat if you just want 
to run it.
Move warning earlier than note, so that it is more visible.
Correct SVN sources URL for Tomcat 7 in building.xml

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/BUILDING.txt
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/tc7.0.x/trunk/webapps/docs/building.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 15 04:30:21 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187
 
753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174

svn commit: r1202039 - /tomcat/trunk/BUILDING.txt

[kkolinko]

Author: kkolinko
Date: Tue Nov 15 04:36:41 2011
New Revision: 1202039

URL: http://svn.apache.org/viewvc?rev=1202039&view=rev
Log:
Correct wording. It is in the same section, not the next one.

Modified:
tomcat/trunk/BUILDING.txt

Modified: tomcat/trunk/BUILDING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1202039&r1=1202038&r2=1202039&view=diff
==
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Tue Nov 15 04:36:41 2011
@@ -98,8 +98,8 @@ source distribution, do the following:
   it may not be appropriate for you to write there.
 
   On Windows this usually corresponds to the "C:\usr\share\java"
-  directory, unless Cygwin is used. Read the next section to learn how
-  to customize the directory used to download the binaries.
+  directory, unless Cygwin is used. Read below to learn how to customize
+  the directory used to download the binaries.
 
 * NOTE: Users accessing the Internet through a proxy must use a properties
   file to indicate to Ant the proxy configuration. Read below.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1202040 - in /tomcat/tc7.0.x/trunk: ./ BUILDING.txt

[kkolinko]

Author: kkolinko
Date: Tue Nov 15 04:38:24 2011
New Revision: 1202040

URL: http://svn.apache.org/viewvc?rev=1202040&view=rev
Log:
Merged revision 1202039 from tomcat/trunk:
Correct wording. It is in the same section, not the next one.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/BUILDING.txt

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 15 04:38:24 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187
 
753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1
 202035
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449

svn commit: r1202042 - in /tomcat/tc6.0.x/trunk: BUILDING.txt webapps/docs/building.xml

[kkolinko]

Author: kkolinko
Date: Tue Nov 15 04:47:28 2011
New Revision: 1202042

URL: http://svn.apache.org/viewvc?rev=1202042&view=rev
Log:
CTR: docs
Add note to BUILDING.txt, that you do not need to build Tomcat if you just want 
to run it.
Move warning earlier than note, so that it is more visible.

Modified:
tomcat/tc6.0.x/trunk/BUILDING.txt
tomcat/tc6.0.x/trunk/webapps/docs/building.xml

Modified: tomcat/tc6.0.x/trunk/BUILDING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/BUILDING.txt?rev=1202042&r1=1202041&r2=1202042&view=diff
==
--- tomcat/tc6.0.x/trunk/BUILDING.txt (original)
+++ tomcat/tc6.0.x/trunk/BUILDING.txt Tue Nov 15 04:47:28 2011
@@ -23,9 +23,14 @@ $Id$
 
 This subproject contains the source code for Tomcat 6.0, a container that
 implements the Servlet 2.5 and JSP 2.1 specifications from the Java
-Community Process .  In order to build a binary
-distribution version of the container from a source distribution, 
-do the following:
+Community Process .
+
+Note: If you just need to run Apache Tomcat, it is not necessary to build
+it. You may simply download a binary distribution. It is cross-platform.
+Read RUNNING.txt for the instruction on how to run it.
+
+In order to build a binary distribution version of Apache Tomcat from a
+source distribution, do the following:
 
 
 (0) Download and Install a Java Development Kit
@@ -68,7 +73,7 @@ do the following:
 
 (2.1) Checkout or obtain the source code for Tomcat 6.0
 
-* Tomcat SVN repository URL:
+* Tomcat 6.0 SVN repository URL:
   http://svn.apache.org/repos/asf/tomcat/tc6.0.x/
 
 * Download a source package from:
@@ -88,17 +93,17 @@ do the following:
 ant download
 ant
 
-* NOTE: Users accessing the Internet through a proxy must use a properties
-  file to indicate to Ant the proxy configuration. Read below.
-
 * WARNING: Running this command will download binaries to the /usr/share/java
   directory.  On a typical Linux or MacOX system an ordinary user
   will not have access to write to this directory, and, even if you do,
   it may not be appropriate for you to write there.
 
   On Windows this usually corresponds to the "C:\usr\share\java"
-  directory, unless Cygwin is used. Read the next section to learn how
-  to customize the directory used to download the binaries.
+  directory, unless Cygwin is used. Read below to learn how to customize
+  the directory used to download the binaries.
+
+* NOTE: Users accessing the Internet through a proxy must use a properties
+  file to indicate to Ant the proxy configuration. Read below.
 
 * The build can be controlled by creating a ${tomcat.source}/build.properties
   file, and adding the following content to it:

Modified: tomcat/tc6.0.x/trunk/webapps/docs/building.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/building.xml?rev=1202042&r1=1202041&r2=1202042&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/building.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/building.xml Tue Nov 15 04:47:28 2011
@@ -82,7 +82,7 @@ available, which will be used to actuall
 
 
   
-  Tomcat SVN repository URL:
+  Tomcat 6.0 SVN repository URL:
   http://svn.apache.org/repos/asf/tomcat/tc6.0.x/
   
   
@@ -113,11 +113,6 @@ Use the following commands:
 
 
 
-NOTE: Users accessing the Internet through a proxy must use a properties
-  file to indicate to Ant the proxy configuration. Read below.
-
-
-
 WARNING: Running this command will download binary binaries to the
   /usr/share/java directory by default.
   On a typical Linux or MacOX system, an ordinary user
@@ -129,6 +124,11 @@ Use the following commands:
 
 
 
+NOTE: Users accessing the Internet through a proxy must use a properties
+  file to indicate to Ant the proxy configuration. Read below.
+
+
+
 The build can be controlled by creating a ${tomcat.source}/build.properties
   file, and adding the following content to it:
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1202058 - in /tomcat/trunk/bin: catalina.bat catalina.sh configtest.sh digest.sh setclasspath.bat setclasspath.sh shutdown.sh startup.sh version.sh

[mturk]

Author: mturk
Date: Tue Nov 15 06:37:12 2011
New Revision: 1202058

URL: http://svn.apache.org/viewvc?rev=1202058&view=rev
Log:
Make sure .bat and .sh files have executable property set

Modified:
tomcat/trunk/bin/catalina.bat   (props changed)
tomcat/trunk/bin/catalina.sh   (props changed)
tomcat/trunk/bin/configtest.sh   (props changed)
tomcat/trunk/bin/digest.sh   (props changed)
tomcat/trunk/bin/setclasspath.bat   (props changed)
tomcat/trunk/bin/setclasspath.sh   (props changed)
tomcat/trunk/bin/shutdown.sh   (props changed)
tomcat/trunk/bin/startup.sh   (props changed)
tomcat/trunk/bin/version.sh   (props changed)

Propchange: tomcat/trunk/bin/catalina.bat
--
svn:executable = *

Propchange: tomcat/trunk/bin/catalina.sh
--
svn:executable = *

Propchange: tomcat/trunk/bin/configtest.sh
--
svn:executable = *

Propchange: tomcat/trunk/bin/digest.sh
--
svn:executable = *

Propchange: tomcat/trunk/bin/setclasspath.bat
--
svn:executable = *

Propchange: tomcat/trunk/bin/setclasspath.sh
--
svn:executable = *

Propchange: tomcat/trunk/bin/shutdown.sh
--
svn:executable = *

Propchange: tomcat/trunk/bin/startup.sh
--
svn:executable = *

Propchange: tomcat/trunk/bin/version.sh
--
svn:executable = *



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1202058 - in /tomcat/trunk/bin: catalina.bat catalina.sh configtest.sh digest.sh setclasspath.bat setclasspath.sh shutdown.sh startup.sh version.sh

[William A. Rowe Jr.]

On 11/15/2011 12:37 AM, mt...@apache.org wrote:

Author: mturk
Date: Tue Nov 15 06:37:12 2011
New Revision: 1202058

URL: http://svn.apache.org/viewvc?rev=1202058&view=rev
Log:
Make sure .bat and .sh files have executable property set


This could be a silly point, but .bat files do not carry a shebang
line.  Is this really sensible from any actual environment?

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1202061 - /tomcat/trunk/bin/daemon.sh

[mturk]

Author: mturk
Date: Tue Nov 15 06:48:29 2011
New Revision: 1202061

URL: http://svn.apache.org/viewvc?rev=1202061&view=rev
Log:
Add Commons Daemon wrapper script

Added:
tomcat/trunk/bin/daemon.sh   (with props)

Added: tomcat/trunk/bin/daemon.sh
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/daemon.sh?rev=1202061&view=auto
==
--- tomcat/trunk/bin/daemon.sh (added)
+++ tomcat/trunk/bin/daemon.sh Tue Nov 15 06:48:29 2011
@@ -0,0 +1,241 @@
+#!/bin/sh
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# -
+# Commons Daemon wrapper script.
+#
+# $Id: daemon.sh 1202058 2011-11-15 06:37:12Z mturk $
+# -
+#
+# resolve links - $0 may be a softlink
+ARG0="$0"
+while [ -h "$ARG0" ]; do
+  ls=`ls -ld "$ARG0"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+ARG0="$link"
+  else
+ARG0="`dirname $ARG0`/$link"
+  fi
+done
+DIRNAME="`dirname $ARG0`"
+PROGRAM="`basename $ARG0`"
+for o
+do
+  case "$o" in
+--java-home )
+JAVA_HOME="$2"
+shift; shift;
+continue
+;;
+--catalina-home )
+CATALINA_HOME="$2"
+shift; shift;
+continue
+;;
+--catalina-base )
+CATALINA_BASE="$2"
+shift; shift;
+continue
+;;
+--catalina-pid )
+CATALINA_PID="$2"
+shift; shift;
+continue
+;;
+--tomcat-user )
+TOMCAT_USER="$2"
+shift; shift;
+continue
+;;
+* )
+break
+;;
+  esac
+done
+# OS specific support (must be 'true' or 'false').
+cygwin=false;
+darwin=false;
+case "`uname`" in
+CYGWIN*)
+cygwin=true
+;;
+Darwin*)
+darwin=true
+;;
+esac
+
+# Use the maximum available, or set MAX_FD != -1 to use that
+test ".$MAX_FD" = . && MAX_FD="maximum"
+# Setup parameters for running the jsvc
+#
+test ".$TOMCAT_USER" = . && TOMCAT_USER=tomcat
+# Set JAVA_HOME to working JDK or JRE
+# JAVA_HOME=/opt/jdk-1.6.0.22
+# If not set we'll try to guess the JAVA_HOME
+# from java binary if on the PATH
+#
+if [ -z "$JAVA_HOME" ]; then
+JAVA_BIN="`which java 2>/dev/null || type java 2>&1`"
+test -x "$JAVA_BIN" && JAVA_HOME="`dirname $JAVA_BIN`"
+test ".$JAVA_HOME" != . && JAVA_HOME=`cd "$JAVA_HOME/.." >/dev/null; pwd`
+else
+JAVA_BIN="$JAVA_HOME/bin/java"
+fi
+
+# Only set CATALINA_HOME if not already set
+test ".$CATALINA_HOME" = . && CATALINA_HOME=`cd "$DIRNAME/.." >/dev/null; pwd`
+test ".$CATALINA_BASE" = . && CATALINA_BASE="$CATALINA_HOME"
+test ".$CATALINA_MAIN" = . && 
CATALINA_MAIN=org.apache.catalina.startup.Bootstrap
+test ".$JSVC" = . && JSVC="$CATALINA_BASE/bin/jsvc"
+
+# Ensure that any user defined CLASSPATH variables are not used on startup,
+# but allow them to be specified in setenv.sh, in rare case when it is needed.
+CLASSPATH=
+JAVA_OPTS=
+if [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then
+  . "$CATALINA_BASE/bin/setenv.sh"
+elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then
+  . "$CATALINA_HOME/bin/setenv.sh"
+fi
+
+# Add on extra jar files to CLASSPATH
+test ".$CLASSPATH" != . && CLASSPATH="${CLASSPATH}:"
+CLASSPATH="$CLASSPATH$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/commons-daemon.jar"
+
+test ".$CATALINA_OUT" = . && 
CATALINA_OUT="$CATALINA_BASE/logs/catalina-daemon.out"
+test ".$CATALINA_TMP" = . && CATALINA_TMP="$CATALINA_BASE/temp"
+
+# Add tomcat-juli.jar to classpath
+# tomcat-juli.jar can be over-ridden per instance
+if [ -r "$CATALINA_BASE/bin/tomcat-juli.jar" ] ; then
+  CLASSPATH="$CLASSPATH:$CATALINA_BASE/bin/tomcat-juli.jar"
+else
+  CLASSPATH="$CLASSPATH:$CATALINA_HOME/bin/tomcat-juli.jar"
+fi
+# Set juli LogManager config file if it is present and an override has not 
been issued
+if [ -z "$LOGGING_CONFIG" ]; then
+  if [ -r "$CATALINA_BASE/conf/logging.properties" ]; then
+
LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties"
+  else
+# Bugzilla 45585
+LOGGING_CONFIG="-Dnop"
+  fi
+fi
+
+test ".$LOGGING_MANAGER" = . && 
LOGGING_MANAGER="-Djava.u

svn commit: r1202062 - in /tomcat/tc7.0.x/trunk/bin: catalina.bat catalina.sh configtest.sh digest.sh setclasspath.bat setclasspath.sh shutdown.sh startup.sh version.sh

[mturk]

Author: mturk
Date: Tue Nov 15 06:50:02 2011
New Revision: 1202062

URL: http://svn.apache.org/viewvc?rev=1202062&view=rev
Log:
Make sure .bat and .sh files have executable property set

Modified:
tomcat/tc7.0.x/trunk/bin/catalina.bat   (props changed)
tomcat/tc7.0.x/trunk/bin/catalina.sh   (props changed)
tomcat/tc7.0.x/trunk/bin/configtest.sh   (props changed)
tomcat/tc7.0.x/trunk/bin/digest.sh   (props changed)
tomcat/tc7.0.x/trunk/bin/setclasspath.bat   (props changed)
tomcat/tc7.0.x/trunk/bin/setclasspath.sh   (props changed)
tomcat/tc7.0.x/trunk/bin/shutdown.sh   (props changed)
tomcat/tc7.0.x/trunk/bin/startup.sh   (props changed)
tomcat/tc7.0.x/trunk/bin/version.sh   (props changed)

Propchange: tomcat/tc7.0.x/trunk/bin/catalina.bat
--
svn:executable = *

Propchange: tomcat/tc7.0.x/trunk/bin/catalina.sh
--
svn:executable = *

Propchange: tomcat/tc7.0.x/trunk/bin/configtest.sh
--
svn:executable = *

Propchange: tomcat/tc7.0.x/trunk/bin/digest.sh
--
svn:executable = *

Propchange: tomcat/tc7.0.x/trunk/bin/setclasspath.bat
--
svn:executable = *

Propchange: tomcat/tc7.0.x/trunk/bin/setclasspath.sh
--
svn:executable = *

Propchange: tomcat/tc7.0.x/trunk/bin/shutdown.sh
--
svn:executable = *

Propchange: tomcat/tc7.0.x/trunk/bin/startup.sh
--
svn:executable = *

Propchange: tomcat/tc7.0.x/trunk/bin/version.sh
--
svn:executable = *



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1202063 - /tomcat/tc7.0.x/trunk/bin/daemon.sh

[mturk]

Author: mturk
Date: Tue Nov 15 06:50:43 2011
New Revision: 1202063

URL: http://svn.apache.org/viewvc?rev=1202063&view=rev
Log:
Add Commons Daemon wrapper script

Added:
tomcat/tc7.0.x/trunk/bin/daemon.sh   (with props)

Added: tomcat/tc7.0.x/trunk/bin/daemon.sh
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/daemon.sh?rev=1202063&view=auto
==
--- tomcat/tc7.0.x/trunk/bin/daemon.sh (added)
+++ tomcat/tc7.0.x/trunk/bin/daemon.sh Tue Nov 15 06:50:43 2011
@@ -0,0 +1,241 @@
+#!/bin/sh
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# -
+# Commons Daemon wrapper script.
+#
+# $Id: daemon.sh 1202058 2011-11-15 06:37:12Z mturk $
+# -
+#
+# resolve links - $0 may be a softlink
+ARG0="$0"
+while [ -h "$ARG0" ]; do
+  ls=`ls -ld "$ARG0"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+ARG0="$link"
+  else
+ARG0="`dirname $ARG0`/$link"
+  fi
+done
+DIRNAME="`dirname $ARG0`"
+PROGRAM="`basename $ARG0`"
+for o
+do
+  case "$o" in
+--java-home )
+JAVA_HOME="$2"
+shift; shift;
+continue
+;;
+--catalina-home )
+CATALINA_HOME="$2"
+shift; shift;
+continue
+;;
+--catalina-base )
+CATALINA_BASE="$2"
+shift; shift;
+continue
+;;
+--catalina-pid )
+CATALINA_PID="$2"
+shift; shift;
+continue
+;;
+--tomcat-user )
+TOMCAT_USER="$2"
+shift; shift;
+continue
+;;
+* )
+break
+;;
+  esac
+done
+# OS specific support (must be 'true' or 'false').
+cygwin=false;
+darwin=false;
+case "`uname`" in
+CYGWIN*)
+cygwin=true
+;;
+Darwin*)
+darwin=true
+;;
+esac
+
+# Use the maximum available, or set MAX_FD != -1 to use that
+test ".$MAX_FD" = . && MAX_FD="maximum"
+# Setup parameters for running the jsvc
+#
+test ".$TOMCAT_USER" = . && TOMCAT_USER=tomcat
+# Set JAVA_HOME to working JDK or JRE
+# JAVA_HOME=/opt/jdk-1.6.0.22
+# If not set we'll try to guess the JAVA_HOME
+# from java binary if on the PATH
+#
+if [ -z "$JAVA_HOME" ]; then
+JAVA_BIN="`which java 2>/dev/null || type java 2>&1`"
+test -x "$JAVA_BIN" && JAVA_HOME="`dirname $JAVA_BIN`"
+test ".$JAVA_HOME" != . && JAVA_HOME=`cd "$JAVA_HOME/.." >/dev/null; pwd`
+else
+JAVA_BIN="$JAVA_HOME/bin/java"
+fi
+
+# Only set CATALINA_HOME if not already set
+test ".$CATALINA_HOME" = . && CATALINA_HOME=`cd "$DIRNAME/.." >/dev/null; pwd`
+test ".$CATALINA_BASE" = . && CATALINA_BASE="$CATALINA_HOME"
+test ".$CATALINA_MAIN" = . && 
CATALINA_MAIN=org.apache.catalina.startup.Bootstrap
+test ".$JSVC" = . && JSVC="$CATALINA_BASE/bin/jsvc"
+
+# Ensure that any user defined CLASSPATH variables are not used on startup,
+# but allow them to be specified in setenv.sh, in rare case when it is needed.
+CLASSPATH=
+JAVA_OPTS=
+if [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then
+  . "$CATALINA_BASE/bin/setenv.sh"
+elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then
+  . "$CATALINA_HOME/bin/setenv.sh"
+fi
+
+# Add on extra jar files to CLASSPATH
+test ".$CLASSPATH" != . && CLASSPATH="${CLASSPATH}:"
+CLASSPATH="$CLASSPATH$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/commons-daemon.jar"
+
+test ".$CATALINA_OUT" = . && 
CATALINA_OUT="$CATALINA_BASE/logs/catalina-daemon.out"
+test ".$CATALINA_TMP" = . && CATALINA_TMP="$CATALINA_BASE/temp"
+
+# Add tomcat-juli.jar to classpath
+# tomcat-juli.jar can be over-ridden per instance
+if [ -r "$CATALINA_BASE/bin/tomcat-juli.jar" ] ; then
+  CLASSPATH="$CLASSPATH:$CATALINA_BASE/bin/tomcat-juli.jar"
+else
+  CLASSPATH="$CLASSPATH:$CATALINA_HOME/bin/tomcat-juli.jar"
+fi
+# Set juli LogManager config file if it is present and an override has not 
been issued
+if [ -z "$LOGGING_CONFIG" ]; then
+  if [ -r "$CATALINA_BASE/conf/logging.properties" ]; then
+
LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties"
+  else
+# Bugzilla 45585
+LOGGING_CONFIG="-Dnop"
+  fi
+fi
+
+test ".$LOGGING_MA

svn commit: r1202065 - /tomcat/tc7.0.x/trunk/build.xml

[mturk]

Author: mturk
Date: Tue Nov 15 06:53:35 2011
New Revision: 1202065

URL: http://svn.apache.org/viewvc?rev=1202065&view=rev
Log:
Make sure daemon.sh is included/excluded from the dist

Modified:
tomcat/tc7.0.x/trunk/build.xml

Modified: tomcat/tc7.0.x/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1202065&r1=1202064&r2=1202065&view=diff
==
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Tue Nov 15 06:53:35 2011
@@ -1897,6 +1897,7 @@ Apache Tomcat ${version} native binaries
   
 
 
+
 
 
 
@@ -1927,6 +1928,7 @@ Apache Tomcat ${version} native binaries
 
 
 
+
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1202066 - /tomcat/trunk/build.xml

[mturk]

Author: mturk
Date: Tue Nov 15 06:54:32 2011
New Revision: 1202066

URL: http://svn.apache.org/viewvc?rev=1202066&view=rev
Log:
Make sure daemon.sh is included/excluded from the dist

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1202066&r1=1202065&r2=1202066&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Nov 15 06:54:32 2011
@@ -1897,6 +1897,7 @@ Apache Tomcat ${version} native binaries
   
 
 
+
 
 
 
@@ -1927,6 +1928,7 @@ Apache Tomcat ${version} native binaries
 
 
 
+
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1202058 - in /tomcat/trunk/bin: catalina.bat catalina.sh configtest.sh digest.sh setclasspath.bat setclasspath.sh shutdown.sh startup.sh version.sh

[Mladen Truk]

On 11/15/2011 07:43 AM, William A. Rowe Jr. wrote:

On 11/15/2011 12:37 AM, mt...@apache.org wrote:

Author: mturk
Date: Tue Nov 15 06:37:12 2011
New Revision: 1202058

URL: http://svn.apache.org/viewvc?rev=1202058&view=rev
Log:
Make sure .bat and .sh files have executable property set


This could be a silly point, but .bat files do not carry a shebang
line. Is this really sensible from any actual environment?



Yes if you use cygwin.
It does some weird ACL settings depending if 775 is set or not
when using cygwin's unzip.


Regards
--
^TM

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot failure in ASF Buildbot on tomcat-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-trunk while building 
ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-trunk/builds/2519

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1202066
Blamelist: mturk

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot