svn commit: r1298288 - /tomcat/jk/trunk/native/buildconf.sh
Author: rjung Date: Thu Mar 8 08:02:45 2012 New Revision: 1298288 URL: http://svn.apache.org/viewvc?rev=1298288view=rev Log: Remove --force from libtoolize in buildconf to prevent overwrite of our config.(guess|sub) copies with system installed ones. Modified: tomcat/jk/trunk/native/buildconf.sh Modified: tomcat/jk/trunk/native/buildconf.sh URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/buildconf.sh?rev=1298288r1=1298287r2=1298288view=diff == --- tomcat/jk/trunk/native/buildconf.sh (original) +++ tomcat/jk/trunk/native/buildconf.sh Thu Mar 8 08:02:45 2012 @@ -18,8 +18,8 @@ scripts/build/unix/buildcheck.sh || exit 1 rm -rf autom4te.cache 2/dev/null || true -echo buildconf: libtoolize --force --automake --copy -libtoolize --force --automake --copy +echo buildconf: libtoolize --automake --copy +libtoolize --automake --copy echo buildconf: aclocal #aclocal --acdir=`aclocal --print-ac-dir` #aclocal --acdir=/usr/local/share/aclocal - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1298288 - /tomcat/jk/trunk/native/buildconf.sh
On 03/08/2012 09:02 AM, rj...@apache.org wrote: Author: rjung Date: Thu Mar 8 08:02:45 2012 New Revision: 1298288 URL: http://svn.apache.org/viewvc?rev=1298288view=rev Log: Remove --force from libtoolize in buildconf to prevent overwrite of our config.(guess|sub) copies with system installed ones. Think that doesn't cause to overwrite config files only libtool ones. Actually might be even desired to have such feature if user wishes to re-run buildconf Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1298288 - /tomcat/jk/trunk/native/buildconf.sh
On 08.03.2012 09:08, Mladen Turk wrote: On 03/08/2012 09:02 AM, rj...@apache.org wrote: Author: rjung Date: Thu Mar 8 08:02:45 2012 New Revision: 1298288 URL: http://svn.apache.org/viewvc?rev=1298288view=rev Log: Remove --force from libtoolize in buildconf to prevent overwrite of our config.(guess|sub) copies with system installed ones. Think that doesn't cause to overwrite config files only libtool ones. I'm pretty sure it does overwrite them and that's why I removed it from APR buildconf long ago, because we always shipped APR with outdated config file although file in SVN was more recent (until I fixed it). Actually might be even desired to have such feature if user wishes to re-run buildconf By feature you mean overwriting our config.* files? A user can re-run buildconf (as we do), the question is whether bundled files should have preference. I think yes, because most platforms are totally out of date. If a user wants to provide a newer file, he can directly overwrite our bundled ones. But maybe I misunderstood you. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1298296 - in /tomcat/trunk/java/org/apache/catalina/ha/authenticator: ClusterSingleSignOn.java ClusterSingleSignOnListener.java SingleSignOnMessage.java
Author: kfujino
Date: Thu Mar 8 08:39:02 2012
New Revision: 1298296
URL: http://svn.apache.org/viewvc?rev=1298296view=rev
Log:
Replicate Principal in ClusterSingleSignOn.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
tomcat/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
Modified:
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java?rev=1298296r1=1298295r2=1298296view=diff
==
---
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
Thu Mar 8 08:39:02 2012
@@ -31,6 +31,8 @@ import org.apache.catalina.Session;
import org.apache.catalina.authenticator.SingleSignOn;
import org.apache.catalina.ha.CatalinaCluster;
import org.apache.catalina.ha.ClusterManager;
+import org.apache.catalina.ha.session.SerializablePrincipal;
+import org.apache.catalina.realm.GenericPrincipal;
import org.apache.tomcat.util.ExceptionUtils;
@@ -293,6 +295,12 @@ public class ClusterSingleSignOn extends
msg.setUsername(username);
msg.setPassword(password);
+SerializablePrincipal sp = null;
+if (principal instanceof GenericPrincipal) {
+sp = SerializablePrincipal.createPrincipal((GenericPrincipal)
principal);
+msg.setPrincipal(sp);
+}
+
cluster.send(msg);
if (containerLog.isDebugEnabled()) {
containerLog.debug(SingleSignOnMessage Send with action
@@ -352,6 +360,12 @@ public class ClusterSingleSignOn extends
msg.setUsername(username);
msg.setPassword(password);
+SerializablePrincipal sp = null;
+if (principal instanceof GenericPrincipal) {
+sp = SerializablePrincipal.createPrincipal((GenericPrincipal)
principal);
+msg.setPrincipal(sp);
+}
+
cluster.send(msg);
if (containerLog.isDebugEnabled()) {
containerLog.debug(SingleSignOnMessage Send with action
Modified:
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java?rev=1298296r1=1298295r2=1298296view=diff
==
---
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
Thu Mar 8 08:39:02 2012
@@ -18,6 +18,7 @@
package org.apache.catalina.ha.authenticator;
import java.io.IOException;
+import java.security.Principal;
import java.util.Map;
import org.apache.catalina.Session;
@@ -76,6 +77,7 @@ public class ClusterSingleSignOnListener
SingleSignOnMessage msg = (SingleSignOnMessage) myobj;
int action = msg.getAction();
Session session = null;
+Principal principal = null;
if (log.isDebugEnabled())
log.debug(SingleSignOnMessage Received with action
@@ -98,11 +100,17 @@ public class ClusterSingleSignOnListener
clusterSSO.deregisterLocal(msg.getSsoId());
break;
case SingleSignOnMessage.REGISTER_SESSION:
-clusterSSO.registerLocal(msg.getSsoId(), null,
msg.getAuthType(),
+if (msg.getPrincipal() != null) {
+principal = msg.getPrincipal().getPrincipal();
+}
+clusterSSO.registerLocal(msg.getSsoId(), principal,
msg.getAuthType(),
msg.getUsername(), msg.getPassword());
break;
case SingleSignOnMessage.UPDATE_SESSION:
-clusterSSO.updateLocal(msg.getSsoId(), null, msg.getAuthType(),
+if (msg.getPrincipal() != null) {
+principal = msg.getPrincipal().getPrincipal();
+}
+clusterSSO.updateLocal(msg.getSsoId(), principal,
msg.getAuthType(),
msg.getUsername(), msg.getPassword());
break;
case SingleSignOnMessage.REMOVE_SESSION:
Modified:
tomcat/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java?rev=1298296r1=1298295r2=1298296view=diff
svn commit: r1298299 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/ha/authenticator/ webapps/docs/
Author: kfujino
Date: Thu Mar 8 08:43:46 2012
New Revision: 1298299
URL: http://svn.apache.org/viewvc?rev=1298299view=rev
Log:
Replicate Principal in ClusterSingleSignOn.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java?rev=1298299r1=1298298r2=1298299view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
Thu Mar 8 08:43:46 2012
@@ -31,6 +31,8 @@ import org.apache.catalina.Session;
import org.apache.catalina.authenticator.SingleSignOn;
import org.apache.catalina.ha.CatalinaCluster;
import org.apache.catalina.ha.ClusterManager;
+import org.apache.catalina.ha.session.SerializablePrincipal;
+import org.apache.catalina.realm.GenericPrincipal;
import org.apache.tomcat.util.ExceptionUtils;
@@ -318,6 +320,12 @@ public class ClusterSingleSignOn
msg.setUsername(username);
msg.setPassword(password);
+SerializablePrincipal sp = null;
+if (principal instanceof GenericPrincipal) {
+sp = SerializablePrincipal.createPrincipal((GenericPrincipal)
principal);
+msg.setPrincipal(sp);
+}
+
cluster.send(msg);
if (containerLog.isDebugEnabled())
containerLog.debug(SingleSignOnMessage Send with action
@@ -376,6 +384,12 @@ public class ClusterSingleSignOn
msg.setUsername(username);
msg.setPassword(password);
+SerializablePrincipal sp = null;
+if (principal instanceof GenericPrincipal) {
+sp = SerializablePrincipal.createPrincipal((GenericPrincipal)
principal);
+msg.setPrincipal(sp);
+}
+
cluster.send(msg);
if (containerLog.isDebugEnabled())
containerLog.debug(SingleSignOnMessage Send with action
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java?rev=1298299r1=1298298r2=1298299view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
Thu Mar 8 08:43:46 2012
@@ -18,6 +18,7 @@
package org.apache.catalina.ha.authenticator;
import java.io.IOException;
+import java.security.Principal;
import java.util.Map;
import org.apache.catalina.Session;
@@ -90,6 +91,7 @@ public class ClusterSingleSignOnListener
SingleSignOnMessage msg = (SingleSignOnMessage) myobj;
int action = msg.getAction();
Session session = null;
+Principal principal = null;
if (log.isDebugEnabled())
log.debug(SingleSignOnMessage Received with action
@@ -112,11 +114,17 @@ public class ClusterSingleSignOnListener
clusterSSO.deregisterLocal(msg.getSsoId());
break;
case SingleSignOnMessage.REGISTER_SESSION:
-clusterSSO.registerLocal(msg.getSsoId(), null,
msg.getAuthType(),
+if (msg.getPrincipal() != null) {
+principal = msg.getPrincipal().getPrincipal();
+}
+clusterSSO.registerLocal(msg.getSsoId(), principal,
msg.getAuthType(),
msg.getUsername(), msg.getPassword());
break;
case SingleSignOnMessage.UPDATE_SESSION:
-clusterSSO.updateLocal(msg.getSsoId(), null, msg.getAuthType(),
+if (msg.getPrincipal() != null) {
+principal = msg.getPrincipal().getPrincipal();
+}
+clusterSSO.updateLocal(msg.getSsoId(), principal,
msg.getAuthType(),
msg.getUsername(), msg.getPassword());
break;
case SingleSignOnMessage.REMOVE_SESSION:
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
URL:
svn commit: r1298303 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kfujino Date: Thu Mar 8 08:52:53 2012 New Revision: 1298303 URL: http://svn.apache.org/viewvc?rev=1298303view=rev Log: Proposal. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1298303r1=1298302r2=1298303view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Mar 8 08:52:53 2012 @@ -143,6 +143,10 @@ PATCHES PROPOSED TO BACKPORT: +1: markt -1: +* Replicate Principal in ClusterSingleSignOn. + http://svn.apache.org/viewvc?view=revisionrevision=1298299 + +1: kfujino + -1: PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: WebSocket status
On 2/03/2012 2:29 PM, Filip Hanik - Dev Lists wrote: On 3/2/2012 2:13 AM, Mark Thomas wrote: You can't register on a selector using another thread. Bingo. That explains it. Is that documented anywhere? I'm not sure if the java.nio documentation says it, I think it does. The Selector object is not thread safe. trying to manipulate interestops and selectors from multiple threads, can lead to dead locks According to the docs selectors themselves are safe for use by multiple concurrent threads, their keys however, are not [1]. What's next / left on the TODO list Mark? Anything I can help out with? I'm off for the weekend, address the other stuff next week. Enjoy the weekend! Cheers, Johno [1] http://docs.oracle.com/javase/1.5.0/docs/api/java/nio/channels/Selector.html (Concurrency) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1298288 - /tomcat/jk/trunk/native/buildconf.sh
On 03/08/2012 09:21 AM, Rainer Jung wrote: On 08.03.2012 09:08, Mladen Turk wrote: On 03/08/2012 09:02 AM, rj...@apache.org wrote: Author: rjung Date: Thu Mar 8 08:02:45 2012 New Revision: 1298288 URL: http://svn.apache.org/viewvc?rev=1298288view=rev Log: Remove --force from libtoolize in buildconf to prevent overwrite of our config.(guess|sub) copies with system installed ones. Think that doesn't cause to overwrite config files only libtool ones. I'm pretty sure it does overwrite them and that's why I removed it from APR buildconf long ago, I tried on linux and solaris and libtoolize --force doesn't overwrite the config.sub file. config.sub files are overwritten by automake's --force-missing (and that's now removed) libtoolize --force will only overwrite ltmain.sh Actually might be even desired to have such feature if user wishes to re-run buildconf By feature you mean overwriting our config.* files? Nope, I actually wish to avoid that. But maybe I misunderstood you. No, config.* should be ours, buildconf should be invoked with old gnu autotools (2.5/1.5) so that produced configure is usable on older systems. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1298367 - in /tomcat/jk/trunk/native/iis: Makefile.amd64 Makefile.ia64 Makefile.x86 pcre/chartables.hw pcre/pcre.amd64 pcre/pcre.ia64 pcre/pcre.x86
Author: mturk
Date: Thu Mar 8 11:37:26 2012
New Revision: 1298367
URL: http://svn.apache.org/viewvc?rev=1298367view=rev
Log:
Pre-generate chartables for windows. It never changes anyhow. This allows to
build pcre 64-bit without creating 32-bit in front
Added:
tomcat/jk/trunk/native/iis/pcre/chartables.hw
Modified:
tomcat/jk/trunk/native/iis/Makefile.amd64
tomcat/jk/trunk/native/iis/Makefile.ia64
tomcat/jk/trunk/native/iis/Makefile.x86
tomcat/jk/trunk/native/iis/pcre/pcre.amd64
tomcat/jk/trunk/native/iis/pcre/pcre.ia64
tomcat/jk/trunk/native/iis/pcre/pcre.x86
Modified: tomcat/jk/trunk/native/iis/Makefile.amd64
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.amd64?rev=1298367r1=1298366r2=1298367view=diff
==
--- tomcat/jk/trunk/native/iis/Makefile.amd64 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.amd64 Thu Mar 8 11:37:26 2012
@@ -30,16 +30,8 @@ INTDIR=.\Release_amd64
OutDir=.\Release_amd64
# End Custom Macros
-!IF $(RECURSE) == 0
-
-ALL : $(OUTDIR)\$(TARGET).dll
-
-!ELSE
-
ALL : pcre_amd64 $(OUTDIR)\$(TARGET).dll
-!ENDIF
-
!IF $(RECURSE) == 1
CLEAN :pcre_amd64CLEAN
!ELSE
@@ -298,5 +290,5 @@ SOURCE=..\common\jk_worker.c
pcre_amd64CLEAN :
cd .\pcre
- $(MAKE) /$(MAKEFLAGS) /F .\pcre.amd64 RECURSE=1 CLEAN
+ $(MAKE) /$(MAKEFLAGS) /F .\pcre.amd64 CLEAN
cd ..
Modified: tomcat/jk/trunk/native/iis/Makefile.ia64
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.ia64?rev=1298367r1=1298366r2=1298367view=diff
==
--- tomcat/jk/trunk/native/iis/Makefile.ia64 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.ia64 Thu Mar 8 11:37:26 2012
@@ -30,16 +30,8 @@ INTDIR=.\Release_ia64
OutDir=.\Release_ia64
# End Custom Macros
-!IF $(RECURSE) == 0
-
-ALL : $(OUTDIR)\$(TARGET).dll
-
-!ELSE
-
ALL : pcre_ia64 $(OUTDIR)\$(TARGET).dll
-!ENDIF
-
!IF $(RECURSE) == 1
CLEAN :pcre_ia64CLEAN
!ELSE
@@ -298,5 +290,5 @@ SOURCE=..\common\jk_worker.c
pcre_ia64CLEAN :
cd .\pcre
- $(MAKE) /$(MAKEFLAGS) /F .\pcre.ia64 RECURSE=1 CLEAN
+ $(MAKE) /$(MAKEFLAGS) /F .\pcre.ia64 CLEAN
cd ..
Modified: tomcat/jk/trunk/native/iis/Makefile.x86
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.x86?rev=1298367r1=1298366r2=1298367view=diff
==
--- tomcat/jk/trunk/native/iis/Makefile.x86 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.x86 Thu Mar 8 11:37:26 2012
@@ -287,10 +287,10 @@ SOURCE=..\common\jk_worker.c
pcre_x86 :
cd .\pcre
- $(MAKE) /$(MAKEFLAGS) /F .\pcre.x86 CFG=pcre_x86
+ $(MAKE) /$(MAKEFLAGS) /F .\pcre.x86
cd ..
pcre_x86CLEAN :
cd .\pcre
- $(MAKE) /$(MAKEFLAGS) /F .\pcre.x86 CFG=pcre_x86 RECURSE=1 CLEAN
+ $(MAKE) /$(MAKEFLAGS) /F .\pcre.x86 CLEAN
cd ..
Added: tomcat/jk/trunk/native/iis/pcre/chartables.hw
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/chartables.hw?rev=1298367view=auto
==
--- tomcat/jk/trunk/native/iis/pcre/chartables.hw (added)
+++ tomcat/jk/trunk/native/iis/pcre/chartables.hw Thu Mar 8 11:37:26 2012
@@ -0,0 +1,183 @@
+/*
+* Perl-Compatible Regular Expressions *
+*/
+
+/* This file is automatically written by the dftables auxiliary
+program. If you edit it by hand, you might like to edit the Makefile to
+prevent its ever being regenerated.
+
+This file is #included in the compilation of pcre.c to build the default
+character tables which are used when no tables are passed to the compile
+function. */
+
+static unsigned char pcre_default_tables[] = {
+
+/* This table is a lower casing table. */
+
+0, 1, 2, 3, 4, 5, 6, 7,
+8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 97, 98, 99,100,101,102,103,
+ 104,105,106,107,108,109,110,111,
+ 112,113,114,115,116,117,118,119,
+ 120,121,122, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99,100,101,102,103,
+ 104,105,106,107,108,109,110,111,
+ 112,113,114,115,116,117,118,119,
+ 120,121,122,123,124,125,126,127,
+ 128,129,130,131,132,133,134,135,
+ 136,137,138,139,140,141,142,143,
+ 144,145,146,147,148,149,150,151,
+ 152,153,154,155,156,157,158,159,
+ 160,161,162,163,164,165,166,167,
+ 168,169,170,171,172,173,174,175,
+ 176,177,178,179,180,181,182,183,
+ 184,185,186,187,188,189,190,191,
+ 192,193,194,195,196,197,198,199,
+ 200,201,202,203,204,205,206,207,
+ 208,209,210,211,212,213,214,215,
+ 216,217,218,219,220,221,222,223,
+
Re: svn commit: r1298288 - /tomcat/jk/trunk/native/buildconf.sh
On 08.03.2012 12:06, Mladen Turk wrote: On 03/08/2012 09:21 AM, Rainer Jung wrote: On 08.03.2012 09:08, Mladen Turk wrote: On 03/08/2012 09:02 AM, rj...@apache.org wrote: Author: rjung Date: Thu Mar 8 08:02:45 2012 New Revision: 1298288 URL: http://svn.apache.org/viewvc?rev=1298288view=rev Log: Remove --force from libtoolize in buildconf to prevent overwrite of our config.(guess|sub) copies with system installed ones. Think that doesn't cause to overwrite config files only libtool ones. I'm pretty sure it does overwrite them and that's why I removed it from APR buildconf long ago, I tried on linux and solaris and libtoolize --force doesn't overwrite the config.sub file. config.sub files are overwritten by automake's --force-missing (and that's now removed) libtoolize --force will only overwrite ltmain.sh Hmmm: my libtoolize contains calls to func_config_update config.guess ... func_config_update config.sub ... which results in func_config_update - func_keyword_update which contains if $my_keyword_update_p || $opt_force; then func_copy $my_srcfile $my_destfile $my_msg_var ? Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1298288 - /tomcat/jk/trunk/native/buildconf.sh
On 03/08/2012 12:59 PM, Rainer Jung wrote: On 08.03.2012 12:06, Mladen Turk wrote: On 03/08/2012 09:21 AM, Rainer Jung wrote: On 08.03.2012 09:08, Mladen Turk wrote: On 03/08/2012 09:02 AM, rj...@apache.org wrote: Author: rjung Date: Thu Mar 8 08:02:45 2012 New Revision: 1298288 URL: http://svn.apache.org/viewvc?rev=1298288view=rev Log: Remove --force from libtoolize in buildconf to prevent overwrite of our config.(guess|sub) copies with system installed ones. Think that doesn't cause to overwrite config files only libtool ones. I'm pretty sure it does overwrite them and that's why I removed it from APR buildconf long ago, I tried on linux and solaris and libtoolize --force doesn't overwrite the config.sub file. config.sub files are overwritten by automake's --force-missing (and that's now removed) libtoolize --force will only overwrite ltmain.sh Hmmm: my libtoolize contains calls to func_config_update config.guess ... func_config_update config.sub ... which results in func_config_update - func_keyword_update which contains if $my_keyword_update_p || $opt_force; then func_copy $my_srcfile $my_destfile $my_msg_var ? Well my libtoolize says in main # Do not remove config.guess nor config.sub, we don't install them # without --install, and the project may not be using Automake. So you need to pass --install AND --force so they get overwritten Anyhow, the easiest way is to actually test it :) Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1298367 - in /tomcat/jk/trunk/native/iis: Makefile.amd64 Makefile.ia64 Makefile.x86 pcre/chartables.hw pcre/pcre.amd64 pcre/pcre.ia64 pcre/pcre.x86
2012/3/8 mt...@apache.org:
Author: mturk
Date: Thu Mar 8 11:37:26 2012
New Revision: 1298367
URL: http://svn.apache.org/viewvc?rev=1298367view=rev
Log:
Pre-generate chartables for windows. It never changes anyhow. This allows to
build pcre 64-bit without creating 32-bit in front
Added:
tomcat/jk/trunk/native/iis/pcre/chartables.hw
The added file seems to be a C source text, so it needs svn:eol-style=native
Modified:
tomcat/jk/trunk/native/iis/Makefile.amd64
tomcat/jk/trunk/native/iis/Makefile.ia64
tomcat/jk/trunk/native/iis/Makefile.x86
tomcat/jk/trunk/native/iis/pcre/pcre.amd64
tomcat/jk/trunk/native/iis/pcre/pcre.ia64
tomcat/jk/trunk/native/iis/pcre/pcre.x86
(...)
Added: tomcat/jk/trunk/native/iis/pcre/chartables.hw
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/chartables.hw?rev=1298367view=auto
==
--- tomcat/jk/trunk/native/iis/pcre/chartables.hw (added)
+++ tomcat/jk/trunk/native/iis/pcre/chartables.hw Thu Mar 8 11:37:26 2012
@@ -0,0 +1,183 @@
+/*
+* Perl-Compatible Regular Expressions *
+*/
+
+/* This file is automatically written by the dftables auxiliary
+program. If you edit it by hand, you might like to edit the Makefile to
+prevent its ever being regenerated.
+
+This file is #included in the compilation of pcre.c to build the default
+character tables which are used when no tables are passed to the compile
+function. */
+
+static unsigned char pcre_default_tables[] = {
+
+/* This table is a lower casing table. */
+
+ 0, 1, 2, 3, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 97, 98, 99,100,101,102,103,
+ 104,105,106,107,108,109,110,111,
+ 112,113,114,115,116,117,118,119,
+ 120,121,122, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99,100,101,102,103,
+ 104,105,106,107,108,109,110,111,
+ 112,113,114,115,116,117,118,119,
+ 120,121,122,123,124,125,126,127,
+ 128,129,130,131,132,133,134,135,
+ 136,137,138,139,140,141,142,143,
+ 144,145,146,147,148,149,150,151,
+ 152,153,154,155,156,157,158,159,
+ 160,161,162,163,164,165,166,167,
+ 168,169,170,171,172,173,174,175,
+ 176,177,178,179,180,181,182,183,
+ 184,185,186,187,188,189,190,191,
+ 192,193,194,195,196,197,198,199,
+ 200,201,202,203,204,205,206,207,
+ 208,209,210,211,212,213,214,215,
+ 216,217,218,219,220,221,222,223,
+ 224,225,226,227,228,229,230,231,
+ 232,233,234,235,236,237,238,239,
+ 240,241,242,243,244,245,246,247,
+ 248,249,250,251,252,253,254,255,
+
+/* This table is a case flipping table. */
+
+ 0, 1, 2, 3, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 97, 98, 99,100,101,102,103,
+ 104,105,106,107,108,109,110,111,
+ 112,113,114,115,116,117,118,119,
+ 120,121,122, 91, 92, 93, 94, 95,
+ 96, 65, 66, 67, 68, 69, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87,
+ 88, 89, 90,123,124,125,126,127,
+ 128,129,130,131,132,133,134,135,
+ 136,137,138,139,140,141,142,143,
+ 144,145,146,147,148,149,150,151,
+ 152,153,154,155,156,157,158,159,
+ 160,161,162,163,164,165,166,167,
+ 168,169,170,171,172,173,174,175,
+ 176,177,178,179,180,181,182,183,
+ 184,185,186,187,188,189,190,191,
+ 192,193,194,195,196,197,198,199,
+ 200,201,202,203,204,205,206,207,
+ 208,209,210,211,212,213,214,215,
+ 216,217,218,219,220,221,222,223,
+ 224,225,226,227,228,229,230,231,
+ 232,233,234,235,236,237,238,239,
+ 240,241,242,243,244,245,246,247,
+ 248,249,250,251,252,253,254,255,
+
+/* This table contains bit maps for various character classes.
+Each map is 32 bytes long and the bits run from the least
+significant end of each byte. The classes that have their own
+maps are: space, xdigit, digit, upper, lower, word, graph
+print, punct, and cntrl. Other classes are built from combinations. */
+
+ 0x00,0x3e,0x00,0x00,0x01,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
+ 0x7e,0x00,0x00,0x00,0x7e,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
Re: svn commit: r1298367 - in /tomcat/jk/trunk/native/iis: Makefile.amd64 Makefile.ia64 Makefile.x86 pcre/chartables.hw pcre/pcre.amd64 pcre/pcre.ia64 pcre/pcre.x86
On 03/08/2012 01:15 PM, Konstantin Kolinko wrote: 2012/3/8mt...@apache.org: Added: tomcat/jk/trunk/native/iis/pcre/chartables.hw The added file seems to be a C source text, so it needs svn:eol-style=native Probably, but since its not meant to be editable its irrelevant. It'll be compiled regardless of EOL and thats what matters ;) Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52856] New: High CPU load when the underlying socket error in ssl_socket_send is EAGAIN
https://issues.apache.org/bugzilla/show_bug.cgi?id=52856
Bug #: 52856
Summary: High CPU load when the underlying socket error in
ssl_socket_send is EAGAIN
Product: Tomcat Native
Version: 1.1.22
Platform: PC
OS/Version: Linux
Status: NEW
Severity: major
Priority: P2
Component: Library
AssignedTo: dev@tomcat.apache.org
ReportedBy: dmitry.kukush...@external.telekom.de
Classification: Unclassified
How to reproduce:
Tomcat with the APR connector, using HTTPS scheme, when a client requests for
some quite a big (~100K-200K) static file, and breaks the connection
unexpectedly.
Shell script to reproduce:
#!/bin/bash
# A way to reproduce the bug in the APR connector.
# Must be run from a different machine, the Tomcat is running on.
# Author: Andreas Florath ( andreas.florath at external.telekom.de )
for port in 17890 17891 17892 17893 17894 17895 17896 17897 17898 17899; do
curl --local-port $port --insecure https://host:port/some big file
sleep 0.1
iptables -A OUTPUT -p tcp --sport $port -j REJECT
done
Connector enters a socket write loop, taking nearly 1 CPU core.
A snippet from the strace log:
...
[pid 32221] write(91,
\347\2\22\36\334\222\2525g\215\342\352A\324\246\340\7\265(\205n\362\215\34az\363\37Up\213...,
1789 unfinished ...
[pid 3] ... futex resumed ) = 0
[pid 32221] ... write resumed ) = -1 EAGAIN (Resource temporarily
unavailable)
[pid 3] write(94,
\276\275\263zN\n\20^\35\200\3.\5\n\35\300o\364\373\305\356\35\24{\302\200\242\346\22\241\256\326...,
2812 unfinished ...
[pid 32221] write(91,
\347\2\22\36\334\222\2525g\215\342\352A\324\246\340\7\265(\205n\362\215\34az\363\37Up\213...,
1789 unfinished ...
[pid 3] ... write resumed ) = -1 EAGAIN (Resource temporarily
unavailable)
[pid 32221] ... write resumed ) = -1 EAGAIN (Resource temporarily
unavailable)
[pid 3] write(94,
\276\275\263zN\n\20^\35\200\3.\5\n\35\300o\364\373\305\356\35\24{\302\200\242\346\22\241\256\326...,
2812 unfinished ...
[pid 32221] write(91,
\347\2\22\36\334\222\2525g\215\342\352A\324\246\340\7\265(\205n\362\215\34az\363\37Up\213...,
1789 unfinished ...
[pid 3] ... write resumed ) = -1 EAGAIN (Resource temporarily
unavailable)
[pid 32221] ... write resumed ) = -1 EAGAIN (Resource temporarily
unavailable)
...
Possible patch:
Add polling for writing with the timeout before the next ssl socket write
attempt in case of EAGAIN
--- tomcat-native-1.1.22-src/jni/native/src/sslnetwork.c
+++ tomcat-native-1.1.22-src/jni/native/src/sslnetwork.c
@@ -471,7 +471,7 @@
break;
case SSL_ERROR_WANT_READ:
case SSL_ERROR_WANT_WRITE:
-if (nb i == SSL_ERROR_WANT_WRITE) {
+if (nb i == SSL_ERROR_WANT_WRITE
!APR_STATUS_IS_EAGAIN(os) ) {
*len = 0;
return APR_SUCCESS;
}
--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52858] New: High CPU load in the NIO connector, when a client breaks connection unexpectedly
https://issues.apache.org/bugzilla/show_bug.cgi?id=52858
Bug #: 52858
Summary: High CPU load in the NIO connector, when a client
breaks connection unexpectedly
Product: Tomcat 7
Version: 7.0.26
Platform: PC
OS/Version: Linux
Status: NEW
Severity: major
Priority: P2
Component: Connectors
AssignedTo: dev@tomcat.apache.org
ReportedBy: dmitry.kukush...@external.telekom.de
Classification: Unclassified
How to reproduce:
Tomcat with the NIO connector, using HTTPS scheme, when a client requests for
some quite a big (~100K-200K) static file, and breaks the connection
unexpectedly.
Here is the python script to reproduce the problem:
# The way to reproduce the bug in the Tomcat NIO connector.
# Install python-iptables from https://github.com/ldx/python-iptables/downloads
# Author: Dmitry Kukushkin (dmitry.kukushkin at external.telekom.de)
from threading import Thread
from threading import Lock
from socket import *
from select import *
from time import *
from traceback import *
import ssl
import sys
import iptc
blockedPorts = dict()
getCssRequest = GET /some big file HTTP/1.1\r
Host: host:port\r
User-Agent: Mozilla/5.0 (iPhone; CPU iPhone OS 5_0_1 like Mac OS X)
AppleWebKit/534.46 (KHTML, like Gecko) Mobile/9A406\r
Accept: text/css,*/*;q=0.1\r
Accept-Language: de-de\r
Accept-Encoding: gzip, deflate\r
Connection: keep-alive\r\n
\r\n
class Client(Thread):
def __init__(self, tid, lock):
Thread.__init__(self)
self.lock = lock
self.tid = tid
def run(self):
print Starting thread %d % self.tid
try:
clientSocket = socket(AF_INET, SOCK_STREAM)
sslSocket = ssl.wrap_socket(clientSocket)
remoteAddr = (host, port)
sslSocket.connect(remoteAddr)
localAddr, localPort = sslSocket.getsockname()
print New socket created tid=%d, sfd=%d, sport=%d % ( self.tid,
clientSocket.fileno(), localPort )
self.deleteFirewallRule(localPort, self.lock)
sslSocket.send(getCssRequest)
data = sslSocket.recv(1024)
''' Put the socket into half - closed state '''
clientSocket.shutdown(SHUT_WR)
clientSocket.close()
self.createFirewallRule(localPort, self.lock)
except Exception, e:
print Error: , e
print_exc()
@staticmethod
def createFirewallRule(port, lock):
lock.acquire()
print Creating the iptables rule for port %d % port
rule = iptc.Rule()
rule.protocol = tcp
rule.target = iptc.Target(rule, REJECT)
match = iptc.Match(rule, tcp)
match.sport = %s % port
rule.add_match(match)
chain = iptc.Chain(iptc.TABLE_FILTER, OUTPUT)
chain.insert_rule(rule)
rule.target.reset()
blockedPorts[port] = rule
lock.release()
@staticmethod
def deleteFirewallRule(port, lock):
lock.acquire()
if port in blockedPorts:
print Deleteng the iptables rule for port %d % port
rule = blockedPorts[port]
chain = iptc.Chain(iptc.TABLE_FILTER, OUTPUT)
chain.delete_rule(rule)
chain.flush()
del blockedPorts[port]
lock.release()
if __name__ == __main__:
if len(sys.argv) == 1 :
print Problem.py number of threads
exit(0)
clients = []
lock = Lock()
for i in range( int(sys.argv[1]) ):
c = Client(i, lock)
clients.append(c)
c.start()
print Joining
for i in clients:
i.join()
The client shutdowns the socket, thus making connection half-closed, and
disappears (is blocked by firewall in case of this script). This results in a
high CPU load:
Servers polls the socket descriptor for both reading and writing, and gets
EPOLLIN event on this half-closed connection, then it is trying to write,
failing with EAGAIN, polling sd for writing and reading events again, getting
EPOLLIN, trying to write... and so on, as you can see from the attached strace
snippet:
...
[pid 26206] epoll_ctl(50, EPOLL_CTL_DEL, 51, {0, {u32=51, u64=34359738419}}) =
0
[pid 26206] gettimeofday({1331211762, 650946}, NULL) = 0
[pid 26206] epoll_wait(50, unfinished ...
[pid 26199] ... epoll_wait resumed {{EPOLLIN, {u32=40,
u64=7266968735074746408}}}, 4096, 1000) = 1
[pid 26199] read(40, \1, 128) = 1
[pid 26199] gettimeofday({1331211762, 652745}, NULL) = 0
[pid 26199] epoll_wait(43, unfinished ...
[pid 26206] ... epoll_wait resumed {{EPOLLIN, {u32=48,
u64=6182845940760624}}}, 4096, 1000) = 1
[pid 26206] read(48, \1, 128) = 1
[pid 26206] gettimeofday({1331211762, 675214}, NULL) = 0
[pid 26206] gettimeofday({1331211762, 675294}, NULL) = 0
[pid 26206] gettimeofday({1331211762, 675378}, NULL) = 0
[pid 26206] epoll_ctl(50, EPOLL_CTL_ADD, 51, {EPOLLOUT, {u32=51,
svn commit: r1298424 - /tomcat/jk/trunk/native/apache-2.0/Makefile.vc
Author: mturk
Date: Thu Mar 8 15:07:41 2012
New Revision: 1298424
URL: http://svn.apache.org/viewvc?rev=1298424view=rev
Log:
Use APACHE24_HOME instead APACHE23 and allow passing ARCH
Modified:
tomcat/jk/trunk/native/apache-2.0/Makefile.vc
Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.vc?rev=1298424r1=1298423r2=1298424view=diff
==
--- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original)
+++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Thu Mar 8 15:07:41 2012
@@ -20,10 +20,10 @@ OUTDIR=.\Release20
INTDIR=.\Release20
APACHE2_HOME=$(APACHE20_HOME)
!ELSE
-!IFDEF APACHE23_HOME
-APACHE2_HOME=$(APACHE23_HOME)
-OUTDIR=.\Release23
-INTDIR=.\Release23
+!IFDEF APACHE24_HOME
+APACHE2_HOME=$(APACHE24_HOME)
+OUTDIR=.\Release24
+INTDIR=.\Release24
!ELSE
!IFDEF APACHE22_HOME
APACHE2_HOME=$(APACHE22_HOME)
@@ -34,7 +34,6 @@ INTDIR=.\Release22
APR_LIB=libapr-1.lib
APU_LIB=libaprutil-1.lib
!ENDIF
-
!IFNDEF APACHE2_HOME
!ERROR Missing APACHE2_HOME environment variable.
!ENDIF
@@ -43,6 +42,7 @@ TARGET=mod_jk$(SO_VERSION)$(SO_HTTPD_VER
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
+ARCH=X86
ALL : $(OUTDIR)\$(TARGET).so
@@ -85,7 +85,7 @@ BSC32_FLAGS=/nologo /o$(OUTDIR)\$(TARGE
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=libhttpd.lib $(APR_LIB) $(APU_LIB) kernel32.lib user32.lib
advapi32.lib mswsock.lib ws2_32.lib $(EXTRA_LIBS) /nologo /base:0x6A6B
/subsystem:windows /dll /incremental:no /pdb:$(OUTDIR)\$(TARGET).pdb /debug
/machine:I386 /out:$(OUTDIR)\$(TARGET).so /implib:$(OUTDIR)\mod_jk.lib
/libpath:$(APACHE2_HOME)\lib /opt:ref
+LINK32_FLAGS=libhttpd.lib $(APR_LIB) $(APU_LIB) kernel32.lib user32.lib
advapi32.lib mswsock.lib ws2_32.lib $(EXTRA_LIBS) /nologo /base:0x6A6B
/subsystem:windows /dll /incremental:no /pdb:$(OUTDIR)\$(TARGET).pdb /debug
/machine:$(ARCH) /out:$(OUTDIR)\$(TARGET).so /implib:$(OUTDIR)\mod_jk.lib
/libpath:$(APACHE2_HOME)\lib /opt:ref
LINK32_OBJS= \
$(INTDIR)\jk_ajp12_worker.obj \
$(INTDIR)\jk_ajp13.obj \
@@ -118,7 +118,7 @@ LINK32_OBJS= \
mt -nologo -manifest $(OUTDIR)\$(TARGET).manifest
-outputresource:$(OUTDIR)\$(TARGET).so;2
-CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I ..\common /I
$(APACHE2_HOME)\include /D NDEBUG /D WIN32 /D _WINDOWS /Fo$(INTDIR)\\
/Fd$(INTDIR)\mod_jk_src /FD /c
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I ..\common /I
$(APACHE2_HOME)\include /D NDEBUG /D WIN32 /D _WINDOWS $(CFLAGS)
/Fo$(INTDIR)\\ /Fd$(INTDIR)\mod_jk_src /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52545] Annotations are processed for servlet 2.4 applications
https://issues.apache.org/bugzilla/show_bug.cgi?id=52545 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||INVALID --- Comment #5 from Mark Thomas ma...@apache.org 2012-03-08 15:36:08 UTC --- The test application is not a valid Servlet 2.4 application. The issues are: - The application has been compiled against a later version of the Servlet API. It is therefore possible that it may call methods that are not valid in Servlet 2.4. Tomcat makes no efforts to ensure that applications claiming a particular version of the specification do not use API calls from a later version of the specification unless the specification explicitly requires it to provide special handling (e.g. for backwards compatibility). To provide general protection of this nature would add complexity and impact performance to address what is essentially a build issue. - The application can not be compiled using a 1.4 JDK (the minimum Java version required by Servlet 2.4) since it uses annotations. While applications may be compiled with a later Java version, they must be compilable with the minimum Java version. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: WebSocket status
Speaking of thread safety, in the APR connector, when SSL is used, it may be possible to hit some problems if read and write are called at same time from different threads on same socket - SSL_read and SSL_write share the same context and apparently are not safe. I don't know if websocket allows a thread to send messages while another receives - it is a problem for spdy ( visible when load testing ). Servlets are not affected. There are 2 solutions I know so far - both of them require setting the socket in non-blocking mode, but I found few other small bugs in the process, it seems to take much more time than I have free. Costin On Thu, Mar 8, 2012 at 1:12 AM, Johno Crawford johno.crawf...@sulake.comwrote: On 2/03/2012 2:29 PM, Filip Hanik - Dev Lists wrote: On 3/2/2012 2:13 AM, Mark Thomas wrote: You can't register on a selector using another thread. Bingo. That explains it. Is that documented anywhere? I'm not sure if the java.nio documentation says it, I think it does. The Selector object is not thread safe. trying to manipulate interestops and selectors from multiple threads, can lead to dead locks According to the docs selectors themselves are safe for use by multiple concurrent threads, their keys however, are not [1]. What's next / left on the TODO list Mark? Anything I can help out with? I'm off for the weekend, address the other stuff next week. Enjoy the weekend! Cheers, Johno [1] http://docs.oracle.com/javase/**1.5.0/docs/api/java/nio/** channels/Selector.htmlhttp://docs.oracle.com/javase/1.5.0/docs/api/java/nio/channels/Selector.html(Concurrency) --**--**- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.**orgdev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1298476 - in /tomcat/trunk: java/org/apache/catalina/realm/ webapps/docs/config/
Author: schultz
Date: Thu Mar 8 17:22:29 2012
New Revision: 1298476
URL: http://svn.apache.org/viewvc?rev=1298476view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52500
Added configurable mechanism to retrieve user names from X509 client
certificates. Based on a patch provided by Michael Furman.
Added:
tomcat/trunk/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
tomcat/trunk/java/org/apache/catalina/realm/X509UsernameRetriever.java
Modified:
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/webapps/docs/config/realm.xml
Modified: tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties?rev=1298476r1=1298475r2=1298476view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties Thu Mar
8 17:22:29 2012
@@ -60,6 +60,11 @@ realmBase.hasRoleSuccess=Username {0} ha
realmBase.authenticateFailure=Username {0} NOT successfully authenticated
realmBase.authenticateSuccess=Username {0} successfully authenticated
realmBase.gssNameFail=Failed to extract name from established GSSContext
+realmBase.gotX509Username=Got user name from X509 certificate: {0}
+realmBase.createUsernameRetriever.ClassCastException=Class {0} is not an
X509UsernameRetriever.
+realmBase.createUsernameRetriever.ClassNotFoundException=Cannot find class {0}.
+realmBase.createUsernameRetriever.InstantiationException=Cannot create object
of type {0}.
+realmBase.createUsernameRetriever.IllegalAccessException=Cannot create object
of type {0}.
userDatabaseRealm.lookup=Exception looking up UserDatabase under key {0}
userDatabaseRealm.noDatabase=No UserDatabase component found under key {0}
dataSourceRealm.authenticateFailure=Username {0} NOT successfully authenticated
Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1298476r1=1298475r2=1298476view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Thu Mar 8
17:22:29 2012
@@ -136,6 +136,16 @@ public abstract class RealmBase extends
*/
protected boolean validate = true;
+/**
+ * The name of the class to use for retrieving user names from X509
+ * certificates.
+ */
+protected String x509UsernameRetrieverClassName;
+
+/**
+ * The object that will extract user names from X509 client certificates.
+ */
+protected X509UsernameRetriever x509UsernameRetriever;
/**
* The all role mode.
@@ -266,6 +276,29 @@ public abstract class RealmBase extends
}
+/**
+ * Gets the name of the class that will be used to extract user names
+ * from X509 client certificates.
+ * @return The name of the class that will be used to extract user names
+ * from X509 client certificates.
+ */
+public String getX509UsernameRetrieverClassName()
+{
+return x509UsernameRetrieverClassName;
+}
+
+/**
+ * Sets the name of the class that will be used to extract user names
+ * from X509 client certificates. The class must implement
+ * {@see X509UsernameRetriever}.
+ *
+ * @param className The name of the class that will be used to extract
user names
+ * from X509 client certificates.
+ */
+public void setX509UsernameRetrieverClassName(String className)
+{
+this.x509UsernameRetrieverClassName = className;
+}
public boolean isStripRealmForGss() {
return stripRealmForGss;
@@ -1034,6 +1067,8 @@ public abstract class RealmBase extends
if (container != null) {
this.containerLog = container.getLogger();
}
+
+x509UsernameRetriever =
createUsernameRetriever(x509UsernameRetrieverClassName);
}
/**
@@ -1191,7 +1226,12 @@ public abstract class RealmBase extends
* Return the Principal associated with the given certificate.
*/
protected Principal getPrincipal(X509Certificate usercert) {
-return(getPrincipal(usercert.getSubjectDN().getName()));
+String username = x509UsernameRetriever.getUsername(usercert);
+
+if(log.isDebugEnabled())
+log.debug(sm.getString(realmBase.gotX509Username, username));
+
+return(getPrincipal(username));
}
@@ -1391,4 +1431,23 @@ public abstract class RealmBase extends
}
}
+private static X509UsernameRetriever createUsernameRetriever(String
svn commit: r1298479 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/realm/ webapps/docs/ webapps/docs/config/
Author: schultz
Date: Thu Mar 8 17:34:53 2012
New Revision: 1298479
URL: http://svn.apache.org/viewvc?rev=1298479view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52500
Added configurable mechanism to retrieve user names from X509 client
certificates. Based on a patch provided by Michael Furman.
Added:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
- copied unchanged from r1298476,
tomcat/trunk/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/X509UsernameRetriever.java
- copied unchanged from r1298476,
tomcat/trunk/java/org/apache/catalina/realm/X509UsernameRetriever.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties?rev=1298479r1=1298478r2=1298479view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties
Thu Mar 8 17:34:53 2012
@@ -76,6 +76,11 @@ realmBase.authenticateFailure=Username {
realmBase.authenticateSuccess=Username {0} successfully authenticated
realmBase.gssNameFail=Failed to extract name from established GSSContext
userDatabaseRealm.authenticateError=Login configuration error authenticating
username {0}
+realmBase.gotX509Username=Got user name from X509 certificate: {0}
+realmBase.createUsernameRetriever.ClassCastException=Class {0} is not an
X509UsernameRetriever.
+realmBase.createUsernameRetriever.ClassNotFoundException=Cannot find class {0}.
+realmBase.createUsernameRetriever.InstantiationException=Cannot create object
of type {0}.
+realmBase.createUsernameRetriever.IllegalAccessException=Cannot create object
of type {0}.
userDatabaseRealm.lookup=Exception looking up UserDatabase under key {0}
userDatabaseRealm.noDatabase=No UserDatabase component found under key {0}
userDatabaseRealm.noEngine=No Engine component found in container hierarchy
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1298479r1=1298478r2=1298479view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java Thu Mar
8 17:34:53 2012
@@ -148,6 +148,11 @@ public abstract class RealmBase extends
/**
+ * The object that will extract user names from X509 client certificates.
+ */
+protected X509UsernameRetriever x509UsernameRetriever;
+
+/**
* The all role mode.
*/
protected AllRolesMode allRolesMode = AllRolesMode.STRICT_MODE;
@@ -288,6 +293,29 @@ public abstract class RealmBase extends
}
+/**
+ * Gets the name of the class that will be used to extract user names
+ * from X509 client certificates.
+ * @return The name of the class that will be used to extract user names
+ * from X509 client certificates.
+ */
+public String getX509UsernameRetrieverClassName()
+{
+return x509UsernameRetrieverClassName;
+}
+
+/**
+ * Sets the name of the class that will be used to extract user names
+ * from X509 client certificates. The class must implement
+ * {@see X509UsernameRetriever}.
+ *
+ * @param className The name of the class that will be used to extract
user names
+ * from X509 client certificates.
+ */
+public void setX509UsernameRetrieverClassName(String className)
+{
+this.x509UsernameRetrieverClassName = className;
+}
public boolean isStripRealmForGss() {
return stripRealmForGss;
@@ -1056,6 +1084,8 @@ public abstract class RealmBase extends
if (container != null) {
this.containerLog = container.getLogger();
}
+
+x509UsernameRetriever =
createUsernameRetriever(x509UsernameRetrieverClassName);
}
/**
@@ -1213,7 +1243,12 @@ public abstract class RealmBase extends
* Return the Principal associated with the given certificate.
*/
protected Principal getPrincipal(X509Certificate usercert) {
-return(getPrincipal(usercert.getSubjectDN().getName()));
+String username = x509UsernameRetriever.getUsername(usercert);
+
+if(log.isDebugEnabled())
+
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/435 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1298479 Blamelist: schultz BUILD FAILED: failed compile sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1298485 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: schultz Date: Thu Mar 8 17:52:12 2012 New Revision: 1298485 URL: http://svn.apache.org/viewvc?rev=1298485view=rev Log: Added back-port proposal. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1298485r1=1298484r2=1298485view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Mar 8 17:52:12 2012 @@ -148,6 +148,12 @@ PATCHES PROPOSED TO BACKPORT: +1: kfujino -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52500 + Add configurable mechanism to retrieve user names from X509 client certificates. + trunk patch: http://svn.apache.org/viewvc?view=revisionrevision=r1298476 + +1: schultz + -1: + PATCHES/ISSUES THAT ARE STALLED * Backport JSP unloading patch (BZ48358). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52500] Improve client certificate authentication
https://issues.apache.org/bugzilla/show_bug.cgi?id=52500 Christopher Schultz ch...@christopherschultz.net changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #33 from Christopher Schultz ch...@christopherschultz.net 2012-03-08 17:52:52 UTC --- Michael, I've applied a simplified patch based upon yours. The differences are: 1. No 'X509UsernameRetrieverConfiguration' attribute. This can be handled with a custom class instead of the more complicated proposed configuration. 2. X509SubjectDNRetriever trivially returns cert.getSubjectDN().getName(), since the above change was made. I will likely be adding a form of /your/ X509SubjectDNUsernameRetriever class that is intended to be subclassed to provide the name of the SubjectDN attribute you'd like to use. Fixed in trunk in r1298476. Fixed in 7.0.x in r1298479. Will be included in 7.0.27. Proposed for 6.0.x. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
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/2832 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1298476 Blamelist: schultz Build succeeded! sincerely, -The Buildbot
DO NOT REPLY [Bug 52850] Various miscellaneous fixes to Tomcat Memory Leak Detection code
https://issues.apache.org/bugzilla/show_bug.cgi?id=52850 Rohit Kelapure kelap...@gmail.com changed: What|Removed |Added Attachment #28433|0 |1 is obsolete|| --- Comment #4 from Rohit Kelapure kelap...@gmail.com 2012-03-08 18:19:21 UTC --- Created attachment 28442 -- https://issues.apache.org/bugzilla/attachment.cgi?id=28442 reworked patch after making some modifications to loadedByThisOrChild -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1298485 - /tomcat/tc6.0.x/trunk/STATUS.txt
1. TC 7.0 backport fails to compile: http://ci.apache.org/builders/tomcat-7-trunk/builds/435/steps/compile/logs/stdio 2. svn:eol-style on new files. 2012/3/8 schu...@apache.org: Author: schultz Date: Thu Mar 8 17:52:12 2012 New Revision: 1298485 URL: http://svn.apache.org/viewvc?rev=1298485view=rev Log: Added back-port proposal. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1298485r1=1298484r2=1298485view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Mar 8 17:52:12 2012 @@ -148,6 +148,12 @@ PATCHES PROPOSED TO BACKPORT: +1: kfujino -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52500 + Add configurable mechanism to retrieve user names from X509 client certificates. + trunk patch: http://svn.apache.org/viewvc?view=revisionrevision=r1298476 + +1: schultz + -1: + PATCHES/ISSUES THAT ARE STALLED * Backport JSP unloading patch (BZ48358). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52842] MBeanDumper dumpBeans SEVERE: Error getting attribute while using JMXProxy servlet
https://issues.apache.org/bugzilla/show_bug.cgi?id=52842 --- Comment #5 from Christopher Schultz ch...@christopherschultz.net 2012-03-08 19:17:39 UTC --- (In reply to comment #4) Since the Tomcat JDBC pool is part of Tomcat 7 is there a better way to view the pool properties through JMX than exposing through the Spring MBeanExporter? While the pool is properly part of Tomcat 7, I believe there's no reason it wasn't be used with Tomcat 6 (but I haven't tried it). I think you've mentioned using the JMXProxyServlet... is that an acceptable alternative? If you have further questions, please use the users' list instead of BZ. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1298529 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
Author: schultz Date: Thu Mar 8 19:26:59 2012 New Revision: 1298529 URL: http://svn.apache.org/viewvc?rev=1298529view=rev Log: Fixed poor merge conflict resolution. Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1298529r1=1298528r2=1298529view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java Thu Mar 8 19:26:59 2012 @@ -146,7 +146,12 @@ public abstract class RealmBase extends */ protected boolean validate = true; - +/** + * The name of the class to use for retrieving user names from X509 + * certificates. + */ +protected String x509UsernameRetrieverClassName; + /** * The object that will extract user names from X509 client certificates. */ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1298485 - /tomcat/tc6.0.x/trunk/STATUS.txt
Konstantin, On 3/8/12 2:16 PM, Konstantin Kolinko wrote: 1. TC 7.0 backport fails to compile: http://ci.apache.org/builders/tomcat-7-trunk/builds/435/steps/compile/logs/stdio Bad merge :( Fixed. 2. svn:eol-style on new files. Stupid question: how do I do that? I'm happy to adjust on CLI or from within Eclipse. -chris signature.asc Description: OpenPGP digital signature
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/436 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1298529 Blamelist: schultz Build succeeded! sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1298485 - /tomcat/tc6.0.x/trunk/STATUS.txt
2012/3/8 Christopher Schultz ch...@christopherschultz.net: 2. svn:eol-style on new files. Stupid question: how do I do that? I'm happy to adjust on CLI or from within Eclipse. 1. To prevent it from happening: you configure auto-props setting in Subversion See here: http://www.apache.org/dev/version-control.html#https-svn-config - http://www.apache.org/dev/svn-eol-style.txt Theory: http://svnbook.red-bean.com/en/1.7/svn.advanced.confarea.html#svn.advanced.confarea.opts.config - enable-auto-props + [auto-props] 2. Once it happened: You set the property manually (using svn propset command or a GUI) and then commit. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1298542 - in /tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm: X509SubjectDnRetriever.java X509UsernameRetriever.java
Author: schultz Date: Thu Mar 8 19:59:59 2012 New Revision: 1298542 URL: http://svn.apache.org/viewvc?rev=1298542view=rev Log: Fixed eol-style. Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/X509SubjectDnRetriever.java (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/X509UsernameRetriever.java (props changed) Propchange: tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/X509SubjectDnRetriever.java -- svn:eol-style = native Propchange: tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/X509UsernameRetriever.java -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1298545 - in /tomcat/trunk/java/org/apache/catalina/realm: X509SubjectDnRetriever.java X509UsernameRetriever.java
Author: schultz Date: Thu Mar 8 20:00:48 2012 New Revision: 1298545 URL: http://svn.apache.org/viewvc?rev=1298545view=rev Log: Fixed eol-style. Modified: tomcat/trunk/java/org/apache/catalina/realm/X509SubjectDnRetriever.java (props changed) tomcat/trunk/java/org/apache/catalina/realm/X509UsernameRetriever.java (props changed) Propchange: tomcat/trunk/java/org/apache/catalina/realm/X509SubjectDnRetriever.java -- svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/realm/X509UsernameRetriever.java -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: WebSocket status
On 08/03/2012 09:12, Johno Crawford wrote: What's next / left on the TODO list Mark? Anything I can help out with? Porting the generic HTTP upgrade followed by the WebSocket code to 7.0.x. I don't think there is much for you to do there. WebSocket needs some documentation. My plan was to keep it light and point to the examples / Javadoc as much as possible. Performance / scalability with large numbers of users / connections needs looking at. API tweaks will come as folks start to use to but we need to get it into 7.0.x for that to happen. Look at what needs to be done to align with Jetty's API with a view to possibly moving to a shared common API. There is a WebSocket EG starting up and if that comes up with an API quickly, we may just move to that instead. If there are simple changes we can make now to align with Jetty that will make things easier for users so we should consider them. Costin's point re APR and threading. Maybe a chat example app? After all, everyone else seems to have one ;) Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/2833 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1298545 Blamelist: schultz BUILD FAILED: failed compile_1 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-124) tomcat-maven-archetype unused generation parameters
[
https://issues.apache.org/jira/browse/MTOMCAT-124?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
patrick garcia updated MTOMCAT-124:
---
Attachment: MTOMCAT-124-tomcat-maven-archetype.patch
Hear is the patch with the improvements I proposed:
MTOMCAT-124-tomcat-maven-archetype.patch
This patch has been done on revision 1297937.
As a commit message I would say:
tomcat-maven-archetype improvement :
- artifactId of main archetype is used as prefix for sub module artifactId
- groupId is not anymore hardcode
- package is not anymore half hardcode
- version is back to the default behaviour (type enter for the default value)
- base IT goals has been modified for a batch call with no GUI
- customized IT has been add with goals that calls GUI
tomcat-maven-archetype unused generation parameters
---
Key: MTOMCAT-124
URL: https://issues.apache.org/jira/browse/MTOMCAT-124
Project: Apache Tomcat Maven Plugin
Issue Type: Improvement
Affects Versions: 2.0-beta-1
Reporter: patrick garcia
Priority: Trivial
Labels: archetype, maven, tomcat
Attachments: MTOMCAT-124-tomcat-maven-archetype.patch
I found several problems on the superb and very useful
tomcat-maven-archetype
The improvement I propos are the followings:
1/
groupId and version can have default values but should be prompt for user
value the same way as for version of
org.apache.maven.archetypes:maven-archetype-quickstart:1.1
org.apache.maven.archetypes:maven-archetype-quickstart:1.1 proposes a
default version and prompt the user for modification at the same time.
Pressing enter validate the default value.
2/
Following variables are not in used:
artifactId-api
artifactId-api-impl
artifactId-webapp
artifactId-webapp-exec
artifactId-webapp-it
This variables should impact the mvn archetype:generate behaviour
3/
I propos to change the default values of :
artifactId-api = ${artifactId}-api
artifactId-api-impl = ${artifactId}-api-impl
artifactId-webapp = ${artifactId}-webapp
artifactId-webapp-exec = ${artifactId}-webapp-exec
artifactId-webapp-it = ${artifactId}-webapp-it
4/
rootArtifactId cat be renamed as artifactId with no default value
I will propos patches for this later. I, first, have to understand
archetype framework.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Two performance problems (found during myfaces testing)
Hi,
we did performance tests in myfaces core project recently and we found
two performance problems in tomcat (7.0.26):
1) javax.el.ExpressionFactory.newInstance() does not cache instance
created with javax.el.ExpressionFactory.newInstance. - every invocation
of this method reads service .properties file again and accesses disk.
This was discussed a time ago [1], but I forgot to report it.
2) org.apache.catalina.core.ContainerBase.fireContainerEvent;
That method contains critical section:
synchronized (listeners) {
list = listeners.toArray(list);
}
Is is called pretty often with every put operation into request or
session map. That code in tomcat looks like a candidate for
CopyOnWriteArrayList
Can I create a bugzilla ticket fot those two?
Regards,
Kočičák
[1] http://www.mail-archive.com/dev@myfaces.apache.org/msg48482.html
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1298577 - in /tomcat/trunk/java/org/apache/catalina/realm: RealmBase.java X509UsernameRetriever.java
Author: schultz
Date: Thu Mar 8 20:59:27 2012
New Revision: 1298577
URL: http://svn.apache.org/viewvc?rev=1298577view=rev
Log:
Fixed two javadoc complaints.
Modified:
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/realm/X509UsernameRetriever.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1298577r1=1298576r2=1298577view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Thu Mar 8
20:59:27 2012
@@ -290,10 +290,11 @@ public abstract class RealmBase extends
/**
* Sets the name of the class that will be used to extract user names
* from X509 client certificates. The class must implement
- * {@see X509UsernameRetriever}.
+ * X509UsernameRetriever.
*
* @param className The name of the class that will be used to extract
user names
* from X509 client certificates.
+ * @see X509UsernameRetriever
*/
public void setX509UsernameRetrieverClassName(String className)
{
Modified: tomcat/trunk/java/org/apache/catalina/realm/X509UsernameRetriever.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/X509UsernameRetriever.java?rev=1298577r1=1298576r2=1298577view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/X509UsernameRetriever.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/X509UsernameRetriever.java Thu
Mar 8 20:59:27 2012
@@ -29,5 +29,5 @@ public interface X509UsernameRetriever {
* @return An appropriate user name obtained from one or more fields
* in the certificate.
*/
-public String getUsername(X509Certificate clientCert);
+public String getUsername(X509Certificate cert);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1298579 - in /tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm: RealmBase.java X509UsernameRetriever.java
Author: schultz
Date: Thu Mar 8 21:01:53 2012
New Revision: 1298579
URL: http://svn.apache.org/viewvc?rev=1298579view=rev
Log:
Fixed javadoc complaint.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/X509UsernameRetriever.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1298579r1=1298578r2=1298579view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java Thu Mar
8 21:01:53 2012
@@ -312,10 +312,12 @@ public abstract class RealmBase extends
/**
* Sets the name of the class that will be used to extract user names
* from X509 client certificates. The class must implement
- * {@see X509UsernameRetriever}.
+ * X509UsernameRetriever.
*
* @param className The name of the class that will be used to extract
user names
* from X509 client certificates.
+ *
+ * @see X509UsernameRetriever.
*/
public void setX509UsernameRetrieverClassName(String className)
{
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/X509UsernameRetriever.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/X509UsernameRetriever.java?rev=1298579r1=1298578r2=1298579view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/X509UsernameRetriever.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/X509UsernameRetriever.java
Thu Mar 8 21:01:53 2012
@@ -29,5 +29,5 @@ public interface X509UsernameRetriever {
* @return An appropriate user name obtained from one or more fields
* in the certificate.
*/
-public String getUsername(X509Certificate clientCert);
+public String getUsername(X509Certificate cert);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52861] New: WebappClassLoader stopped too early in webapp shutdown cycle
https://issues.apache.org/bugzilla/show_bug.cgi?id=52861
Bug #: 52861
Summary: WebappClassLoader stopped too early in webapp shutdown
cycle
Product: Tomcat 6
Version: 6.0.29
Platform: PC
OS/Version: Linux
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: n...@plusgrade.com
Classification: Unclassified
I have a webapp that fails on shutdown in the following code block from Spring
Framework's AbstractApplicationContext (spring-context-3.0.6.jar,
AbstractApplicationContext.java line 1013:)
// Stop all Lifecycle beans, to avoid delays during individual destruction.
try {
getLifecycleProcessor().onClose();
}
catch (Throwable ex) {
logger.warn(Exception thrown from LifecycleProcessor on context close,
ex);
}
What is happening is that the catch block is reached for whatever reason, and
then the call to logger.warn() fails with the following exception if the
webapp has not loaded these classes prior to being shut down:
SEVERE: Servlet X threw unload() exception
javax.servlet.ServletException: Servlet.destroy() for servlet offers threw
exception
[snip]
Caused by: java.lang.NoClassDefFoundError:
org/apache/log4j/spi/ThrowableInformation
I see the WebappClassloader implements Lifecycle and provides start()/stop()
methods and I assume that it has been stopped prior to invoking the web app's
shutdown listeners. If that is the case, it seems like this is the wrong order
for those two operations.
--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1298590 - in /tomcat/trunk/java/org/apache/catalina/realm: RealmBase.java X509SubjectDnRetriever.java
Author: markt
Date: Thu Mar 8 21:25:31 2012
New Revision: 1298590
URL: http://svn.apache.org/viewvc?rev=1298590view=rev
Log:
Fix various Checkstyle / Eclipse warnings and failures
Modified:
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1298590r1=1298589r2=1298590view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Thu Mar 8
21:25:31 2012
@@ -1068,7 +1068,7 @@ public abstract class RealmBase extends
if (container != null) {
this.containerLog = container.getLogger();
}
-
+
x509UsernameRetriever =
createUsernameRetriever(x509UsernameRetrieverClassName);
}
@@ -1440,7 +1440,7 @@ public abstract class RealmBase extends
try {
@SuppressWarnings(unchecked)
Class? extends X509UsernameRetriever clazz = (Class? extends
X509UsernameRetriever)Class.forName(className);
-return (X509UsernameRetriever)clazz.newInstance();
+return clazz.newInstance();
} catch (ClassNotFoundException e) {
throw new
LifecycleException(sm.getString(realmBase.createUsernameRetriever.ClassNotFoundException,
className), e);
} catch (InstantiationException e) {
Modified:
tomcat/trunk/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/X509SubjectDnRetriever.java?rev=1298590r1=1298589r2=1298590view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/X509SubjectDnRetriever.java Thu
Mar 8 21:25:31 2012
@@ -22,8 +22,9 @@ import java.security.cert.X509Certificat
* An X509UsernameRetriever that returns a certificate's entire
* SubjectDN as the username.
*/
-public class X509SubjectDnRetriever
-implements X509UsernameRetriever {
+public class X509SubjectDnRetriever implements X509UsernameRetriever {
+
+@Override
public String getUsername(X509Certificate clientCert) {
return clientCert.getSubjectDN().getName();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52861] WebappClassLoader stopped too early in webapp shutdown cycle
https://issues.apache.org/bugzilla/show_bug.cgi?id=52861 --- Comment #1 from Nathan Bryant n...@plusgrade.com 2012-03-08 21:27:57 UTC --- See also http://java.net/jira/browse/GLASSFISH-16712 -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
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/2834 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1298577 Blamelist: schultz Build succeeded! sincerely, -The Buildbot
svn commit: r1298592 - /tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
Author: markt
Date: Thu Mar 8 21:30:35 2012
New Revision: 1298592
URL: http://svn.apache.org/viewvc?rev=1298592view=rev
Log:
Fix the brackets
Modified:
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1298592r1=1298591r2=1298592view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Thu Mar 8
21:30:35 2012
@@ -282,8 +282,7 @@ public abstract class RealmBase extends
* @return The name of the class that will be used to extract user names
* from X509 client certificates.
*/
-public String getX509UsernameRetrieverClassName()
-{
+public String getX509UsernameRetrieverClassName() {
return x509UsernameRetrieverClassName;
}
@@ -296,8 +295,7 @@ public abstract class RealmBase extends
* from X509 client certificates.
* @see X509UsernameRetriever
*/
-public void setX509UsernameRetrieverClassName(String className)
-{
+public void setX509UsernameRetrieverClassName(String className) {
this.x509UsernameRetrieverClassName = className;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Two performance problems (found during myfaces testing)
2012/3/9 Martin Koci martin.kocicak.k...@gmail.com:
Hi,
we did performance tests in myfaces core project recently and we found
two performance problems in tomcat (7.0.26):
1) javax.el.ExpressionFactory.newInstance() does not cache instance
created with javax.el.ExpressionFactory.newInstance. - every invocation
of this method reads service .properties file again and accesses disk.
This was discussed a time ago [1], but I forgot to report it.
+1.
2) org.apache.catalina.core.ContainerBase.fireContainerEvent;
That method contains critical section:
synchronized (listeners) {
list = listeners.toArray(list);
}
Is is called pretty often with every put operation into request or
session map.
I see fireContainerEvent() calls in StandardSession.
Moreover those are N x M loops: a loop in StandardSession over array
of context.getApplicationEventListeners(); x a loop inside of
context.fireContainerEvent().
+1 to file.
I do not see such calls in relation to request. Where have you seen them?
That code in tomcat looks like a candidate for
CopyOnWriteArrayList
Will it eliminate a need for List - Object[] conversions?
Just a simple solution might be a ReadWriteLock.
Can I create a bugzilla ticket fot those two?
Regards,
Kočičák
[1] http://www.mail-archive.com/dev@myfaces.apache.org/msg48482.html
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1298628 - /tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java
Author: markt
Date: Thu Mar 8 22:35:55 2012
New Revision: 1298628
URL: http://svn.apache.org/viewvc?rev=1298628view=rev
Log:
Add test case for BZ 52830
Modified:
tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java
Modified: tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java?rev=1298628r1=1298627r2=1298628view=diff
==
--- tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java
(original)
+++ tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java Thu
Mar 8 22:35:55 2012
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.io.PrintWriter;
import javax.naming.Binding;
+import javax.naming.CompositeName;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingEnumeration;
@@ -35,6 +36,7 @@ import static org.junit.Assert.assertTru
import org.junit.Test;
import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.deploy.ContextEnvironment;
import org.apache.catalina.deploy.ContextResource;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
@@ -283,4 +285,62 @@ public class TestNamingContext extends T
}
}
}
+
+@Test
+public void testBug52830() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+tomcat.enableNaming();
+
+// Must have a real docBase - just use temp
+StandardContext ctx = (StandardContext)
+tomcat.addContext(, System.getProperty(java.io.tmpdir));
+
+// Create the resource
+ContextEnvironment env = new ContextEnvironment();
+env.setName(boolean);
+env.setType(Boolean.class.getName());
+env.setValue(true);
+ctx.getNamingResources().addEnvironment(env);
+
+// Map the test Servlet
+Bug52830Servlet bug52830Servlet = new Bug52830Servlet();
+Tomcat.addServlet(ctx, bug52830Servlet, bug52830Servlet);
+ctx.addServletMapping(/, bug52830Servlet);
+
+tomcat.start();
+
+ByteChunk bc = new ByteChunk();
+int rc = getUrl(http://localhost:; + getPort() + /, bc, null);
+assertEquals(200, rc);
+assertTrue(bc.toString().contains(truetrue));
+}
+
+public static final class Bug52830Servlet extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+
+public static final String JNDI_NAME = java:comp/env/boolean;
+
+@Override
+protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+
+resp.setContentType(text/plain;UTF-8);
+PrintWriter out = resp.getWriter();
+
+try {
+Context initCtx = new InitialContext();
+
+Boolean b1 = (Boolean) initCtx.lookup(JNDI_NAME);
+Boolean b2 = (Boolean) initCtx.lookup(
+new CompositeName(JNDI_NAME));
+
+out.print(b1);
+out.print(b2);
+
+} catch (NamingException ne) {
+throw new ServletException(ne);
+}
+}
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1298629 - /tomcat/trunk/java/org/apache/naming/SelectorContext.java
Author: markt
Date: Thu Mar 8 22:36:04 2012
New Revision: 1298629
URL: http://svn.apache.org/viewvc?rev=1298629view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52830
Align parseName(Name) with parseName(String) so both have the same
behaviour
Modified:
tomcat/trunk/java/org/apache/naming/SelectorContext.java
Modified: tomcat/trunk/java/org/apache/naming/SelectorContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/SelectorContext.java?rev=1298629r1=1298628r2=1298629view=diff
==
--- tomcat/trunk/java/org/apache/naming/SelectorContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/SelectorContext.java Thu Mar 8
22:36:04 2012
@@ -21,6 +21,7 @@ package org.apache.naming;
import java.util.Hashtable;
import javax.naming.Binding;
+import javax.naming.CompositeName;
import javax.naming.Context;
import javax.naming.Name;
import javax.naming.NameClassPair;
@@ -767,15 +768,22 @@ public class SelectorContext implements
protected Name parseName(Name name)
throws NamingException {
-if ((!initialContext) (!name.isEmpty())
- (name.get(0).equals(prefix))) {
-return (name.getSuffix(1));
+if (!initialContext !name.isEmpty()
+name.get(0).startsWith(prefix)) {
+if (name.get(0).equals(prefix)) {
+return name.getSuffix(1);
+} else {
+Name result = new CompositeName();
+result.add(name.get(0).substring(prefixLength));
+result.addAll(name.getSuffix(1));
+return result;
+}
} else {
if (initialContext) {
-return (name);
+return name;
} else {
-throw new NamingException
-(sm.getString(selectorContext.noJavaUrl));
+throw new NamingException(
+sm.getString(selectorContext.noJavaUrl));
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52830] DataSource JNDI lookup with javax.naming.Name failed
https://issues.apache.org/bugzilla/show_bug.cgi?id=52830 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas ma...@apache.org 2012-03-08 22:44:45 UTC --- Fixed in trunk and 7.0.x and will be included in 7.0.27 onwards. Thanks for the report. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1298635 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/naming/SelectorContext.java test/org/apache/naming/resources/TestNamingContext.java webapps/docs/changelog.xml
Author: markt Date: Thu Mar 8 22:46:08 2012 New Revision: 1298635 URL: http://svn.apache.org/viewvc?rev=1298635view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52830 Align parseName(Name) with parseName(String) so both have the same behaviour Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/naming/SelectorContext.java tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 8 22:46:08 2012 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187 381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1 201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/2837 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1298629 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
[GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 6 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build) Work ended in a state of : Failed Elapsed: 21 mins 18 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-09032012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-09032012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-09032012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-09032012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-09032012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-trunk/outp ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-tr
svn commit: r1298708 - /tomcat/jk/trunk/tools/jkbindist.sh
Author: mturk
Date: Fri Mar 9 06:24:34 2012
New Revision: 1298708
URL: http://svn.apache.org/viewvc?rev=1298708view=rev
Log:
No need to dist KEYS file
Modified:
tomcat/jk/trunk/tools/jkbindist.sh
Modified: tomcat/jk/trunk/tools/jkbindist.sh
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/jkbindist.sh?rev=1298708r1=1298707r2=1298708view=diff
==
--- tomcat/jk/trunk/tools/jkbindist.sh (original)
+++ tomcat/jk/trunk/tools/jkbindist.sh Fri Mar 9 06:24:34 2012
@@ -79,7 +79,7 @@ then
usage
exit 2
fi
-
+
case $websrv in
httpd*)
webdesc=Apache HTTP Server
@@ -98,7 +98,7 @@ esac
dist=${prefix}-${version}-${opsys}-${arch}-${websrv}
dtop=${tools}/..
-copy=KEYS LICENSE NOTICE
+copy=LICENSE NOTICE
rm -f ${copy} 2/dev/null
rm -f ${dist} 2/dev/null
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1298711 - /tomcat/jk/trunk/tools/jkbindist.sh
Author: mturk
Date: Fri Mar 9 06:30:44 2012
New Revision: 1298711
URL: http://svn.apache.org/viewvc?rev=1298711view=rev
Log:
Make sure windows dist has DOS line endings
Modified:
tomcat/jk/trunk/tools/jkbindist.sh
Modified: tomcat/jk/trunk/tools/jkbindist.sh
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/jkbindist.sh?rev=1298711r1=1298710r2=1298711view=diff
==
--- tomcat/jk/trunk/tools/jkbindist.sh (original)
+++ tomcat/jk/trunk/tools/jkbindist.sh Fri Mar 9 06:30:44 2012
@@ -15,11 +15,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
-# Make sure to set your path so that we can find
-# the following binaries:
-# cd, mkdir, cp, rm, find, zip
-
+#
+# Create windows binary distribution archive
+#
prefix=tomcat-connectors
tools=`pwd`
sign=
@@ -140,7 +138,9 @@ do
else
cp ${dtop}/native/$i .
fi
+unix2dos $i
done
+unix2dos README
# Pack
zip -9 -j ${dist}.zip $1 README ${copy}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1298714 - /tomcat/jk/trunk/tools/jkbindist.sh
Author: mturk
Date: Fri Mar 9 06:32:02 2012
New Revision: 1298714
URL: http://svn.apache.org/viewvc?rev=1298714view=rev
Log:
No need for ASL header in simple autogenerated README
Modified:
tomcat/jk/trunk/tools/jkbindist.sh
Modified: tomcat/jk/trunk/tools/jkbindist.sh
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/jkbindist.sh?rev=1298714r1=1298713r2=1298714view=diff
==
--- tomcat/jk/trunk/tools/jkbindist.sh (original)
+++ tomcat/jk/trunk/tools/jkbindist.sh Fri Mar 9 06:32:02 2012
@@ -102,23 +102,6 @@ rm -f ${copy} 2/dev/null
rm -f ${dist} 2/dev/null
rm -f ${dist}.* 2/dev/null
cat EOF README
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the License); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an AS IS BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-
Apache Tomcat Connectors - $version
Here your'll find module binaries for $webdesc.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1298715 - /tomcat/jk/trunk/tools/jkbindist.sh
Author: mturk
Date: Fri Mar 9 06:37:25 2012
New Revision: 1298715
URL: http://svn.apache.org/viewvc?rev=1298715view=rev
Log:
make sure .so file has exec perm set in case cygwin unzip is used
Modified:
tomcat/jk/trunk/tools/jkbindist.sh
Modified: tomcat/jk/trunk/tools/jkbindist.sh
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/jkbindist.sh?rev=1298715r1=1298714r2=1298715view=diff
==
--- tomcat/jk/trunk/tools/jkbindist.sh (original)
+++ tomcat/jk/trunk/tools/jkbindist.sh Fri Mar 9 06:37:25 2012
@@ -124,7 +124,7 @@ do
unix2dos $i
done
unix2dos README
-
+chmod 755 $1
# Pack
zip -9 -j ${dist}.zip $1 README ${copy}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1298716 - /tomcat/jk/trunk/native/apache-2.0/Makefile.vc
Author: mturk Date: Fri Mar 9 06:42:07 2012 New Revision: 1298716 URL: http://svn.apache.org/viewvc?rev=1298716view=rev Log: Add missing compile rule Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.vc?rev=1298716r1=1298715r2=1298716view=diff == --- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original) +++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Fri Mar 9 06:42:07 2012 @@ -282,4 +282,5 @@ SOURCE=..\common\jk_worker.c SOURCE=.\mod_jk.c $(INTDIR)\mod_jk.obj : $(SOURCE) $(INTDIR) + $(CPP) $(CPP_PROJ) $(SOURCE) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-taglibs-standard (in module tomcat-taglibs) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-taglibs-standard has an issue affecting its community integration. This issue affects 2 projects, and has been outstanding for 24 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-taglibs-standard : Standard Taglib - tomcat-taglibs-standard-install : JSP Taglibs Full details are available at: http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Optional dependency taglibs-standard-spec failed with reason build failed -INFO- Optional dependency httpunit failed with reason build failed -DEBUG- (Apache Gump generated) Apache Maven Settings in: /srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml -INFO- Failed with reason build failed -DEBUG- Maven POM in: /srv/gump/public/workspace/tomcat-taglibs/standard/pom.xml -INFO- Failed to extract fallback artifacts from Gump Repository The following work was performed: http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/gump_work/build_tomcat-taglibs_tomcat-taglibs-standard.html Work Name: build_tomcat-taglibs_tomcat-taglibs-standard (Type: Build) Work ended in a state of : Failed Elapsed: 1 sec Command Line: /opt/maven2/bin/mvn --batch-mode -DskipTests=true --settings /srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml install [Working Directory: /srv/gump/public/workspace/tomcat-taglibs/standard] M2_HOME: /opt/maven2 - at org.apache.maven.cli.compat.CompatibleMain.main(CompatibleMain.java:60) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:616) at org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:315) at org.codehaus.classworlds.Launcher.launch(Launcher.java:255) at org.codehaus.classworlds.Launcher.mainWithExitCode(Launcher.java:430) at org.codehaus.classworlds.Launcher.main(Launcher.java:375) Caused by: org.apache.maven.project.ProjectBuildingException: Cannot find parent: org.apache.taglibs:taglibs-parent for project: null:taglibs-standard:pom:1.2-SNAPSHOT for project null:taglibs-standard:pom:1.2-SNAPSHOT at org.apache.maven.project.DefaultMavenProjectBuilder.assembleLineage(DefaultMavenProjectBuilder.java:1396) at org.apache.maven.project.DefaultMavenProjectBuilder.buildInternal(DefaultMavenProjectBuilder.java:823) at org.apache.maven.project.DefaultMavenProjectBuilder.buildFromSourceFileInternal(DefaultMavenProjectBuilder.java:508) at org.apache.maven.project.DefaultMavenProjectBuilder.build(DefaultMavenProjectBuilder.java:200) at org.apache.maven.DefaultMaven.getProject(DefaultMaven.java:604) at org.apache.maven.DefaultMaven.collectProjects(DefaultMaven.java:487) at org.apache.maven.DefaultMaven.getProjects(DefaultMaven.java:391) ... 12 more Caused by: org.apache.maven.project.ProjectBuildingException: POM 'org.apache.taglibs:taglibs-parent' not found in repository: Unable to download the artifact from any repository org.apache.taglibs:taglibs-parent:pom:1-SNAPSHOT from the specified remote repositories: gump-central (http://localhost:8192/maven2) for project org.apache.taglibs:taglibs-parent at org.apache.maven.project.DefaultMavenProjectBuilder.findModelFromRepository(DefaultMavenProjectBuilder.java:605) at org.apache.maven.project.DefaultMavenProjectBuilder.assembleLineage(DefaultMavenProjectBuilder.java:1392) ... 18 more Caused by: org.apache.maven.artifact.resolver.ArtifactNotFoundException: Unable to download the artifact from any repository org.apache.taglibs:taglibs-parent:pom:1-SNAPSHOT from the specified remote repositories: gump-central (http://localhost:8192/maven2) at org.apache.maven.artifact.resolver.DefaultArtifactResolver.resolve(DefaultArtifactResolver.java:228) at org.apache.maven.artifact.resolver.DefaultArtifactResolver.resolve(DefaultArtifactResolver.java:90) at org.apache.maven.project.DefaultMavenProjectBuilder.findModelFromRepository(DefaultMavenProjectBuilder.java:558) ... 19 more Caused by: org.apache.maven.wagon.ResourceDoesNotExistException: Unable to download the artifact from any repository at
