Bug report for Tomcat 5 [2008/01/20]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=CriticalMAJ=Major |
| |   |   MIN=Minor   NOR=Normal  ENH=Enhancement   |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|27122|Opn|Enh|2004-02-20|IE plugins cannot access components through Tomcat|
|28039|Opn|Enh|2004-03-30|Cluster Support for SingleSignOn  |
|29160|Ver|Enh|2004-05-23|precompile problem: _jspx_meth_* (javax.servlet.js|
|29494|Inf|Enh|2004-06-10|No way to set PATH when running as a service on Wi|
|29936|Opn|Blk|2004-07-06|XML parser loading problems by container  |
|30241|Ver|Enh|2004-07-21|Enhance build script to use branch argument when c|
|31257|Opn|Cri|2004-09-16|java.endorsed.dirs is not used when JSP compilatio|
|33262|Inf|Enh|2005-01-27|Service Manager autostart should check for adminis|
|33453|Opn|Enh|2005-02-08|Jasper should recompile JSP files whose datestamps|
|33650|Inf|Enh|2005-02-19|Jasper performance for multiple files processing  |
|33671|Opn|Enh|2005-02-21|Manual Windows service installation with custom na|
|34526|Opn|Nor|2005-04-19|Truncated content in decompressed requests from mo|
|34801|New|Enh|2005-05-08|PATCH: CGIServlet does not terminate child after a|
|34805|Ass|Enh|2005-05-08|warn about invalid security constraint url pattern|
|34868|Ass|Enh|2005-05-11|allow to register a trust store for a session that|
|35054|Inf|Enh|2005-05-25|warn if appBase is not existing as a File or direc|
|35869|Inf|Enh|2005-07-26|Can't run as a service on Windows Server 2003 64-B|
|35959|Opn|Enh|2005-08-01|mod_jk not independant of UseCanonicalName|
|36133|Inf|Enh|2005-08-10|Support JSS SSL implementation|
|36169|New|Enh|2005-08-12|[PATCH] Enable chunked encoding for requests in II|
|36362|New|Enh|2005-08-25|missing check for Java reserved keywords in tag fi|
|36569|Inf|Enh|2005-09-09|Redirects produce illegal URL's   |
|36837|Inf|Enh|2005-09-28|Looking for ProxyHandler implementation of Http re|
|36922|Inf|Enh|2005-10-04|setup.sh file mis-advertised and missing  |
|36923|New|Nor|2005-10-05|Deactivated EL expressions are not parsed for jsp |
|37018|Ass|Enh|2005-10-11|Document how to use tomcat-SSL with a pkcs11 token|
|37084|Opn|   |2005-10-14|JspC from ant fails on JSPs that use custom taglib|
|37334|Inf|Enh|2005-11-02|Realm digest property not aligned with the adminis|
|37449|Opn|Enh|2005-11-10|Two UserDatabaseRealm break manager user  |
|37485|Inf|Enh|2005-11-14|I'd like to run init SQL after JDBC Connection cre|
|37498|Inf|Nor|2005-11-14|[PATCH] NPE in org.apache.catalina.core.ContainerB|
|37515|Inf|Nor|2005-11-15|smap not generated by JspC when used from Ant for |
|37627|Opn|Nor|2005-11-24|Slow and incomplete dynamic content generation aft|
|37785|Inf|Nor|2005-12-05|Changing startup type via Tomcat Monitor does not |
|37794|Opn|Nor|2005-12-05|getParameter() fails on POST with transfer-encodin|
|37797|Inf|Maj|2005-12-05|Configure Tomcat utility truncates classpath to 96|
|37822|Opn|Nor|2005-12-07|WebappClassLoader interfering with Catalina core c|
|37847|Ass|Enh|2005-12-09|Allow User To Optionally Specify Catalina Output F|
|37869|Opn|Nor|2005-12-12|Cannot obtain client certificate with SSL / client|
|37918|Inf|Nor|2005-12-15|EL cannot find valid getter from object when using|
|37984|New|Nor|2005-12-21|JNDIRealm.java not able to handle MD5 password|
|38046|Ass|   |2005-12-27|apache-tomcat-5.5.14-deployer doesn't work (Illega|
|38131|New|Enh|2006-01-05|WatchedResource does not work if app is outside "w|
|38197|Opn|Maj|2006-01-09|taglib pool bug when tag is used with jsp:attribut|
|38216|Inf|Enh|2006-01-10|Extend Jmxproxy to allow call of MBean Operations |
|38268|Inf|Enh|2006-01-13|User friendly: Need submit button on adding/deleti|
|38352|Inf|Nor|2006-01-22|Additional Entries for Default catalina.policy fil|
|38360|Inf|Enh|2006-01-24|Domain for session cookies|
|38367|Inf|Nor|2006-01-24|Executing any Catalina Ant task results in an exce|
|38372|Inf|Cri|2006-01-25|tcnative-1.dll response overflow corruption, parti|
|38427|Inf|Nor|2006-01-27|ServletContextListener Notified Multiple Times Whe|
|38483|

Bug report for Tomcat 4 [2008/01/20]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=CriticalMAJ=Major |
| |   |   MIN=Minor   NOR=Normal  ENH=Enhancement   |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
| 3839|Opn|Enh|2001-09-26|Problem bookmarking login page|
| 4227|Opn|Enh|2001-10-17|Invalid CGI path  |
| 5329|New|Enh|2001-12-08|NT Service exits startup before Tomcat is finished|
| 5795|New|Enh|2002-01-10|Catalina Shutdown relies on localhost causing prob|
| 5829|New|Enh|2002-01-13|StandardManager needs to cope with sessions throwi|
| 5985|New|Enh|2002-01-23|Tomcat should perform a more restrictive validatio|
| 6600|Opn|Enh|2002-02-20|enodeURL adds 'jsession' when 'isRequestedSessionI|
| 6614|New|Enh|2002-02-21|Have Bootstrap and StandardClassLoader use the sam|
| 6671|New|Enh|2002-02-25|Simple custom tag example uses old declaration sty|
| 7043|New|Enh|2002-03-12|database user and password for JDBC Based Store   |
| 7374|New|Enh|2002-03-22|Apache Tomcat/4.0.1 message on standard output|
| 7676|New|Enh|2002-04-02|Allow name property to use match experssions in  without className in server.xml produces N|
|11069|Opn|Enh|2002-07-23|Tomcat not flag error if tld is outside of /WEB-IN|
|11129|New|Enh|2002-07-24|New valve for putting the sessionIDs in the reques|
|11248|New|Enh|2002-07-29|DefaultServlet doesn't send expires header|
|11754|Opn|Enh|2002-08-15|Synchronous shutdown script - shutdown.sh should w|
|12069|New|Enh|2002-08-27|Creation of more HttpSession objects for one previ|
|12428|Opn|Enh|2002-09-09|request.getUserPrincipal(): Misinterpretation of s|
|12658|New|Enh|2002-09-15|a proxy host and port at the  element level |
|12766|New|Enh|2002-09-18|Tomcat should use tld files in /WEB-INF/ over vers|
|13309|Opn|Enh|2002-10-04|Catalina calls System.exit()  |
|13634|New|Enh|2002-10-15|Allowing system properties to be substituted in co|
|13689|Opn|Enh|2002-10-16|Classloader paths for 'Common' classes and librari|
|13731|New|Enh|2002-10-17|Final request, response, session and other variabl|
|13941|New|Enh|2002-10-24|reload is VERY slow   |
|13965|New|Enh|2002-10-25|Catalina.sh correction request for Tru64 Unix |
|14097|New|Enh|2002-10-30|hardcoded registry value for vm lets tomcat servic|
|14416|New|Enh|2002-11-10|blank tag name in TLD cause NullPointerException  |
|14635|New|Enh|2002-11-18|Should be possible not to have -MM-DD in log f|
|14766|New|Enh|2002-11-22|Redirect Vavle|
|14993|New|Enh|2002-12-02|Possible obselete synchronized declaration|
|15115|New|Enh|2002-12-05|correct docs... XML parser *cannot* be overridden |
|15417|Opn|Enh|2002-12-16|Add port for forced compilation of JSP pages  |
|15688|New|Enh|2002-12-27|full-qualified names instead of imports   |
|15941|New|Enh|2003-01-10|Expose rootCause exceptions at deeper levels  |
|16294|New|Enh|2003-01-21|Configurable URL Decoding.|
|16357|New|Enh|2003-01-23|"connection timeout reached"  |
|16531|New|Enh|2003-01-29|Updating already deployed ".war" files in a single|
|16579|New|Enh|2003-01-30|documentation page layout/style breaks wrapping to|
|16596|New|Enh|2003-01-30|option for disabling log rotation |
|17070|New|Enh|2003-02-14|The Catalina Ant tasks do not allow for 'reusable'|
|17146|New|Enh|2003-02-18|Simplify build.xml using 

DO NOT REPLY [Bug 44274] New: - Apache causes segfault and it doesn't start.

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=44274

   Summary: Apache causes segfault and it doesn't start.
   Product: Tomcat 5
   Version: Nightly Build
  Platform: Other
OS/Version: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Native:JK
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Hi.

I tested mod_jk 1.2.27-dev (checkout from trunk head) on RHEL 4u5, i got 
segfault. 

My setting includes two virtual host settings. 
This problem occurs when "JkMountCopy off" is included in the virtual host
setting(When "JkMountCopy all" is not included in the global setting, and
"JkMountCopy on" is not included in the virtual host setting, it is similar).

Backtrace is as follows. 
-start-
(gdb) bt full
#0  0x002a99f776b8 in uri_worker_map_ext (uw_map=0x0, l=0x552ad0d630)
at jk_uri_worker_map.c:469
i = 0
__FUNCTION__ = "uri_worker_map_ext"
#1  0x002a99f67086 in jk_post_config (pconf=0x552ac01138, plog=Variable
"plog" is not available.
)
at mod_jk.c:2979
sconf = (jk_server_conf_t *) 0x0
rv = Variable "rv" is not available.
-end-

and patch. Is this patch correct?
===
--- mod_jk/native/apache-2.0/mod_jk.c   (revision 613744)
+++ mod_jk/native/apache-2.0/mod_jk.c   (working copy)
@@ -2975,7 +2975,7 @@
 for (srv = s; srv; srv = srv->next) {
 jk_server_conf_t *sconf = (jk_server_conf_t
*)ap_get_module_config(srv->module_config,

&jk_module);
-if (conf->uw_map != sconf->uw_map)
+if (conf->uw_map != sconf->uw_map && sconf->uw_map)
 uri_worker_map_ext(sconf->uw_map, sconf->log);
 }

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Bug report for Watchdog [2008/01/20]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=CriticalMAJ=Major |
| |   |   MIN=Minor   NOR=Normal  ENH=Enhancement   |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|  278|Unc|Nor|2000-12-04|Bug in GetParameterValuesTestServlet.java file Bug|
|  279|Unc|Nor|2000-12-04|Logical Error in GetParameterValuesTestServlet Bug|
|  469|Unc|Nor|2001-01-17|in example-taglib.tld "urn" should be "uri" BugRat|
|  470|Unc|Nor|2001-01-17|FAIL positiveForward.jsp and positiveInclude.jsp B|
| 9634|New|Enh|2002-06-05|No tests exist for ServletContext.getResourcePaths|
|10703|New|Enh|2002-07-11|Need to test getRequestURI after RequestDispatcher|
|11336|New|Enh|2002-07-31|Test wrapped path methods with RD.foward()|
|11663|New|Maj|2002-08-13|JSP precompile tests rely on Jasper specific behav|
|11664|New|Maj|2002-08-13|A sweep is needed of all Watchdog 4.0 tag librarie|
|11665|New|Maj|2002-08-13|ServletToJSPErrorPageTest and ServletToServletErro|
|11666|New|Maj|2002-08-13|SetBufferSize_1TestServlet is invalid.|
|14004|New|Maj|2002-10-28|Incorrent behaviour of all attribute-related lifec|
|15504|New|Nor|2002-12-18|JSP positiveGetValues test relies on order preserv|
|24649|New|Nor|2003-11-12|getRemoteHost fails when agent has uppercase chara|
|29398|New|Nor|2004-06-04|Update site and note current status   |
+-+---+---+--+--+
| Total   15 bugs   |
+---+

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Bug report for Tomcat 3 [2008/01/20]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=CriticalMAJ=Major |
| |   |   MIN=Minor   NOR=Normal  ENH=Enhancement   |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
| 2350|Ver|Nor|2001-06-27|ServletConfig.getInitParameter() requires url-patt|
| 5331|Ass|Nor|2001-12-09|getPathInfo vs URL normalization  |
| 6027|Inf|Maj|2002-01-25|Tomcat  Automatically shuts down as service   |
| 6488|Ver|Maj|2002-02-15|Error: 304. Apparent bug in default ErrorHandler c|
| 7785|Inf|Blk|2002-04-06|tomcat bug in context reloading   |
| 7863|Inf|Maj|2002-04-09|I have a problem when running Tomcat with IIS |
| 8187|Inf|Cri|2002-04-17|Errors when Tomcat used with MS Access database   |
| 9737|Ver|Nor|2002-06-10|ArrayIndexOutOfBoundsException when sending just p|
|10047|Ass|Cri|2002-06-20|IllegalStateException |
|10406|Ass|Cri|2002-07-02|IllegalStateException |
|11087|Inf|Blk|2002-07-23|IllegalStateException |
|12156|Inf|Cri|2002-08-29|Apache and Tomcat 3.3.1 Interworking problem  |
|16363|Ass|Cri|2003-01-23|Stack Overflow accessing compiled JSP - Tomcat 3.2|
|39250|Inf|Cri|2006-04-07|Tomcat 3.2.1 + JDK 1.4|
+-+---+---+--+--+
| Total   14 bugs   |
+---+

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 38131] - WatchedResource does not work if app is outside "webapps"

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=38131





--- Additional Comments From [EMAIL PROTECTED]  2008-01-20 18:21 ---
Thanks for applying it.

I am not sure pero wants credit for the patch. I was the one who submitted the
patch but the changes to the changelog seem to indicate that pero provided it.

Changelog reads "Patch provided by Gernot Pfingstl (pero)"

If the patch is applied, should the status stay 'NEW'


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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

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

[markt]

Author: markt
Date: Sun Jan 20 14:19:59 2008
New Revision: 613692

URL: http://svn.apache.org/viewvc?rev=613692&view=rev
Log:
Propose a doc update.

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=613692&r1=613691&r2=613692&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jan 20 14:19:59 2008
@@ -75,3 +75,8 @@
   +1: pero, markt, rjung
   -1:
   
+* Update JNDI docs to use server.xml less and  more
+  http://svn.apache.org/viewvc?rev=613689&view=rev
+  Not essential for 6.0.16.
+  +1: markt
+  -1: 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r613689 - /tomcat/trunk/webapps/docs/jndi-resources-howto.xml

[markt]

Author: markt
Date: Sun Jan 20 14:16:24 2008
New Revision: 613689

URL: http://svn.apache.org/viewvc?rev=613689&view=rev
Log:
Update JNDI docs to refer to context elements rather than server.xml for 
configuration of resources.

Modified:
tomcat/trunk/webapps/docs/jndi-resources-howto.xml

Modified: tomcat/trunk/webapps/docs/jndi-resources-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-resources-howto.xml?rev=613689&r1=613688&r2=613689&view=diff
==
--- tomcat/trunk/webapps/docs/jndi-resources-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jndi-resources-howto.xml Sun Jan 20 14:16:24 2008
@@ -41,14 +41,16 @@
 
 The J2EE standard provides a standard set of elements in 
 the /WEB-INF/web.xml file to reference resources; resources 
-referenced in these elements must be defined in an application-server-specific 
configuration. 
+referenced in these elements must be defined in an application-server-specific
+configuration. 
 
 
 For Tomcat 6, these entries in per-web-application 
 InitialContext are configured in the 
- elements that can be specified 
-in either $CATALINA_HOME/conf/server.xml or, preferably, 
-the per-web-application context XML file (either 
META-INF/context.xml).
+ elements that
+can be specified in either $CATALINA_HOME/conf/server.xml or,
+preferably, the per-web-application context XML file (
+META-INF/context.xml).
 
 
 Tomcat 6 maintains a separate namespace of global resources for the 
@@ -103,9 +105,8 @@
 for JNDI, and for the features supported by Java2 Enterprise Edition (J2EE)
 servers, which Tomcat emulates for the services that it provides:
 
-http://java.sun.com/products/jndi/#download";>Java Naming and
-Directory Interface (included in JDK 1.4, available separately for
-prior JDK versions)
+http://java.sun.com/products/jndi";>Java Naming and Directory
+Interface (included in JDK 1.4 onwards)
 http://java.sun.com/j2ee/download.html";>J2EE Platform
 Specification (in particular, see Chapter 5 on Naming)
 
@@ -116,8 +117,8 @@
 
 
 Each available JNDI Resource is configured based on inclusion of the
-following elements in the  or 
- elements:
+following elements in the
+ element:
 
 
  -
@@ -144,16 +145,17 @@
 
 
 Any number of these elements may be nested inside a
- element (to be associated
-only with that particular web application).
+ element (to be
+associated only with that particular web application).
 
 In addition, the names and values of all 
 elements included in the web application deployment descriptor
 (/WEB-INF/web.xml) are configured into the initial context as
-well, overriding corresponding values from conf/server.xml
+well, overriding corresponding values from the
+ element
 only if allowed by the corresponding
- element (by setting the
-override attribute to "true").
+ element (by setting the override
+attribute to "true").
 
 Global resources can be defined in the server-wide JNDI context, by adding
 the resource elements described above to the
@@ -170,10 +172,11 @@
 
   Tomcat 6 includes a series of standard resource factories that can
   provide services to your web applications, but give you configuration
-  flexibility (in $CATALINA_HOME/conf/server.xml) without
-  modifying the web application or the deployment descriptor.  Each
-  subsection below details the configuration and usage of the standard
-  resource factories.
+  flexibility (via the
+   element)
+  without modifying the web application or the deployment descriptor. Each
+  subsection below details the configuration and usage of the standard resource
+  factories.
 
   See Adding Custom
   Resource Factories for information about how to create, install,
@@ -280,9 +283,10 @@
 
 4.  Configure Tomcat's Resource Factory
 
-To configure Tomcat's resource factory, add an elements like this to the
-$CATALINA_HOME/conf/server.xml file, nested inside the
-Context element for this web application.
+To configure Tomcat's resource factory, add an element like this to the
+ element for
+this web application.
+
 
 
   ...
@@ -318,7 +322,7 @@
 
 Tomcat 6 includes a standard resource factory that will create
 javax.mail.Session session instances for you, already
-connected to the SMTP server that is configured in server.xml.
+configured to connect to an SMTP server.
 In this way, the application is totally insulated from changes in the
 email server configuration environment - it simply asks for, and receives,
 a preconfigured session whenever needed.
@@ -380,14 +384,16 @@
 
 Note that the application uses the same resource reference name
 that was declared in the web application deployment descriptor.  This
-is matched up against the resource factory that is co

Re: Tomcat 6 Build Failing

[nayabinghi]

Mark, 

Thank you very much.


markt-2 wrote:
> 
> nayabinghi wrote:
>> The problem was jdk 1.6. I downgraded to 1.5 and it went well.
> That is a known issue with DBCP:
> http://issues.apache.org/bugzilla/show_bug.cgi?id=43147
> 
>> However I am
>> having some challenges building Tomcat 6 with the admin tool.
> There is no admin tool in tomcat 6.
> 
> Mark
> 
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
> 
> 
> 

-- 
View this message in context: 
http://www.nabble.com/Tomcat-6-Build-Failing-tp14975286p14987315.html
Sent from the Tomcat - Dev mailing list archive at Nabble.com.


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Tomcat 6 Build Failing

[Mark Thomas]

nayabinghi wrote:

The problem was jdk 1.6. I downgraded to 1.5 and it went well.

That is a known issue with DBCP:
http://issues.apache.org/bugzilla/show_bug.cgi?id=43147


However I am
having some challenges building Tomcat 6 with the admin tool.

There is no admin tool in tomcat 6.

Mark

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Tomcat 6 Build Failing

[nayabinghi]

Thanks,

The problem was jdk 1.6. I downgraded to 1.5 and it went well. However I am
having some challenges building Tomcat 6 with the admin tool. It is my
understanding that building it from source the admin tool should be
included. Below are the steps I have taken. 

cd apache-tomcat-6.0.14-src  
ant download 
ant

The commands above worked fine. I also tried and -f dist.xml. But no signs
of the admin tool. I have a feeling I will have to modify one of the xml
files (build.xml, build.properties.default, dist.xml or extras.xml) but am
not sure which one or what the changes will be. What I will like to do build
Tomcat 6 with the admin tool then package them in .tar.gz files. Any help
with this will be greatly appreciated.

Thank you. 

Markus Schönhaber-2 wrote:
> 
> nayabinghi wrote:
> 
>> I am trying to build Tomcat 6 from source but am getting some build
>> errors I
>> am hoping I can get some help with. 
>> 
>>  [javac] Note: Recompile with -Xlint:deprecation for details.
>> [javac] Note: Some input files use unchecked or unsafe operations.
>> [javac] Note: Recompile with -Xlint:unchecked for details.
>> [javac] 15 errors
>>
>> BUILD FAILED
> [...]
> 
> Look at the output preceding the above snippet. That's where the actual
> error messages probably are.
> 
> Regards
>   mks
> 
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
> 
> 
> 

-- 
View this message in context: 
http://www.nabble.com/Tomcat-6-Build-Failing-tp14975286p14986855.html
Sent from the Tomcat - Dev mailing list archive at Nabble.com.


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

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

[rjung]

Author: rjung
Date: Sun Jan 20 10:08:47 2008
New Revision: 613639

URL: http://svn.apache.org/viewvc?rev=613639&view=rev
Log:
Vote.

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=613639&r1=613638&r2=613639&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jan 20 10:08:47 2008
@@ -34,14 +34,19 @@
 * Add ManagerBase session getLastAccessedTimestamp and getCreationTimestamp 
for better
   remote JMX access.
   http://svn.apache.org/viewvc?rev=612971&view=rev
-  +1: pero
+  +1: pero, rjung
   -1:
 
 * Fix ManagerServlet.expireSessions throws Exceptions as iterate longer 
session lists 
   at production servers.
   http://svn.apache.org/viewvc?rev=612988&view=rev
-  +1: pero
+  +1: pero, rjung
   -1: remm (the patch looks like a hack, and we don't know what exactly you 
are fixing)
+  rjung: as pero wrote: the patch contains
+  - r612944 fixed in HTMLManager but not in Manager
+  - a fix aiaginst an exception when listing session idle time
+histogram and at least one session timed out since last
+run of invalidation background task
 
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44223
   Add support for remaining truststore system property
@@ -52,19 +57,21 @@
   
 * Fix wrong &&
   
http://people.apache.org/~pero/patches/tc55/2007-11-16-1-ReplicationValve-tc55.patch
-  +1: pero, markt
+  +1: pero, markt, rjung
   -1:
 
 * Fix FarmWarDeployer can be only config at Host Element (small changes s. 
tomcat 55 STATUS.txt)
   
http://people.apache.org/~pero/patches/tc55/2007-11-16-1-FarmWarDeployer-tc55.patch
-  +1: pero, markt
+  +1: pero, markt, rjung
   -1:
-  martk - change "FarmWarDeployer can only work as parent from " to
+  markt - change "FarmWarDeployer can only work as parent from " to
  "FarmWarDeployer can only work if parent of "
+  rjung - "is an engine!" -> " is an engine!" (space added)
+  "work at Host" -> "work as Host"
 
 * Fix WatchedResource does not work if app is outside "webapps"
   http://issues.apache.org/bugzilla/show_bug.cgi?id=38131
   http://svn.apache.org/viewvc?rev=613558&view=rev
-  +1: pero, markt
+  +1: pero, markt, rjung
   -1:
   



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r613636 - /tomcat/current/tc5.5.x/STATUS.txt

[rjung]

Author: rjung
Date: Sun Jan 20 09:52:07 2008
New Revision: 613636

URL: http://svn.apache.org/viewvc?rev=613636&view=rev
Log:
Vote.

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=613636&r1=613635&r2=613636&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan 20 09:52:07 2008
@@ -27,19 +27,21 @@
 
 * Fix  FarmWarDeployer can be only config at Host Element (Also needed at 
tomcat 6)
   
http://people.apache.org/~pero/patches/tc55/2007-11-16-1-FarmWarDeployer-tc55.patch
-  +1: pero, markt
+  +1: pero, markt, rjung
   -1:
0: fhanik, this needs to be reworked completely, so I'm neutral
-  martk - change "FarmWarDeployer can only work as parent from " to
+  markt - change "FarmWarDeployer can only work as parent from " to
  "FarmWarDeployer can only work if parent of "
+  rjung - "is an engine!" -> " is an engine!" (space added)
+  "work at Host" -> "work as Host"
 
 * Fix WatchedResource does not work if app is outside "webapps"
   http://issues.apache.org/bugzilla/show_bug.cgi?id=38131
   http://svn.apache.org/viewvc?rev=613558&view=rev
-  +1: pero, markt
+  +1: pero, markt, rjung
   -1:
 
 * Fix build broken by library update patch
   http://people.apache.org/~markt/patches/2008-01-20-tc5-fix-build.patch
-  +1: markt
+  +1: markt, rjung
   -1: 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: priority of session cookie and url rewriting

[Mark Thomas]

[EMAIL PROTECTED] wrote:

Is there another solution to this problem?


The fix for bug 43839 should have fixed this.

Mark

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

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

[markt]

Author: markt
Date: Sun Jan 20 09:28:11 2008
New Revision: 613631

URL: http://svn.apache.org/viewvc?rev=613631&view=rev
Log:
Vote. Note suggested change of wording.

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=613631&r1=613630&r2=613631&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jan 20 09:28:11 2008
@@ -52,17 +52,19 @@
   
 * Fix wrong &&
   
http://people.apache.org/~pero/patches/tc55/2007-11-16-1-ReplicationValve-tc55.patch
-  +1: pero
+  +1: pero, markt
   -1:
 
 * Fix FarmWarDeployer can be only config at Host Element (small changes s. 
tomcat 55 STATUS.txt)
   
http://people.apache.org/~pero/patches/tc55/2007-11-16-1-FarmWarDeployer-tc55.patch
-  +1: pero
+  +1: pero, markt
   -1:
+  martk - change "FarmWarDeployer can only work as parent from " to
+ "FarmWarDeployer can only work if parent of "
 
 * Fix WatchedResource does not work if app is outside "webapps"
   http://issues.apache.org/bugzilla/show_bug.cgi?id=38131
   http://svn.apache.org/viewvc?rev=613558&view=rev
-  +1: pero
+  +1: pero, markt
   -1:
   



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r613627 - /tomcat/current/tc5.5.x/STATUS.txt

[markt]

Author: markt
Date: Sun Jan 20 09:24:46 2008
New Revision: 613627

URL: http://svn.apache.org/viewvc?rev=613627&view=rev
Log:
vote

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=613627&r1=613626&r2=613627&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan 20 09:24:46 2008
@@ -36,7 +36,7 @@
 * Fix WatchedResource does not work if app is outside "webapps"
   http://issues.apache.org/bugzilla/show_bug.cgi?id=38131
   http://svn.apache.org/viewvc?rev=613558&view=rev
-  +1: pero
+  +1: pero, markt
   -1:
 
 * Fix build broken by library update patch



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 43552] - Memory leak on application reload apparently caused by commons-pool 1.3

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43552


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2008-01-20 09:09 ---
This has been committed to svn for 5.5.x and will be in 5.5.26 onwards.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r613619 - in /tomcat: build/tc5.5.x/build.properties.default container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt

[markt]

Author: markt
Date: Sun Jan 20 09:08:51 2008
New Revision: 613619

URL: http://svn.apache.org/viewvc?rev=613619&view=rev
Log:
Update to commons-pool 1.4

Modified:
tomcat/build/tc5.5.x/build.properties.default
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/build/tc5.5.x/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.properties.default?rev=613619&r1=613618&r2=613619&view=diff
==
--- tomcat/build/tc5.5.x/build.properties.default (original)
+++ tomcat/build/tc5.5.x/build.properties.default Sun Jan 20 09:08:51 2008
@@ -157,8 +157,8 @@
 
 
 # - Commons Pool, version 1.1 or later -
-commons-pool.home=${base.path}/commons-pool-1.3-src
-commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.3-src.tar.gz
+commons-pool.home=${base.path}/commons-pool-1.4-src
+commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.4-src.tar.gz
 
 
 # - Commons Collections, version 2.0 or later -

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=613619&r1=613618&r2=613619&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan 20 09:08:51 2008
@@ -82,6 +82,9 @@
   
 Use PureTLS 0.9b5. (markt)
   
+  
+Use commons-pool 1.4. (markt)
+  
   
 43594: Use setenv from CATALINA_BASE (if set) in preference
 to the one in CATALINA_HOME. Patch provided by Shaddy Baddah. (markt)

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=613619&r1=613618&r2=613619&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan 20 09:08:51 2008
@@ -33,12 +33,6 @@
   martk - change "FarmWarDeployer can only work as parent from " to
  "FarmWarDeployer can only work if parent of "
 
-* Update commons-pool to 1.4
-  http://svn.apache.org/viewvc?rev=612950&view=rev
-  (Note ppatch duplciates some of lib-updates patch)
-  +1: markt, fhanik, pero
-  -1:
-
 * Fix WatchedResource does not work if app is outside "webapps"
   http://issues.apache.org/bugzilla/show_bug.cgi?id=38131
   http://svn.apache.org/viewvc?rev=613558&view=rev



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r613607 - /tomcat/current/tc5.5.x/STATUS.txt

[markt]

Author: markt
Date: Sun Jan 20 08:58:57 2008
New Revision: 613607

URL: http://svn.apache.org/viewvc?rev=613607&view=rev
Log:
Propose fix to build

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=613607&r1=613606&r2=613607&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan 20 08:58:57 2008
@@ -45,3 +45,7 @@
   +1: pero
   -1:
 
+* Fix build broken by library update patch
+  http://people.apache.org/~markt/patches/2008-01-20-tc5-fix-build.patch
+  +1: markt
+  -1: 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: svn commit: r613273 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.properties.default webapps/docs/changelog.xml

[Mark Thomas]

Peter Rossbach wrote:

Hi Mark,

I have a problem with a fresh tomcat 55 trunk build. The admin build.xml 
missing the new digester 1.8.


Yep - I broke it. I was a bit too enthusiastic with my clean-up. Your fix 
looks good. I'll revert that part of the fix.


Also I can't find the new 1.1 jta.jar. At sun site we can only download 
a class bundle!

You just have to rename the class bundle to jta.jar


Which class need the JTA interface?

o.a.c.core.NamingContextListener
o.a.naming.TransactionRef

Mark

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r613568 - /tomcat/connectors/trunk/jk/native/common/jk_util.c

[rjung]

Author: rjung
Date: Sun Jan 20 06:53:35 2008
New Revision: 613568

URL: http://svn.apache.org/viewvc?rev=613568&view=rev
Log:
Add fail_on_status to generic service init method.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_util.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?rev=613568&r1=613567&r2=613568&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Sun Jan 20 06:53:35 2008
@@ -1883,6 +1883,8 @@
 s->flush_header = JK_FALSE;
 s->extension.reply_timeout = -1;
 s->extension.activation = NULL;
+s->extension.fail_on_status_size = 0;
+s->extension.fail_on_status = NULL;
 s->response_started = JK_FALSE;
 s->http_response_status = JK_HTTP_OK;
 s->uw_map = NULL;



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r613561 - /tomcat/current/tc5.5.x/STATUS.txt

[pero]

Author: pero
Date: Sun Jan 20 06:09:52 2008
New Revision: 613561

URL: http://svn.apache.org/viewvc?rev=613561&view=rev
Log:
Fix WatchedResource does not work if app is outside webapp - backport from tc6 
trunk

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=613561&r1=613560&r2=613561&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan 20 06:09:52 2008
@@ -38,3 +38,10 @@
   (Note ppatch duplciates some of lib-updates patch)
   +1: markt, fhanik, pero
   -1:
+
+* Fix WatchedResource does not work if app is outside "webapps"
+  http://issues.apache.org/bugzilla/show_bug.cgi?id=38131
+  http://svn.apache.org/viewvc?rev=613558&view=rev
+  +1: pero
+  -1:
+



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 38131] - WatchedResource does not work if app is outside "webapps"

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=38131





--- Additional Comments From [EMAIL PROTECTED]  2008-01-20 06:06 ---
Thanks for patch,

Look at http://svn.apache.org/viewvc?rev=613558&view=rev.

I hope we can at the fix to next tomcat 6/55 release

Peter

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

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

[pero]

Author: pero
Date: Sun Jan 20 06:04:13 2008
New Revision: 613560

URL: http://svn.apache.org/viewvc?rev=613560&view=rev
Log:
Set correct rev. at last fix. Sorry!

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=613560&r1=613559&r2=613560&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jan 20 06:04:13 2008
@@ -62,7 +62,7 @@
 
 * Fix WatchedResource does not work if app is outside "webapps"
   http://issues.apache.org/bugzilla/show_bug.cgi?id=38131
-  http://svn.apache.org/viewvc?rev=613266&view=rev
+  http://svn.apache.org/viewvc?rev=613558&view=rev
   +1: pero
   -1:
   



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

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

[pero]

Author: pero
Date: Sun Jan 20 06:02:47 2008
New Revision: 613559

URL: http://svn.apache.org/viewvc?rev=613559&view=rev
Log:
Fix WatchedResource does not work if app is outside "webapps"

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=613559&r1=613558&r2=613559&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jan 20 06:02:47 2008
@@ -59,3 +59,10 @@
   
http://people.apache.org/~pero/patches/tc55/2007-11-16-1-FarmWarDeployer-tc55.patch
   +1: pero
   -1:
+
+* Fix WatchedResource does not work if app is outside "webapps"
+  http://issues.apache.org/bugzilla/show_bug.cgi?id=38131
+  http://svn.apache.org/viewvc?rev=613266&view=rev
+  +1: pero
+  -1:
+  



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r613558 - in /tomcat/trunk: java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml

[pero]

Author: pero
Date: Sun Jan 20 06:01:52 2008
New Revision: 613558

URL: http://svn.apache.org/viewvc?rev=613558&view=rev
Log:
FIX: WatchedResource does not work if app is outside "webapps"

Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=613558&r1=613557&r2=613558&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Sun Jan 20 
06:01:52 2008
@@ -636,11 +636,15 @@
 name = path;
 }
 }
-File expandedDocBase = new File(name);
-File warDocBase = new File(name + ".war");
-if (!expandedDocBase.isAbsolute()) {
-expandedDocBase = new File(appBase(), name);
-warDocBase = new File(appBase(), name + ".war");
+// default to appBase dir + name
+File expandedDocBase = new File(appBase(), name);
+if (context.getDocBase() != null) {
+// first assume docBase is absolute
+expandedDocBase = new File(context.getDocBase());
+if (!expandedDocBase.isAbsolute()) {
+// if docBase specified and relative, it must be relative 
to appBase
+expandedDocBase = new File(appBase(), 
context.getDocBase());
+}
 }
 // Add the eventual unpacked WAR and all the resources which will 
be
 // watched inside it
@@ -652,6 +656,7 @@
 addWatchedResources(deployedApp, 
expandedDocBase.getAbsolutePath(), context);
 } else {
 // Find an existing matching war and expanded folder
+File warDocBase = new File(expandedDocBase.getAbsolutePath() + 
".war");
 if (warDocBase.exists()) {
 
deployedApp.redeployResources.put(warDocBase.getAbsolutePath(),
 new Long(warDocBase.lastModified()));
@@ -966,9 +971,13 @@
 if (docBase != null) {
 resource = new File(docBaseFile, watchedResources[i]);
 } else {
+if(log.isDebugEnabled())
+log.debug("Ignoring non-existent WatchedResource '" + 
resource.getAbsolutePath() + "'");
 continue;
 }
 }
+if(log.isDebugEnabled())
+log.debug("Watching WatchedResource '" + 
resource.getAbsolutePath() + "'");
 app.reloadResources.put(resource.getAbsolutePath(), 
 new Long(resource.lastModified()));
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=613558&r1=613557&r2=613558&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Jan 20 06:01:52 2008
@@ -46,6 +46,9 @@
   
   
 
+  38131: WatchedResource does not work if app is outside 
host appbase webapps. 
+Patch provided by Gernot Pfingstl (pero)
+  
   44261: Fix "Restricted listeners property file not 
found" message fix.  Patch provided by
 David Jencks. (pero)
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r613556 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c common/jk_uri_worker_map.c

[rjung]

Author: rjung
Date: Sun Jan 20 05:50:21 2008
New Revision: 613556

URL: http://svn.apache.org/viewvc?rev=613556&view=rev
Log:
Fix errors in new fail_on_status uri worker map
extension.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=613556&r1=613555&r2=613556&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sun Jan 20 05:50:21 
2008
@@ -651,6 +651,7 @@
 memcpy(s->extension.activation, e->activation, e->activation_size 
* sizeof(int));
 }
 if (e->fail_on_status_size > 0) {
+s->extension.fail_on_status_size = e->fail_on_status_size;
 s->extension.fail_on_status = ap_palloc(r->pool, 
e->fail_on_status_size * sizeof(int));
 memcpy(s->extension.fail_on_status, e->fail_on_status, 
e->fail_on_status_size * sizeof(int));
 }

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=613556&r1=613555&r2=613556&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Jan 20 05:50:21 
2008
@@ -663,6 +663,7 @@
 memcpy(s->extension.activation, e->activation, e->activation_size 
* sizeof(int));
 }
 if (e->fail_on_status_size > 0) {
+s->extension.fail_on_status_size = e->fail_on_status_size;
 s->extension.fail_on_status = apr_palloc(r->pool, 
e->fail_on_status_size * sizeof(int));
 memcpy(s->extension.fail_on_status, e->fail_on_status, 
e->fail_on_status_size * sizeof(int));
 }

Modified: tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c?rev=613556&r1=613555&r2=613556&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c Sun Jan 20 
05:50:21 2008
@@ -349,13 +349,16 @@
 return JK_TRUE;
 }
 
-static void extract_activation(lb_worker_t *lb,
+static void extract_activation(jk_uri_worker_map_t *uw_map,
+   uri_worker_record_t *uwr,
+   lb_worker_t *lb,
int *activations,
char *workers,
int activation,
jk_logger_t *l)
 {
 unsigned int i;
+jk_pool_t *p;
 char *worker;
 #ifdef _MT_CODE_PTHREAD
 char *lasts;
@@ -363,11 +366,17 @@
 
 JK_TRACE_ENTER(l);
 
+if (uwr->source_type == SOURCE_TYPE_URIMAP)
+p = &IND_NEXT(uw_map->p_dyn);
+else
+p = &uw_map->p;
+worker = jk_pool_strdup(p, workers);
+
 #ifdef _MT_CODE_PTHREAD
-for (worker = strtok_r(workers, ", ", &lasts);
+for (worker = strtok_r(worker, ", ", &lasts);
  worker; worker = strtok_r(NULL, ", ", &lasts)) {
 #else
-for (worker = strtok(workers, ", "); worker; worker = strtok(NULL, ", ")) {
+for (worker = strtok(worker, ", "); worker; worker = strtok(NULL, ", ")) {
 #endif
 for (i=0; inum_of_workers; i++) {
 if (!strcmp(worker, lb->lb_workers[i].name)) {
@@ -418,11 +427,13 @@
 p = &IND_NEXT(uw_map->p_dyn);
 else
 p = &uw_map->p;
+status = jk_pool_strdup(p, uwr->extensions.fail_on_status_str);
 uwr->extensions.fail_on_status = (int *)jk_pool_alloc(p,
 
uwr->extensions.fail_on_status_size * sizeof(int));
 if (!uwr->extensions.fail_on_status) {
 jk_log(l, JK_LOG_ERROR,
"can't alloc extensions fail_on_status list");
+JK_TRACE_EXIT(l);
 return;
 } else if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG,
@@ -436,10 +447,10 @@
 
 cnt = 0;
 #ifdef _MT_CODE_PTHREAD
-for (status = strtok_r(uwr->extensions.fail_on_status_str, ", ", &lasts);
+for (status = strtok_r(status, ", ", &lasts);
  status; status = strtok_r(NULL, "&", &lasts)) {
 #else
-for (status = strtok(uwr->extensions.fail_on_status_str, ", "); status; 
status = strtok(NULL, ", ")) {
+for (status = strtok(status, ", "); status; status = strtok(NULL, ", ")) {
 #endif
 uwr->extensions.fail_on_status[cnt] = atoi(status);
 cnt++;
@@ -489,13 +500,13 @@
  

svn commit: r613555 - /tomcat/container/tc5.5.x/webapps/docs/changelog.xml

[pero]

Author: pero
Date: Sun Jan 20 05:38:04 2008
New Revision: 613555

URL: http://svn.apache.org/viewvc?rev=613555&view=rev
Log:
Fix entity reference!

Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=613555&r1=613554&r2=613555&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan 20 05:38:04 2008
@@ -194,7 +194,7 @@
   
 
   
-   Fix wrong && at ReplicationValve (pero)
+   Fix wrong && at ReplicationValve (pero)
   
   
 DeltaManager sessionCounter must be also increment at relicated 
sessions. (pero)



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[EMAIL PROTECTED]: Project jakarta-tomcat-catalina (in module jakarta-tomcat-catalina) failed

[bobh]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at [EMAIL PROTECTED]

Project jakarta-tomcat-catalina has an issue affecting its community 
integration.
This issue affects 2 projects,
 and has been outstanding for 7 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- jakarta-tomcat-catalina :  Servlet 2.4 Reference Implementation
- jakarta-tomcat-jk :  Connectors to various web servers


Full details are available at:

http://vmgump.apache.org/gump/public/jakarta-tomcat-catalina/jakarta-tomcat-catalina/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on ant exists, no need to add for property ant.home.
 -DEBUG- Dependency on jmx exists, no need to add for property jmx.home.
 -DEBUG- Dependency on jaf exists, no need to add for property activation.home.
 -DEBUG- Dependency on jakarta-tomcat-coyote exists, no need to add for 
property tomcat-coyote.home.
 -INFO- Failed with reason build failed
 -DEBUG- Extracted fallback artifacts from Gump Repository



The following work was performed:
http://vmgump.apache.org/gump/public/jakarta-tomcat-catalina/jakarta-tomcat-catalina/gump_work/build_jakarta-tomcat-catalina_jakarta-tomcat-catalina.html
Work Name: build_jakarta-tomcat-catalina_jakarta-tomcat-catalina (Type: Build)
Work ended in a state of : Failed
Elapsed: 1 min 10 secs
Command Line: /usr/lib/jvm/java-1.5.0-sun/bin/java -Djava.awt.headless=true 
-Xbootclasspath/p:/srv/gump/public/workspace/xml-xerces2/build/xercesImpl.jar:/srv/gump/public/workspace/xml-commons/java/external/build/xml-apis.jar:/srv/gump/public/workspace/xml-xalan/build/serializer.jar:/srv/gump/public/workspace/xml-xalan/build/xalan-unbundled.jar
 org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbuild.sysclasspath=only -Dtomcat33.home=--UnSet-- 
-Dcatalina.build=/srv/gump/public/workspace/jakarta-tomcat-catalina/build 
-Djmx.home=/srv/gump/packages/jmx-1_2_1-bin 
-Djdbc20ext.jar=/srv/gump/packages/jdbc2_0/jdbc2_0-stdext.jar 
-Djtc.home=/srv/gump/public/workspace/jakarta-tomcat-connectors 
-Djasper.home=/srv/gump/public/workspace/jakarta-tomcat-jasper_tc5 
-Dant.home=/srv/gump/public/workspace/ant/dist -Dcompile.source=1.4 
-Dcommons-collections.jar=/srv/gump/public/workspace/apache-commons/collections/build/commons-collections-20012008.jar
 -Dcatalina.deploy
 =/srv/gump/public/workspace/jakarta-tomcat-catalina/build 
-Djaas.jar=/srv/gump/packages/jaas1_0/lib/jaas.jar 
-Dcommons-fileupload.jar=/srv/gump/public/workspace/apache-commons/fileupload/target/commons-fileupload-20012008.jar
 
-Dcommons-digester.jar=/srv/gump/public/workspace/apache-commons/digester/dist/commons-digester.jar
 
-Dtomcat-http11.jar=/srv/gump/public/workspace/jakarta-tomcat-connectors/http11/build/lib/tomcat-http11.jar
 -Dactivation.home=/srv/gump/packages/jaf-1.1ea 
-Dcatalina.home=/srv/gump/public/workspace/jakarta-tomcat-catalina/build 
-Dcommons-launcher.jar=/srv/gump/public/workspace/apache-commons/launcher/dist/bin/commons-launcher-20012008.jar
 -Dtomcat.build=/srv/gump/public/workspace/jakarta-tomcat-catalina/build 
-Dcommons-beanutils.jar=/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20012008.jar
 
-Dcommons-modeler.jar=/srv/gump/public/workspace/apache-commons/modeler/dist/commons-modeler-20012008.jar
 -Dtomcat-coyote.home=/srv/gump/p
 ublic/workspace/jakarta-tomcat-connectors/coyote 
-Djmx-remote.jar=/srv/gump/packages/jmxremote-1_0_1-bin/lib/jmxremote.jar 
-Dcommons-logging-api.jar=/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20012008.jar
 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/jakarta-tomcat-5/tomcat-deps/naming-factory-dbcp.jar
 -Djta.jar=/srv/gump/packages/jta-spec1_0_1/jta-spec1_0_1.jar deploy-catalina 
[Working Directory: /srv/gump/public/workspace/jakarta-tomcat-catalina]
CLASSPATH: 
/usr/lib/jvm/java-1.5.0-sun/lib/tools.jar:/srv/gump/public/workspace/jakarta-tomcat-catalina/build/server/classes:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-trax.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-nodeps.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/xml-commons/java/external/build/xml-apis-ext.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jmx-1_2_1-bin/lib/jmxri.jar:/srv/gump/pack

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

[pero]

Author: pero
Date: Sun Jan 20 05:11:59 2008
New Revision: 613550

URL: http://svn.apache.org/viewvc?rev=613550&view=rev
Log:
Add backport from tomcat 55 FarmDeployer fix!

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=613550&r1=613549&r2=613550&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jan 20 05:11:59 2008
@@ -54,3 +54,8 @@
   
http://people.apache.org/~pero/patches/tc55/2007-11-16-1-ReplicationValve-tc55.patch
   +1: pero
   -1:
+
+* Fix FarmWarDeployer can be only config at Host Element (small changes s. 
tomcat 55 STATUS.txt)
+  
http://people.apache.org/~pero/patches/tc55/2007-11-16-1-FarmWarDeployer-tc55.patch
+  +1: pero
+  -1:



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r613548 - /tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c

[rjung]

Author: rjung
Date: Sun Jan 20 05:05:45 2008
New Revision: 613548

URL: http://svn.apache.org/viewvc?rev=613548&view=rev
Log:
Fix copy and paste errors for fail_on_status.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c?rev=613548&r1=613547&r2=613548&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c Sun Jan 20 
05:05:45 2008
@@ -427,11 +427,11 @@
 } else if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG,
"Allocated fail_on_status array of size %d for worker %s",
-   uwr->extensions.fail_on_status, uwr->worker_name);
+   uwr->extensions.fail_on_status_size, uwr->worker_name);
 
 
-for (j=0; jextensions.activation_size; j++) {
-uwr->extensions.activation[j] = JK_LB_ACTIVATION_UNSET;
+for (j=0; jextensions.fail_on_status_size; j++) {
+uwr->extensions.fail_on_status[j] = 0;
 }
 
 cnt = 0;



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

priority of session cookie and url rewriting

[Daniele.Ulrich]

We have two web applications: one (A) is using session cookies the other
(B) is using url rewriting. The first access to the B is always done via
A (request by HttpClient). 
For an upload form the architects (unfortunately?) switched from this
approach to a direct call to B. In this case we have a session cookie
from A AND a rewritten URL (form action).
In org.apache.catalina.connector.CoyoteAdapter  I found the following
code:

   protected void parseSessionCookiesId(org.apache.coyote.Request req,
Request request) {

// Parse session id from cookies
Cookies serverCookies = req.getCookies();
int count = serverCookies.getCookieCount();
if (count <= 0)
return;

for (int i = 0; i < count; i++) {
ServerCookie scookie = serverCookies.getCookie(i);
if (scookie.getName().equals(Globals.SESSION_COOKIE_NAME)) {
// Override anything requested in the URL
if (!request.isRequestedSessionIdFromCookie()) {
// Accept only the first session id cookie
convertMB(scookie.getValue());
request.setRequestedSessionId
(scookie.getValue().toString());
request.setRequestedSessionCookie(true);
request.setRequestedSessionURL(false);
if (log.isDebugEnabled())
log.debug(" Requested cookie session id is " +
request.getRequestedSessionId());
} else {
if (!request.isRequestedSessionIdValid()) {
// Replace the session id until one is valid
convertMB(scookie.getValue());
request.setRequestedSessionId
(scookie.getValue().toString());
}
}
}
}

This codes leads to a higher priority of session cookies regardless of
the settings in jboss-web.xml or context.xml.

I had to patch this class in order to enable the correct behaviour:

// Patch: if JSESSIONID AND URL rewriting, decide
according to the context.xml settings
if (request.getContext().getCookies() &&
!request.isRequestedSessionIdFromCookie()) {

This allows to disable completely session cookies putting a context.xml
in the /WEB-INF of the war file (we use jboss):



Is there another solution to this problem?

Cheers

Daniele

svn commit: r613546 - in /tomcat/connectors/trunk/jk: native/apache-1.3/ native/apache-2.0/ native/common/ xdocs/miscellaneous/

[rjung]

Author: rjung
Date: Sun Jan 20 04:49:03 2008
New Revision: 613546

URL: http://svn.apache.org/viewvc?rev=613546&view=rev
Log:
Add fail_on_status to uri worker map extension
attributes. No more attributes planned for now,
reply_timeout, activation and fail_on_status seem
to be the ones, where context individual configuration
could be useful.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
tomcat/connectors/trunk/jk/native/common/jk_service.h
tomcat/connectors/trunk/jk/native/common/jk_status.c
tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.h
tomcat/connectors/trunk/jk/native/common/jk_util.c
tomcat/connectors/trunk/jk/native/common/jk_util.h
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=613546&r1=613545&r2=613546&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sun Jan 20 04:49:03 
2008
@@ -650,6 +650,10 @@
 s->extension.activation = ap_palloc(r->pool, e->activation_size * 
sizeof(int));
 memcpy(s->extension.activation, e->activation, e->activation_size 
* sizeof(int));
 }
+if (e->fail_on_status_size > 0) {
+s->extension.fail_on_status = ap_palloc(r->pool, 
e->fail_on_status_size * sizeof(int));
+memcpy(s->extension.fail_on_status, e->fail_on_status, 
e->fail_on_status_size * sizeof(int));
+}
 }
 reply_timeout = ap_table_get(r->subprocess_env, "JK_REPLY_TIMEOUT");
 if (reply_timeout) {

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=613546&r1=613545&r2=613546&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Jan 20 04:49:03 
2008
@@ -662,6 +662,10 @@
 s->extension.activation = apr_palloc(r->pool, e->activation_size * 
sizeof(int));
 memcpy(s->extension.activation, e->activation, e->activation_size 
* sizeof(int));
 }
+if (e->fail_on_status_size > 0) {
+s->extension.fail_on_status = apr_palloc(r->pool, 
e->fail_on_status_size * sizeof(int));
+memcpy(s->extension.fail_on_status, e->fail_on_status, 
e->fail_on_status_size * sizeof(int));
+}
 }
 reply_timeout = apr_table_get(r->subprocess_env, "JK_REPLY_TIMEOUT");
 if (reply_timeout) {

Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?rev=613546&r1=613545&r2=613546&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Sun Jan 20 
04:49:03 2008
@@ -1602,20 +1602,6 @@
 }
 
 
-static int is_http_status_fail(ajp_worker_t *w, int status)
-{
-unsigned int i;
-int soft_status = -1 * status;
-for (i = 0; i < w->http_status_fail_num; i++) {
-if (w->http_status_fail[i] == status)
-return 1;
-else if (w->http_status_fail[i] == soft_status)
-return -1;
-}
-return 0;
-}
-
-
 /*
  * What to do with incoming data (dispatcher)
  */
@@ -1641,7 +1627,12 @@
 return JK_AJP13_ERROR;
 }
 r->http_response_status = res.status;
-rc = is_http_status_fail(ae->worker, res.status);
+if (r->extension.fail_on_status_size > 0)
+rc = is_http_status_fail(r->extension.fail_on_status_size,
+ r->extension.fail_on_status, 
res.status);
+else
+rc = is_http_status_fail(ae->worker->http_status_fail_num,
+ ae->worker->http_status_fail, 
res.status);
 if (rc > 0) {
 JK_TRACE_EXIT(l);
 return JK_STATUS_FATAL_ERROR;

Modified: tomcat/connectors/trunk/jk/native/common/jk_service.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_service.h?rev=613546&r1=613545&r2=613546&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_service.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_service.h Sun Jan 20 04:49:03 
2008
@@

svn commit: r613544 - in /tomcat/connectors/trunk/jk/native/common: jk_lb_worker.c jk_lb_worker.h jk_uri_worker_map.c

[rjung]

Author: rjung
Date: Sun Jan 20 04:35:06 2008
New Revision: 613544

URL: http://svn.apache.org/viewvc?rev=613544&view=rev
Log:
Add some warnings in extension parsing of uri worker
map (unknown extension, unknown lb member).
Start parsing at the first extension, not at the worker name.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h
tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c?rev=613544&r1=613543&r2=613544&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Sun Jan 20 04:35:06 
2008
@@ -219,6 +219,14 @@
 }
 
 /* Return the string representation of the balance worker activation */
+/* based on the integer representation */
+const char *jk_lb_get_activation_direct(int activation, jk_logger_t *l)
+{
+return lb_activation_type[activation];
+}
+
+/* Return the string representation of the balance worker activation */
+/* based on the sub worker struct */
 const char *jk_lb_get_activation(lb_sub_worker_t *p, jk_logger_t *l)
 {
 return lb_activation_type[p->activation];

Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h?rev=613544&r1=613543&r2=613544&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h Sun Jan 20 04:35:06 
2008
@@ -205,6 +205,7 @@
 int jk_lb_get_method_code(const char *v);
 const char *jk_lb_get_state(lb_sub_worker_t *p, jk_logger_t *l);
 int jk_lb_get_state_code(const char *v);
+const char *jk_lb_get_activation_direct(int activation, jk_logger_t *l);
 const char *jk_lb_get_activation(lb_sub_worker_t *p, jk_logger_t *l);
 int jk_lb_get_activation_code(const char *v);
 void reset_lb_values(lb_worker_t *p, jk_logger_t *l);

Modified: tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c?rev=613544&r1=613543&r2=613544&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c Sun Jan 20 
04:35:06 2008
@@ -369,9 +369,22 @@
 for (worker = strtok(workers, ", "); worker; worker = strtok(NULL, ", ")) {
 #endif
 for (i=0; inum_of_workers; i++) {
-if (!strcmp(worker, lb->lb_workers[i].name))
+if (!strcmp(worker, lb->lb_workers[i].name)) {
+if (activations[i] != JK_LB_ACTIVATION_UNSET)
+jk_log(l, JK_LOG_WARNING,
+   "inconsistent activation overwrite for member %s "
+   "of load balancer %s: '%s' replaced by '%s'",
+   worker, lb->name,
+   jk_lb_get_activation_direct(activations[i], l),
+   jk_lb_get_activation_direct(activation, l));
 activations[i] = activation;
+break;
+}
 }
+if (i >= lb->num_of_workers)
+jk_log(l, JK_LOG_WARNING,
+   "could not find member %s of load balancer %s",
+   worker, lb->name);
 }
 
 JK_TRACE_EXIT(l);
@@ -525,9 +538,9 @@
 #endif
 if (param) {
 #ifdef _MT_CODE_PTHREAD
-for (; param; param = strtok_r(NULL, ";", &lasts)) {
+for (param = strtok_r(NULL, ";", &lasts); param; param = 
strtok_r(NULL, ";", &lasts)) {
 #else
-for (; param; param = strtok(NULL, ";")) {
+for (param = strtok(NULL, ";"); param; param = strtok(NULL, ";")) {
 #endif
 if (!strncmp(param, JK_UWMAP_EXTENSION_REPLY_TIMEOUT, 
strlen(JK_UWMAP_EXTENSION_REPLY_TIMEOUT))) {
 uwr->extensions.reply_timeout = atoi(param + 
strlen(JK_UWMAP_EXTENSION_REPLY_TIMEOUT));
@@ -555,6 +568,11 @@
JK_UWMAP_EXTENSION_STOPPED);
 else
 uwr->extensions.stopped = param + 
strlen(JK_UWMAP_EXTENSION_STOPPED);
+}
+else {
+jk_log(l, JK_LOG_WARNING,
+   "unknown extension '%s' in uri worker map",
+   param);
 }
 }
 }



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r613543 - /tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c

[rjung]

Author: rjung
Date: Sun Jan 20 04:30:37 2008
New Revision: 613543

URL: http://svn.apache.org/viewvc?rev=613543&view=rev
Log:
Allow space " " additional to comma "," as a separator
in uri worker map activation extension (member list).
Also fix one copy and paste error "&" -> "," in strtok.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c?rev=613543&r1=613542&r2=613543&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c Sun Jan 20 
04:30:37 2008
@@ -363,10 +363,10 @@
 JK_TRACE_ENTER(l);
 
 #ifdef _MT_CODE_PTHREAD
-for (worker = strtok_r(workers, ",", &lasts);
- worker; worker = strtok_r(NULL, "&", &lasts)) {
+for (worker = strtok_r(workers, ", ", &lasts);
+ worker; worker = strtok_r(NULL, ", ", &lasts)) {
 #else
-for (worker = strtok(workers, ","); worker; worker = strtok(NULL, ",")) {
+for (worker = strtok(workers, ", "); worker; worker = strtok(NULL, ", ")) {
 #endif
 for (i=0; inum_of_workers; i++) {
 if (!strcmp(worker, lb->lb_workers[i].name))



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r613542 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c common/jk_status.c common/jk_uri_worker_map.c common/jk_uri_worker_map.h

[rjung]

Author: rjung
Date: Sun Jan 20 04:26:35 2008
New Revision: 613542

URL: http://svn.apache.org/viewvc?rev=613542&view=rev
Log:
Rename some of the new extension struct members to
make them more consistent with previous notation
resp. more future proof:
size -> activation_size
disable -> disabled
stop -> stopped

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/native/common/jk_status.c
tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.h

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=613542&r1=613541&r2=613542&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sun Jan 20 04:26:35 
2008
@@ -647,8 +647,8 @@
 if (e) {
 s->extension.reply_timeout = e->reply_timeout;
 if (e->activation) {
-s->extension.activation = ap_palloc(r->pool, e->size * 
sizeof(int));
-memcpy(s->extension.activation, e->activation, e->size * 
sizeof(int));
+s->extension.activation = ap_palloc(r->pool, e->activation_size * 
sizeof(int));
+memcpy(s->extension.activation, e->activation, e->activation_size 
* sizeof(int));
 }
 }
 reply_timeout = ap_table_get(r->subprocess_env, "JK_REPLY_TIMEOUT");

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=613542&r1=613541&r2=613542&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Jan 20 04:26:35 
2008
@@ -659,8 +659,8 @@
 if (e) {
 s->extension.reply_timeout = e->reply_timeout;
 if (e->activation) {
-s->extension.activation = apr_palloc(r->pool, e->size * 
sizeof(int));
-memcpy(s->extension.activation, e->activation, e->size * 
sizeof(int));
+s->extension.activation = apr_palloc(r->pool, e->activation_size * 
sizeof(int));
+memcpy(s->extension.activation, e->activation, e->activation_size 
* sizeof(int));
 }
 }
 reply_timeout = apr_table_get(r->subprocess_env, "JK_REPLY_TIMEOUT");

Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?rev=613542&r1=613541&r2=613542&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Jan 20 04:26:35 
2008
@@ -1424,8 +1424,8 @@
   uri_worker_map_get_source(uwr, l),
   uwr->extensions.reply_timeout,
   uwr->extensions.active ? uwr->extensions.active : 
"-",
-  uwr->extensions.disable ? uwr->extensions.disable : 
"-",
-  uwr->extensions.stop ? uwr->extensions.stop : "-");
+  uwr->extensions.disabled ? uwr->extensions.disabled 
: "-",
+  uwr->extensions.stopped ? uwr->extensions.stopped : 
"-");
 else
 jk_printf(s, JK_STATUS_URI_MAP_TABLE_ROW,
   uwr->uri,
@@ -1433,8 +1433,8 @@
   uri_worker_map_get_source(uwr, l),
   uwr->extensions.reply_timeout,
   uwr->extensions.active ? uwr->extensions.active : 
"-",
-  uwr->extensions.disable ? uwr->extensions.disable : 
"-",
-  uwr->extensions.stop ? uwr->extensions.stop : "-");
+  uwr->extensions.disabled ? uwr->extensions.disabled 
: "-",
+  uwr->extensions.stopped ? uwr->extensions.stopped : 
"-");
 }
 else if (mime == JK_STATUS_MIME_XML) {
 jk_print_xml_start_elt(s, w, 6, 0, "map");
@@ -1446,8 +1446,8 @@
 jk_print_xml_att_string(s, 8, "source", 
uri_worker_map_get_source(uwr, l));
 jk_print_xml_att_int(s, 8, "reply_timeout", 
uwr->extensions.reply_timeout);
 jk_print_xml_att_string(s, 8, "active", uwr->extensions.active);
-jk_print_xml_att_string(s, 8, "disabled", uwr->extensions.disable);
-jk_print_xml_att_string(s, 8, "stopped", uwr->extensions.stop);
+jk_print_xml_att_string(s, 8, "disabled", 
uwr->extensions.disabled);
+jk_print_xml_att_string(s, 8, "stopped", uwr->extensions.stopped);

svn commit: r613530 - /tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h

[rjung]

Author: rjung
Date: Sun Jan 20 02:20:49 2008
New Revision: 613530

URL: http://svn.apache.org/viewvc?rev=613530&view=rev
Log:
Use '9' instead of '-1' as the unset value
of worker activation state. This simplifies the
encoder/decoder for the extension activation array
used to pass the info in the isapi redirector between
filter and extension.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h

Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h?rev=613530&r1=613529&r2=613530&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h Sun Jan 20 02:20:49 
2008
@@ -82,14 +82,17 @@
 #define JK_LB_STATE_TEXT_PROBE ("ERR/PRB")
 #define JK_LB_STATE_TEXT_MAX   (JK_LB_STATE_PROBE)
 #define JK_LB_STATE_TEXT_DEF   (JK_LB_STATE_TEXT_IDLE)
+/* All JK_LB_ACTIVATION_* values must be single digit. */
+/* Otherwise the string encoding of the activation array */
+/* fails e.g. in the isapi redirector. */
 /* JK_LB_ACTIVATION_UNSET is not allowed as an actual worker state. */
 /* It will not work e.g. when the status worker tries to show the state. */
 /* It is only used in rule extension data to indicate, that the */
 /* activation state should not be overwritten. */
-#define JK_LB_ACTIVATION_UNSET (-1)
 #define JK_LB_ACTIVATION_ACTIVE(0)
 #define JK_LB_ACTIVATION_DISABLED  (1)
 #define JK_LB_ACTIVATION_STOPPED   (2)
+#define JK_LB_ACTIVATION_UNSET (9)
 #define JK_LB_ACTIVATION_DEF   (JK_LB_ACTIVATION_ACTIVE)
 #define JK_LB_ACTIVATION_MAX   (JK_LB_ACTIVATION_STOPPED)
 #define JK_LB_ACTIVATION_TEXT_ACTIVE   ("ACT")



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r613529 - /tomcat/connectors/trunk/jk/native/common/jk_status.c

[rjung]

Author: rjung
Date: Sun Jan 20 02:17:59 2008
New Revision: 613529

URL: http://svn.apache.org/viewvc?rev=613529&view=rev
Log:
'%X' seems to be a better time pattern for strftime()
than '%T' (which doesn't exist on Windows).

Modified:
tomcat/connectors/trunk/jk/native/common/jk_status.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?rev=613529&r1=613528&r2=613529&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Jan 20 02:17:59 
2008
@@ -182,7 +182,7 @@
 #define JK_STATUS_WAIT_AFTER_UPDATE"3"
 #define JK_STATUS_REFRESH_DEF  "10"
 #define JK_STATUS_ESC_CHARS("<>?\"")
-#define JK_STATUS_TIME_FMT_HTML"%a, %d %b %Y %T %Z"
+#define JK_STATUS_TIME_FMT_HTML"%a, %d %b %Y %X %Z"
 #define JK_STATUS_TIME_FMT_TEXT"%Y%m%d%H%M%S"
 #define JK_STATUS_TIME_FMT_TZ  "%Z"
 #define JK_STATUS_TIME_BUF_SZ  (80)



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

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

[Peter Rossbach]

Hi Remy,

The manager patch fix two problems:

-   User can call ManagerServlet.expire at stopped Context.
Result is a NPE
-	As you have long session list a IllgallStateException can be thrown  
as we iterate over the session id list.
	Manager background thread or user can expire your session before  
ManagerServlet code access it.


Regards
Peter


Am 18.01.2008 um 17:52 schrieb Remy Maucherat:


On Fri, 2008-01-18 at 17:35 +0100, Peter Rossbach wrote:

HI Remy,

the problem is the current getLastAccessedTime  and getCreationTime
methods has standard formated Date result. Good
for humans, but bad for jmx scripts writers. You can't simply parse
those standard format strings at a remote jmx client. The
java.util.Date class has only a deprecated methods to parse it. Ok, I
can use SimpleDateFormatter but as you must control a lot of session
this is a time consuming task.


Don't read the patch, get the updated status file.

Rémy



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: svn commit: r613273 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.properties.default webapps/docs/changelog.xml

[Peter Rossbach]

Hi Mark,

I have a problem with a fresh tomcat 55 trunk build. The admin  
build.xml missing the new digester 1.8.



FIX:

Index: build/build.xml
===
--- build/build.xml (Revision 613520)
+++ build/build.xml (Arbeitskopie)
@@ -1898,8 +1898,13 @@
   description="Download binary packages" >
 

-
+
 
+  
+  
+
+
+
   
   
 


Also I can't find the new 1.1 jta.jar. At sun site we can only  
download a class bundle!

Which class need the JTA interface?

Regards
Peter

Am 18.01.2008 um 22:08 schrieb [EMAIL PROTECTED]:


Author: markt
Date: Fri Jan 18 13:08:42 2008
New Revision: 613273

URL: http://svn.apache.org/viewvc?rev=613273&view=rev
Log:
Update libs

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt? 
rev=613273&r1=613272&r2=613273&view=diff
== 


--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 18 13:08:42 2008
@@ -31,11 +31,6 @@
   +1: jfclere
   -1: fhanik - Can we add the 'package' directive to make the  
package match the dir structure


-* Update: native to 1.1.12; commons-pool to 1.4; commons archive  
locations.

-  http://svn.apache.org/viewvc?rev=612950&view=rev
-  +1: markt, remm, fhanik
-  -1:
-
 * Add ManagerBase session getLastAccessedTimestamp and  
getCreationTimestamp for better

   remote JMX access.
   http://svn.apache.org/viewvc?rev=612971&view=rev

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/ 
build.properties.default?rev=613273&r1=613272&r2=613273&view=diff
== 


--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Fri Jan 18  
13:08:42 2008

@@ -43,12 +43,12 @@
 compile.target=1.5
 compile.debug=true

-base-jakarta.loc=http://archive.apache.org/dist/jakarta
+base-commons.loc=http://archive.apache.org/dist/commons
 base-tomcat.loc=http://archive.apache.org/dist/tomcat

 # - Commons Logging, version 1.1 or later -
 commons-logging-version=1.1.1
-commons-logging-src.loc=${base-jakarta.loc}/commons/logging/source/ 
commons-logging-${commons-logging-version}-src.tar.gz
+commons-logging-src.loc=${base-commons.loc}/logging/source/commons- 
logging-${commons-logging-version}-src.tar.gz


 # - Webservices -
 jaxrpc-src.loc=http://repo1.maven.org/maven2/geronimo-spec/ 
geronimo-spec-jaxrpc/1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar

@@ -61,25 +61,25 @@
 jdt.loc=http://www.eclipse.org/downloads/download.php?file=/ 
eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip


 # - Tomcat native library -
-tomcat-native.home=${base.path}/tomcat-native-1.1.10
+tomcat-native.home=${base.path}/tomcat-native-1.1.12
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
-tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/ 
tomcat-native-1.1.10-src.tar.gz
+tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/ 
tomcat-native-1.1.12-src.tar.gz


 # - Commons DBCP, version 1.1 or later -
 commons-dbcp.version=1.2.2
 commons-dbcp.home=${base.path}/commons-dbcp-1.2.2-src
-commons-dbcp-src.loc=${base-jakarta.loc}/commons/dbcp/source/ 
commons-dbcp-1.2.2-src.tar.gz
+commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons- 
dbcp-1.2.2-src.tar.gz


 # - Commons Pool, version 1.1 or later -
-commons-pool.home=${base.path}/commons-pool-1.3-src
-commons-pool-src.loc=${base-jakarta.loc}/commons/pool/source/ 
commons-pool-1.3-src.tar.gz

+commons-pool.home=${base.path}/commons-pool-1.4-src
+commons-pool-src.loc=${base-commons.loc}/pool/source/commons- 
pool-1.4-src.tar.gz


 # - Commons Collections, version 2.0 or later -
 commons-collections.home=${base.path}/commons-collections-3.2-src
 commons-collections.lib=${commons-collections.home}
 commons-collections.jar=${commons-collections.lib}/commons- 
collections-3.2.jar
 commons-collections.loc=${base-jakarta.loc}/commons/collections/ 
binaries/commons-collections-3.2.tar.gz
-commons-collections-src.loc=${base-jakarta.loc}/commons/ 
collections/source/commons-collections-3.2-src.tar.gz
+commons-collections-src.loc=${base-commons.loc}/collections/source/ 
commons-collections-3.2-src.tar.gz


 # - NSIS, version 2.0 or later -
 nsis.home=${base.path}/nsis-2.34
@@ -93,5 +93,5 @@
 commons-daemon.home=${base.path}/commons-daemon-1.0.1
 commons-daemon.lib=${commons-daemon.home}
 commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
-commons-daemon.loc=${base-jakarta.loc}/commons/daemon/binaries/ 
commons-daemon-1.0.1.tar.gz
+common

svn commit: r613528 - /tomcat/current/tc5.5.x/STATUS.txt

[pero]

Author: pero
Date: Sun Jan 20 02:02:03 2008
New Revision: 613528

URL: http://svn.apache.org/viewvc?rev=613528&view=rev
Log:
remove fixes

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=613528&r1=613527&r2=613528&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan 20 02:02:03 2008
@@ -25,16 +25,6 @@
 PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
-* Fix NPE situation
-  
http://people.apache.org/~pero/patches/tc55/2007-11-16-AccessLogValve-tc55.patch
-  +1: pero, markt, rjung
-  -1:
-
-* Fix wrong && (Also needed at tomcat 6)
-  
http://people.apache.org/~pero/patches/tc55/2007-11-16-1-ReplicationValve-tc55.patch
-  +1: pero, markt, rjung
-  -1:
-
 * Fix  FarmWarDeployer can be only config at Host Element (Also needed at 
tomcat 6)
   
http://people.apache.org/~pero/patches/tc55/2007-11-16-1-FarmWarDeployer-tc55.patch
   +1: pero, markt
@@ -42,11 +32,6 @@
0: fhanik, this needs to be reworked completely, so I'm neutral
   martk - change "FarmWarDeployer can only work as parent from " to
  "FarmWarDeployer can only work if parent of "
-
-* Backport from Tc6 trunk: Set correct sessionCounter at StandardManager after 
reload sessions
-  http://svn.apache.org/viewvc?view=rev&revision=612455
-  +1: pero, markt, fhanik
-  -1: 
 
 * Update commons-pool to 1.4
   http://svn.apache.org/viewvc?rev=612950&view=rev



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r613527 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/session/StandardManager.java webapps/docs/changelog.xml

[pero]

Author: pero
Date: Sun Jan 20 01:58:17 2008
New Revision: 613527

URL: http://svn.apache.org/viewvc?rev=613527&view=rev
Log:
Set correct sessionCounter at StandardManager after reload sessions

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardManager.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardManager.java?rev=613527&r1=613526&r2=613527&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardManager.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardManager.java
 Sun Jan 20 01:58:17 2008
@@ -395,9 +395,10 @@
 session.setManager(this);
 sessions.put(session.getIdInternal(), session);
 session.activate();
+sessionCounter++;
 }
 } catch (ClassNotFoundException e) {
-  log.error(sm.getString("standardManager.loading.cnfe", e), e);
+log.error(sm.getString("standardManager.loading.cnfe", e), e);
 if (ois != null) {
 try {
 ois.close();
@@ -408,7 +409,7 @@
 }
 throw e;
 } catch (IOException e) {
-  log.error(sm.getString("standardManager.loading.ioe", e), e);
+log.error(sm.getString("standardManager.loading.ioe", e), e);
 if (ois != null) {
 try {
 ois.close();

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=613527&r1=613526&r2=613527&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan 20 01:58:17 2008
@@ -94,6 +94,9 @@
   
 
   
+Set correct sessionCounter at StandardManager after reload sessions. 
(pero)
+  
+  
Fix NPE situation at AccessLogValve (pero)
   
   



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r613525 - /tomcat/container/tc5.5.x/webapps/docs/changelog.xml

[pero]

Author: pero
Date: Sun Jan 20 01:54:45 2008
New Revision: 613525

URL: http://svn.apache.org/viewvc?rev=613525&view=rev
Log:
Update Changelog!

Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=613525&r1=613524&r2=613525&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan 20 01:54:45 2008
@@ -94,6 +94,9 @@
   
 
   
+   Fix NPE situation at AccessLogValve (pero)
+  
+  
 30949: Improve previous fix. Ensure requests are recycled
 on cross-context includes and forwards when an exception occurs in the
 target page. (markt)
@@ -187,6 +190,9 @@
   
   
 
+  
+   Fix wrong && at ReplicationValve (pero)
+  
   
 DeltaManager sessionCounter must be also increment at relicated 
sessions. (pero)
   



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

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

[pero]

Author: pero
Date: Sun Jan 20 01:50:08 2008
New Revision: 613524

URL: http://svn.apache.org/viewvc?rev=613524&view=rev
Log:
Backport a tc55 fix

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=613524&r1=613523&r2=613524&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jan 20 01:50:08 2008
@@ -49,3 +49,8 @@
   http://svn.apache.org/viewvc?rev=613266&view=rev
   +1: markt
   -1:
+  
+* Fix wrong &&
+  
http://people.apache.org/~pero/patches/tc55/2007-11-16-1-ReplicationValve-tc55.patch
+  +1: pero
+  -1:



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r613523 - /tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java

[pero]

Author: pero
Date: Sun Jan 20 01:47:26 2008
New Revision: 613523

URL: http://svn.apache.org/viewvc?rev=613523&view=rev
Log:
Fix wrong &&

Modified:

tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java

Modified: 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java?rev=613523&r1=613522&r2=613523&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
 Sun Jan 20 01:47:26 2008
@@ -469,7 +469,7 @@
  */
 protected void resetReplicationRequest(Request request, boolean 
isCrossContext) {
 Session contextSession = request.getSessionInternal(false);
-if(contextSession != null & contextSession instanceof DeltaSession){
+if(contextSession != null && contextSession instanceof DeltaSession){
 resetDeltaRequest(contextSession);
 ((DeltaSession)contextSession).setPrimarySession(true);
 }



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r613522 - /tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java

[pero]

Author: pero
Date: Sun Jan 20 01:45:45 2008
New Revision: 613522

URL: http://svn.apache.org/viewvc?rev=613522&view=rev
Log:
Fix NPE situation

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java?rev=613522&r1=613521&r2=613522&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java
 Sun Jan 20 01:45:45 2008
@@ -853,8 +853,7 @@
 sb.append(space);
 sb.append(request.getProtocol());
 } else {
-sb.append("- - ");
-sb.append(request.getProtocol());
+sb.append("- - -");
 }
 value = sb.toString();
 } else if (pattern == 'S') {



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r613521 - /tomcat/current/tc5.5.x/STATUS.txt

[pero]

Author: pero
Date: Sun Jan 20 00:57:47 2008
New Revision: 613521

URL: http://svn.apache.org/viewvc?rev=613521&view=rev
Log:
Cast my vote

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=613521&r1=613520&r2=613521&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan 20 00:57:47 2008
@@ -51,5 +51,5 @@
 * Update commons-pool to 1.4
   http://svn.apache.org/viewvc?rev=612950&view=rev
   (Note ppatch duplciates some of lib-updates patch)
-  +1: markt, fhanik
+  +1: markt, fhanik, pero
   -1:



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]