gmane.comp.jakarta.tomcat.devel

Re: Automatic deployment changes

Konstantin Kolinko — 2013-05-21T22:42:08

2013/5/7 Mark Thomas <markt< at >apache.org>:


Finally trying to find some time to review this...

1) Is there an intent to put [4] into some version-controlled place?
E.g. webapps/docs/architecture/ ?

Or essentials of it will be included as part of config/context.html ?
I see some rows from the tables are copied as comments into
TestHostConfigAutomaticDeployment.java

2) A pair of typos:

s/ content.xml / [appname].xml / (or at least context.xml)
s/ Redploy / Redeploy /

3) It is possible to deploy a context by specifying it in server.xml.

I think such a context can be a allowed to reload, but it would be bad
to autoredeploy it (one should place such webapp outside of appbase).
What happens with it if ${catalina.base}/conf/context.xml is touched?

As far as I remember from my testing with Tomcat 7, if context that
was defined in server.xml fails to start, the whole Tomcat fails to
start (a Lifecycle exception from starting a child is propagated up
though the call chain).

4) I am a bit missing a legend for th

Re: svn commit: r1484923 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java

Konstantin Kolinko — 2013-05-21T22:10:30

2013/5/22  <markt< at >apache.org>:

2. Why if(originalDocBase == null) check was removed?



1. This change in 6.0 needs to go through voting
2. There is a bug in the above line,
"docBase" should not be there.
(Though it never executes, as antiLockingDocBase was created as
file.getAbsolutePath(),)
It will allow to simplify this block a bit.

3. Wouldn't it be more simple to have the new field as a File instead of String?
While "docBase" is a String, per API,  this field represents a proper file.

The rest of the change is OK.

(It changes the way how "originalDocBase" field is handled, but I
would say that it is OK. The new behaviour makes more sense. Regarding
lifecycleEvent() method, now it goes as:

a) BEFORE_START_EVENT -> beforeStart()
 -> call antiLocking() -> save docBase into originalDocBase field

b) START_EVENT -> (...)

c) AFTER_START_EVENT -> restore docBase

Thus there was OK to remove that "restoring" code from STOP_EVENT block.
)



Best regards,
Konstantin Kolinko

buildbot success in ASF Buildbot on tomcat-trunk

2013-05-21T21:52:51

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

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

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1484959
Blamelist: markt

Build succeeded!

sincerely,
 -The Buildbot

svn commit: r1484959 - /tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

2013-05-21T21:08:26

Author: markt
Date: Tue May 21 21:08:25 2013
New Revision: 1484959

URL: http://svn.apache.org/r1484959
Log:
Fix test failures when the file timestamp hadn't moved far enough for the OS to report it as changed.

Modified:
    tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

Modified: tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java?rev=1484959&r1=1484958&r2=1484959&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java Tue May 21 21:08:25 2013
< at >< at > -1111,34 +1111,35 < at >< at > public class TestHostConfigAutomaticDepl
         tomcat.start();
         host.backgroundProcess();
 
-        // Change the specified

[Bug 53605] use tcnative-1.1.24 Tomcat shutdown still crash

2013-05-21T20:19:05

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

--- Comment #2 from Christopher Schultz <chris< at >christopherschultz.net> ---
Is this reproducible?

[Bug 54984] multipart/form-data is not always read with correct encoding

2013-05-21T20:15:35

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

--- Comment #1 from Christopher Schultz <chris< at >christopherschultz.net> ---
Can you post a simple test-case as a WAR (including source) to reproduce this?

[Bug 51813] Tomcat randomly crashes with [libtcnative-1.so.1+0x152ca] Java_org_apache_tomcat_jni_Socket_sendbb+0x5a

2013-05-21T20:13:09

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

--- Comment #6 from Christopher Schultz <chris< at >christopherschultz.net> ---
(Note the above example patch is against tcnative/1.1.x branch)

[Bug 51813] Tomcat randomly crashes with [libtcnative-1.so.1+0x152ca] Java_org_apache_tomcat_jni_Socket_sendbb+0x5a

2013-05-21T20:12:39

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

--- Comment #5 from Christopher Schultz <chris< at >christopherschultz.net> ---
I think this ought to do it (though I'm sure there are other places in tcnative
that could afford to have this same kind of checking):


Index: native/src/network.c
===================================================================
--- native/src/network.c    (revision 1484904)
+++ native/src/network.c    (working copy)
< at >< at > -587,6 +587,10 < at >< at >
         tcn_ThrowAPRException(e, APR_ENOTSOCK);
         return -(jint)APR_ENOTSOCK;
     }
+    if(!s->net) {
+      tcn_ThrowAPRException(e, APR_EINVALSOCK);
+      return -(jint)APR_EINVALSOCK;
+    }
     TCN_ASSERT(s->opaque != NULL);
     TCN_ASSERT(s->jsbbuff != NULL);
 #ifdef TCN_DO_STATISTICS

[Bug 51813] Tomcat randomly crashes with [libtcnative-1.so.1+0x152ca] Java_org_apache_tomcat_jni_Socket_sendbb+0x5a

2013-05-21T20:12:06

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

--- Comment #4 from Christopher Schultz <chris< at >christopherschultz.net> ---
We have another bite:
http://markmail.org/message/f5idaje4a4vg7vkd

Updated versions of everything, but the symptom is the same: ImageIO bug + APR
+ sendbb() + si_addr=0x0000000000000040

[Bug 54983] C [tcnative-1.dll+0x52f0] Java_org_apache_tomcat_jni_Socket_send+0xa0

2013-05-21T20:11:10

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

--- Comment #3 from Christopher Schultz <chris< at >christopherschultz.net> ---
(In reply to comment #2)

Erp, probably not, after reading the dump.

Apologies for the noise.

[Bug 54983] C [tcnative-1.dll+0x52f0] Java_org_apache_tomcat_jni_Socket_send+0xa0

2013-05-21T20:10:11

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

Christopher Schultz <chris< at >christopherschultz.net> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
  Attachment #30287|application/octet-stream    |text/plain
          mime type|                            |

[Bug 54983] C [tcnative-1.dll+0x52f0] Java_org_apache_tomcat_jni_Socket_send+0xa0

2013-05-21T20:09:31

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

--- Comment #2 from Christopher Schultz <chris< at >christopherschultz.net> ---
Possible dupe of bug #51813?

svn commit: r1484924 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/changelog.xml

2013-05-21T20:02:41

Author: markt
Date: Tue May 21 20:02:41 2013
New Revision: 1484924

URL: http://svn.apache.org/r1484924
Log:
Make deletion of the copied WARs used for anti-resource locking more robust if the context fails to start (there were some circumstances where the original WAR could get deleted).
(missed in previous commit)

Modified:
    tomcat/tc6.0.x/trunk/   (props changed)
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1484862
  Merged /tomcat/tc7.0.x/trunk:r1484919

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1484924&r1=1484923&r2=1484924&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue May 21 20:02:41 2013
< at >< at > -43,6

svn commit: r1484923 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java

2013-05-21T20:01:03

Author: markt
Date: Tue May 21 20:01:02 2013
New Revision: 1484923

URL: http://svn.apache.org/r1484923
Log:
Make deletion of the copied WARs used for anti-resource locking more robust if the context fails to start (there were some circumstances where the original WAR could get deleted).

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1484923&r1=1484922&r2=1484923&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue May 21 20:01:02 2013
< at >< at > -127,6 +127,12 < at >< at > public class ContextConfig
     
 
     /**
+     * Anti-locking docBase
+     */
+    private String antiLockingDocBase

[Bug 54999] JSESSIONIDSSO not re-created upon re-authentication on the same request - logout() and login(username,password)

2013-05-21T19:54:25

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

Keith Mashinter <kmashint< at >yahoo.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
            Summary|JSESSIONIDSSO not           |JSESSIONIDSSO not
                   |re-created upon             |re-created upon
                   |re-authentication via       |re-authentication on the
                   |logout() and                |same request - logout() and
                   |login(username,password) in |login(username,password)
                   |the same request            |

[Bug 54999] New: JSESSIONIDSSO not re-created upon re-authentication via logout() and login(username,password) in the same request

2013-05-21T19:50:48

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

            Bug ID: 54999
           Summary: JSESSIONIDSSO not re-created upon re-authentication
                    via logout() and login(username,password) in the same
                    request
           Product: Tomcat 7
           Version: 7.0.40
          Hardware: PC
                OS: Windows XP
            Status: NEW
          Severity: normal
          Priority: P2
         Component: Catalina
          Assignee: dev< at >tomcat.apache.org
          Reporter: kmashint< at >yahoo.com
    Classification: Unclassified

In testing I found that the JSESSIONIDSSO was not re-created upon
re-authentication via logout() and login(username,password) in the same
request.  The problem stemmed from the REQ_SSOID_NOTE that was was not reset
upon request.logout(), whereas the documentation indicates that a logout() from
any web-app should logout() from all web-apps.  When the REQ_SSOID_NOTE is not
removed upon logout(), a subsequent login(username,password) on

svn commit: r1484919 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml

2013-05-21T19:49:54

Author: markt
Date: Tue May 21 19:49:54 2013
New Revision: 1484919

URL: http://svn.apache.org/r1484919
Log:
Make deletion of the copied WARs used for anti-resource locking more robust if the context fails to start (there were some circumstances where the original WAR could get deleted).

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

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1484862

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1484919&r1=1484918&r2=1484919&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
++

svn commit: r1484862 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

2013-05-21T16:34:27

Author: markt
Date: Tue May 21 16:34:27 2013
New Revision: 1484862

URL: http://svn.apache.org/r1484862
Log:
Make deletion of the copied WARs used for anti-resource locking more robust if the context fails to start (there were some circumstances where the original WAR could get deleted). Add some test cases to check this.

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
    tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

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=1484862&r1=1484861&r2=1484862&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue May 21 16:34:27 2013
< at >< at > -213,6 +213,12 < at >< at > public class ContextConfig implements

svn commit: r1484861 - /tomcat/trunk/test/deployment/broken.war

2013-05-21T16:33:09

Author: markt
Date: Tue May 21 16:33:08 2013
New Revision: 1484861

URL: http://svn.apache.org/r1484861
Log:
Make WAR break later in the deployment process

Modified:
    tomcat/trunk/test/deployment/broken.war

Modified: tomcat/trunk/test/deployment/broken.war
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/deployment/broken.war?rev=1484861&r1=1484860&r2=1484861&view=diff
==============================================================================
Binary files - no diff available.

[Bug 54060] DigestAuthenticator doesn't parse Authorization header correctly

2013-05-21T13:00:40

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

--- Comment #15 from Mark Thornton <mthornton< at >optrak.com> ---
HttpClient is a culprit in quoting algorithm. Unfortunately Ubuntu 13.04 uses
TomCat 7.0.35 and is thus affected. I have filed an issue with HttpClient:
https://issues.apache.org/jira/browse/HTTPCLIENT-1354

svn commit: r1484786 - /tomcat/trunk/test/deployment/broken.war

2013-05-21T12:49:18

Author: markt
Date: Tue May 21 12:49:18 2013
New Revision: 1484786

URL: http://svn.apache.org/r1484786
Log:
Add a web app that fails to start for use in deployment testing

Added:
    tomcat/trunk/test/deployment/broken.war   (with props)

Added: tomcat/trunk/test/deployment/broken.war
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/deployment/broken.war?rev=1484786&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/trunk/test/deployment/broken.war
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream