[g...@vmgump]: Project jakarta-tomcat-catalina (in module jakarta-tomcat-catalina) failed

2010-04-10 Thread bobh
To whom it may engage...

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

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


Full details are available at:

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

That said, some information snippets are provided here.

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



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

svn commit: r932711 - /tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/session/StandardSession.java

2010-04-10 Thread markt
Author: markt
Date: Sat Apr 10 12:44:17 2010
New Revision: 932711

URL: http://svn.apache.org/viewvc?rev=932711&view=rev
Log:
Remove generics added in r932276

Modified:

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/session/StandardSession.java

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/session/StandardSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/session/StandardSession.java?rev=932711&r1=932710&r2=932711&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/session/StandardSession.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/session/StandardSession.java
 Sat Apr 10 12:44:17 2010
@@ -695,7 +695,7 @@ public class StandardSession
 context.getLoader().getClassLoader() != null) {
 oldTccl = Thread.currentThread().getContextClassLoader();
 if (System.getSecurityManager() != null) {
-PrivilegedAction pa = new PrivilegedSetTccl(
+PrivilegedAction pa = new PrivilegedSetTccl(
 context.getLoader().getClassLoader());
 AccessController.doPrivileged(pa);
 } else {
@@ -734,7 +734,7 @@ public class StandardSession
 } finally {
 if (oldTccl != null) {
 if (System.getSecurityManager() != null) {
-PrivilegedAction pa = new PrivilegedSetTccl(
+PrivilegedAction pa = new PrivilegedSetTccl(
 oldTccl);
 AccessController.doPrivileged(pa);
 } else {
@@ -1714,7 +1714,7 @@ public class StandardSession
 
 }
 
-private static class PrivilegedSetTccl implements PrivilegedAction {
+private static class PrivilegedSetTccl implements PrivilegedAction {
 
 private ClassLoader cl;
 
@@ -1722,7 +1722,7 @@ public class StandardSession
 this.cl = cl;
 }
 
-public Void run() {
+public Object run() {
 Thread.currentThread().setContextClassLoader(cl);
 return null;
 }



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



svn commit: r932717 - /tomcat/tc5.5.x/trunk/STATUS.txt

2010-04-10 Thread kkolinko
Author: kkolinko
Date: Sat Apr 10 13:44:05 2010
New Revision: 932717

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

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

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=932717&r1=932716&r2=932717&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Apr 10 13:44:05 2010
@@ -29,9 +29,11 @@ PATCHES PROPOSED TO BACKPORT:
   Warn if the user tries to set an invalid property.
   Port of http://svn.apache.org/viewvc?view=rev&revision=565464
   http://people.apache.org/~markt/patches/2009-07-02-bug38743.patch
-  +1: markt, kkolinko
+  +1: markt
0: fhanik - big step for an old branch, could be risky, I'd wait until 
after next release if we consider it
-  -1:
+  -1: kkolinko: It is reported that the change to the return type of the 
setProperty
+method in o.a.t.util.IntrospectionUtils breaks binary compatibility:
+http://marc.info/?l=tomcat-user&m=127083540720353&w=2
 
 * Minor cleanups for AccessLogValve classes
   Reuses StringBuffer, uses char instead of single-char String, etc.



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



Re: svn commit: r932717 - /tomcat/tc5.5.x/trunk/STATUS.txt

2010-04-10 Thread sebb
On 10/04/2010, kkoli...@apache.org  wrote:
> Author: kkolinko
>  Date: Sat Apr 10 13:44:05 2010
>  New Revision: 932717
>
>  URL: http://svn.apache.org/viewvc?rev=932717&view=rev
>  Log:
>  change my vote
>
>  Modified:
> tomcat/tc5.5.x/trunk/STATUS.txt
>
>  Modified: tomcat/tc5.5.x/trunk/STATUS.txt
>  URL: 
> http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=932717&r1=932716&r2=932717&view=diff
>  
> ==
>  --- tomcat/tc5.5.x/trunk/STATUS.txt (original)
>  +++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Apr 10 13:44:05 2010
>  @@ -29,9 +29,11 @@ PATCHES PROPOSED TO BACKPORT:
>Warn if the user tries to set an invalid property.
>Port of http://svn.apache.org/viewvc?view=rev&revision=565464
>http://people.apache.org/~markt/patches/2009-07-02-bug38743.patch
>  -  +1: markt, kkolinko
>  +  +1: markt
> 0: fhanik - big step for an old branch, could be risky, I'd wait until 
> after next release if we consider it
>  -  -1:
>  +  -1: kkolinko: It is reported that the change to the return type of the 
> setProperty
>  +method in o.a.t.util.IntrospectionUtils breaks binary compatibility:
>  +http://marc.info/?l=tomcat-user&m=127083540720353&w=2

This is the sort of API change that would be detected by Clirr.
Might be worth considering doing a Clirr report as part of release
candidate checking?

However, Clirr does not know which public methods are part of the
external API and which are only required to be internally consistent,
so it may generate too many false positives.

>   * Minor cleanups for AccessLogValve classes
>Reuses StringBuffer, uses char instead of single-char String, etc.
>
>
>
>  -
>  To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>  For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

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



svn commit: r932751 - /tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java

2010-04-10 Thread markt
Author: markt
Date: Sat Apr 10 15:53:14 2010
New Revision: 932751

URL: http://svn.apache.org/viewvc?rev=932751&view=rev
Log:
TCK failure (with security manager): Preload required class.

Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java

Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=932751&r1=932750&r2=932751&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Sat 
Apr 10 15:53:14 2010
@@ -62,6 +62,21 @@ public final class SecurityClassLoad {
  "core.ApplicationDispatcher$PrivilegedInclude");
 loader.loadClass
 (basePackage +
+"core.AsyncContextImpl");
+loader.loadClass
+(basePackage +
+"core.AsyncContextImpl$AsyncState");
+loader.loadClass
+(basePackage +
+"core.AsyncContextImpl$DebugException");
+loader.loadClass
+(basePackage +
+"core.AsyncContextImpl$1");
+loader.loadClass
+(basePackage +
+"core.AsyncContextImpl$2");
+loader.loadClass
+(basePackage +
  "core.ContainerBase$PrivilegedAddChild");
 loader.loadClass
 (basePackage +



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



svn commit: r932776 - /tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java

2010-04-10 Thread jfclere
Author: jfclere
Date: Sat Apr 10 18:07:39 2010
New Revision: 932776

URL: http://svn.apache.org/viewvc?rev=932776&view=rev
Log:
Add missing class.

Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java

Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=932776&r1=932775&r2=932776&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Sat 
Apr 10 18:07:39 2010
@@ -77,6 +77,9 @@ public final class SecurityClassLoad {
 "core.AsyncContextImpl$2");
 loader.loadClass
 (basePackage +
+"core.AsyncListenerWrapper");
+loader.loadClass
+(basePackage +
  "core.ContainerBase$PrivilegedAddChild");
 loader.loadClass
 (basePackage +



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



Patch suggestion

2010-04-10 Thread Pid
In lieu of of a Bugzilla enhancement (and hoping that I have the right 
end of the stick).


In class:
org.apache.catalina.startup.HostConfig

In method:
protected void deployWARs(File appBase, String[] files) {

if (files == null) {
return;
}

for (int i = 0; i < files.length; i++) {

if (files[i].equalsIgnoreCase("META-INF")) {
continue;
}
if (files[i].equalsIgnoreCase("WEB-INF")) {
continue;
}
File dir = new File(appBase, files[i]);

// Check to see if the file is a .war that is still being 
modified

if (files[i].toLowerCase().endsWith(".war")) {
long length = dir.length();
long modified = dir.lastModified();
try {
Thread.sleep(500);
}
catch (InterruptedException e) {
// Ignore this...
}
if ((dir.length() > length) || (dir.lastModified() > 
modified)) {

continue;
}
}




p


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



svn commit: r932797 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/webapps/docs/changelog.xml container/webapps/docs/config/systemprops.xml jasper/src/share/org/apache/jasper/compiler/Generator.java

2010-04-10 Thread markt
Author: markt
Date: Sat Apr 10 22:23:57 2010
New Revision: 932797

URL: http://svn.apache.org/viewvc?rev=932797&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
Add system property to allow disabling enforcement of JSP.5.3. The spec 
recommends, but does not require this enforcement. (kkolinko)

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml

tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=932797&r1=932796&r2=932797&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Apr 10 22:23:57 2010
@@ -101,13 +101,6 @@ PATCHES PROPOSED TO BACKPORT:
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
-  Add system property to allow disabling enforcement of JSP.5.3
-  The spec recommends, but does not require this enforcement.
-  http://svn.apache.org/viewvc?rev=920880&view=rev
-  +1: kkolinko, markt, rjung
-  -1:
-
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
   Tag account of TagVariableInfo when implementing the rules of JSP.5.3
   http://people.apache.org/~markt/patches/2010-03-09-bug48701.patch
   +1: markt, kkolinko

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=932797&r1=932796&r2=932797&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Sat Apr 10 
22:23:57 2010
@@ -49,6 +49,15 @@
   
 
   
+  
+
+  
+48701: Add a system property to allow disabling enforcement
+of JSP.5.3. The specification recommends, but does not require, this
+enforcement. (kkolinko)
+  
+
+  
 
 
   

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml?rev=932797&r1=932796&r2=932797&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml 
(original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml Sat Apr 
10 22:23:57 2010
@@ -38,6 +38,14 @@
 
   
 
+
+  If true, the requirement to have the object referenced in
+  jsp:getProperty action to be previously "introduced"
+  to the JSP processor, as specified in the chapter JSP.5.3 of JSP 2.0 and
+  later specifications, is enforced. If not specified, the specification
+  compliant default of true will be used.
+
+

  If false the requirements for escaping quotes in JSP
   attributes will be relaxed so that an unescaped quote will not

Modified: 
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java?rev=932797&r1=932796&r2=932797&view=diff
==
--- 
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java 
(original)
+++ 
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java 
Sat Apr 10 22:23:57 2010
@@ -66,6 +66,16 @@ import org.xml.sax.Attributes;
 class Generator {
 
 private static final Class[] OBJECT_CLASS = { Object.class };
+
+/* System property that controls if the requirement to have the object
+ * used in jsp:getProperty action to be previously "introduced"
+ * to the JSP processor (see JSP.5.3) is enforced.
+ */ 
+private static final boolean STRICT_GET_PROPERTY = Boolean.valueOf(
+System.getProperty(
+"org.apache.jasper.compiler.Generator.STRICT_GET_PROPERTY",
+"true")).booleanValue();
+
 private ServletWriter out;
 private ArrayList methodsBuffered;
 private FragmentHelperClass fragmentHelperClass;
@@ -1030,7 +1040,7 @@ class Generator {
 + "\"))."
 + methodName
 + "(;");
-} else if (varInfoNames.contains(name)){
+} else if (!STRICT_GET_PROPERTY || varInfoNames.contains(name)){
 // The object is a custom action with an associated
 // VariableInfo entry for this name.
 // Get the class name and then introspect at runtime.



-
To u

svn commit: r932798 - /tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java

2010-04-10 Thread markt
Author: markt
Date: Sat Apr 10 22:28:05 2010
New Revision: 932798

URL: http://svn.apache.org/viewvc?rev=932798&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48613
Only attempt APR initialization if the  has been specified 
(fhanik/kkolinko)

Modified:

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java?rev=932798&r1=932797&r2=932798&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
 Sat Apr 10 22:28:05 2010
@@ -46,6 +46,7 @@ public class AprLifecycleListener
 
 private static Log log = LogFactory.getLog(AprLifecycleListener.class);
 
+private static boolean instanceCreated = false;
 /**
  * The string manager for this package.
  */
@@ -71,9 +72,14 @@ public class AprLifecycleListener
 protected static boolean aprAvailable = false;
 
 public static boolean isAprAvailable() {
-init();
+//https://issues.apache.org/bugzilla/show_bug.cgi?id=48613
+if (instanceCreated) init();
 return aprAvailable;
 }
+
+public AprLifecycleListener() {
+instanceCreated = true;
+}
 
 // -- LifecycleListener Methods
 



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



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

2010-04-10 Thread markt
Author: markt
Date: Sat Apr 10 22:32:23 2010
New Revision: 932800

URL: http://svn.apache.org/viewvc?rev=932800&view=rev
Log:
Update to NSIS 2.46 (kkolinko)

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

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=932800&r1=932799&r2=932800&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Apr 10 22:32:23 2010
@@ -106,19 +106,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: markt, kkolinko
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48613
-  Only attempt APR initialization if the  has been specified
-  It is backport of r911300. (fix by fhanik)
-  http://people.apache.org/~kkolinko/patches/2010-03-11_tc55_bug48613.patch
-  +1: kkolinko, markt, kfujino
-  -1:
-
-* Update to NSIS 2.46
-  NSIS changelog: http://nsis.sourceforge.net/Docs/AppendixF.html#F.1.1
-  http://svn.apache.org/viewvc?rev=921630&view=rev
-  +1: kkolinko, markt, rjung
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48717
   When a node joins a cluster and it receives all the current sessions, ensure
   the sessionCreated event is fired if the Manager is configured to replicate

Modified: tomcat/tc5.5.x/trunk/build/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.properties.default?rev=932800&r1=932799&r2=932800&view=diff
==
--- tomcat/tc5.5.x/trunk/build/build.properties.default (original)
+++ tomcat/tc5.5.x/trunk/build/build.properties.default Sat Apr 10 22:32:23 2010
@@ -209,12 +209,12 @@ rhino.jar=${rhino.home}/js.jar
 rhino.loc=http://ftp.mozilla.org/pub/mozilla.org/js/rhino1_6R2.zip
 
 # - NSIS, version 2.0 or later -
-nsis.home=${base.path}/nsis-2.45
+nsis.home=${base.path}/nsis-2.46
 nsis.exe=${nsis.home}/makensis.exe
 nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
 nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
 nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
-nsis.loc=${base-sf.loc}/nsis/nsis-2.45.zip
+nsis.loc=${base-sf.loc}/nsis/nsis-2.46.zip
 
 
 # - Struts, version 1.2.4 or later -

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=932800&r1=932799&r2=932800&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Sat Apr 10 
22:32:23 2010
@@ -39,6 +39,9 @@
   Update to Commons Daemon 1.0.2. Use service launcher (procrun)
   from the Commons Daemon release. Do not keep a copy of it in our source
   tree. (mturk/kkolinko)
+  
+Update to NSIS 2.46. (kkolinko)
+  
 
   
   
@@ -49,6 +52,14 @@
   
 
   
+  
+
+  
+48613: Only attempt APR/native connector initialization if
+the Listener element has been specified in server.xml. 
(fhanik/kkolinko)
+  
+
+  
   
 
   



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



Re: Patch suggestion

2010-04-10 Thread Konstantin Kolinko
2010/4/10 Pid :
> In lieu of of a Bugzilla enhancement (and hoping that I have the right end
> of the stick).
>

If I guess your intention correctly,
you want to prevent deployment of a war file that is still open for writing?

If that is the case, then asking for modification time probably will
not work. The file properties in the file system are usually not
updated that frequently. Though that might differ between OSes. Also,
if the file is being transmitted over network, the update frequency
depends on how fast is the connection that is used to upload the file.


As far as I remember my experience, I think that a file that is still
being written can be detected by asking its length. Such files can be
listed by shell to be of length 0.

Needs more research and some summary across OSes though.

At least, if the war file is of length 0 it can be safely skipped for
obvious reasons.


>                try {
>                    Thread.sleep(500);
>                }

I do not like unconditionally sleeping for every file. 20 wars = 10
seconds to sleep, even if none of them is going to be deployed

Time could be compared against the interval between autoDeploy cycle
runs, if it is enabled, but there are also explicit calls from the
manager web application that must not be broken.

The above is from my mind/memory. I have not researched it for this case.

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: r932822 - /tomcat/trunk/conf/catalina.policy

2010-04-10 Thread rjung
Author: rjung
Date: Sun Apr 11 01:08:09 2010
New Revision: 932822

URL: http://svn.apache.org/viewvc?rev=932822&view=rev
Log:
Add permission to read the STRICT_SERVLET_COMPLIANCE property
to our default policy for the security manager.

Modified:
tomcat/trunk/conf/catalina.policy

Modified: tomcat/trunk/conf/catalina.policy
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.policy?rev=932822&r1=932821&r2=932822&view=diff
==
--- tomcat/trunk/conf/catalina.policy (original)
+++ tomcat/trunk/conf/catalina.policy Sun Apr 11 01:08:09 2010
@@ -161,6 +161,9 @@ grant { 
 permission java.util.PropertyPermission
  "org.apache.el.parser.COERCE_TO_ZERO", "read";
 
+// E.g. the cookie code needs that.
+permission java.util.PropertyPermission 
"org.apache.catalina.STRICT_SERVLET_COMPLIANCE", "read";
+
 // Applications using Comet need to be able to access this package
 permission java.lang.RuntimePermission 
"accessClassInPackage.org.apache.catalina.comet";
 };



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



svn commit: r932823 - /tomcat/trunk/conf/catalina.policy

2010-04-10 Thread rjung
Author: rjung
Date: Sun Apr 11 01:26:43 2010
New Revision: 932823

URL: http://svn.apache.org/viewvc?rev=932823&view=rev
Log:
Add another property access to our security policy.

Modified:
tomcat/trunk/conf/catalina.policy

Modified: tomcat/trunk/conf/catalina.policy
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.policy?rev=932823&r1=932822&r2=932823&view=diff
==
--- tomcat/trunk/conf/catalina.policy (original)
+++ tomcat/trunk/conf/catalina.policy Sun Apr 11 01:26:43 2010
@@ -161,8 +161,9 @@ grant { 
 permission java.util.PropertyPermission
  "org.apache.el.parser.COERCE_TO_ZERO", "read";
 
-// E.g. the cookie code needs that.
+// E.g. the cookie code needs those.
 permission java.util.PropertyPermission 
"org.apache.catalina.STRICT_SERVLET_COMPLIANCE", "read";
+permission java.util.PropertyPermission 
"org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR", "read";
 
 // Applications using Comet need to be able to access this package
 permission java.lang.RuntimePermission 
"accessClassInPackage.org.apache.catalina.comet";



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



svn commit: r932826 - /tomcat/trunk/conf/catalina.policy

2010-04-10 Thread rjung
Author: rjung
Date: Sun Apr 11 01:46:20 2010
New Revision: 932826

URL: http://svn.apache.org/viewvc?rev=932826&view=rev
Log:
And another property for the policy.

Modified:
tomcat/trunk/conf/catalina.policy

Modified: tomcat/trunk/conf/catalina.policy
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.policy?rev=932826&r1=932825&r2=932826&view=diff
==
--- tomcat/trunk/conf/catalina.policy (original)
+++ tomcat/trunk/conf/catalina.policy Sun Apr 11 01:46:20 2010
@@ -163,6 +163,7 @@ grant { 
 
 // E.g. the cookie code needs those.
 permission java.util.PropertyPermission 
"org.apache.catalina.STRICT_SERVLET_COMPLIANCE", "read";
+permission java.util.PropertyPermission 
"org.apache.tomcat.util.http.ServerCookie.STRICT_NAMING", "read";
 permission java.util.PropertyPermission 
"org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR", "read";
 
 // Applications using Comet need to be able to access this package



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



DO NOT REPLY [Bug 48701] jsp:getProperty broken for certain cases

2010-04-10 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48701

--- Comment #10 from Mark Thomas  2010-04-10 21:48:11 EDT ---
This has been applied to 5.5.x and will be included in 5.5.30 onwards.

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

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