[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed

2014-03-27 Thread Bill Barker
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-validate has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-validate :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on checkstyle exists, no need to add for property 
checkstyle.jar.
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 28 secs
Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-7-oracle/lib/tools.jar:/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-junit4.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/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20140327.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/tar
 
get/commons-exec-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20140327.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20140327.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20140327.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-17.0-SNAPSHOT.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
-
Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml

build-prepare:
   [delete] Deleting directory 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp

compile-prepare:

download-validate:

proxyflags:

setproxy:

testexist:
 [echo] Testing  for 
/srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar

downloadzip:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle
[checkstyle] Running Checkstyle 5.7-SNAPSHOT on 2777 files
[checkstyle] 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs/changelog.xml:67: Line 
matches the illegal pattern '\s+$'.

BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:539: Got 1 errors and 0 
warnings.

Total time: 27 seconds
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml
- Atom: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 20140327060005, vmgump.apache.org:vmgump:20140327060005
Gump E-mail Identifier (unique within run) #1.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

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



svn commit: r1582217 - in /tomcat/trunk: java/org/apache/catalina/manager/host/ webapps/docs/

2014-03-27 Thread kfujino
Author: kfujino
Date: Thu Mar 27 08:28:00 2014
New Revision: 1582217

URL: http://svn.apache.org/r1582217
Log:
Add Support for copyXML attribute of Host to Host Manager.

Modified:

tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java?rev=1582217r1=1582216r2=1582217view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java 
Thu Mar 27 08:28:00 2014
@@ -393,6 +393,11 @@ public final class HTMLHostManagerServle
 args[2] = checked;
 writer.print(MessageFormat.format(ADD_SECTION_BOOLEAN, args));
 
+args[0] = smClient.getString(htmlHostManagerServlet.addCopyXML);
+args[1] = copyXML;
+args[2] = ;
+writer.print(MessageFormat.format(ADD_SECTION_BOOLEAN, args));
+
 args = new Object[1];
 args[0] = smClient.getString(htmlHostManagerServlet.addButton);
 writer.print(MessageFormat.format(ADD_SECTION_END, args));

Modified: 
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=1582217r1=1582216r2=1582217view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java 
Thu Mar 27 08:28:00 2014
@@ -247,11 +247,13 @@ public class HostManagerServlet
 boolean deployOnStartup = booleanParameter(request, deployOnStartup, 
true, htmlMode);
 boolean deployXML = booleanParameter(request, deployXML, true, 
htmlMode);
 boolean unpackWARs = booleanParameter(request, unpackWARs, true, 
htmlMode);
+boolean copyXML = booleanParameter(request, copyXML, false, 
htmlMode);
 add(writer, name, aliases, appBase, manager,
 autoDeploy,
 deployOnStartup,
 deployXML,
 unpackWARs,
+copyXML,
 smClient);
 }
 
@@ -328,6 +330,7 @@ public class HostManagerServlet
  boolean deployOnStartup,
  boolean deployXML,
  boolean unpackWARs,
+ boolean copyXML,
  StringManager smClient) {
 if (debug = 1) {
 log(sm.getString(hostManagerServlet.add, name));
@@ -414,6 +417,7 @@ public class HostManagerServlet
 host.setDeployOnStartup(deployOnStartup);
 host.setDeployXML(deployXML);
 host.setUnpackWARs(unpackWARs);
+host.setCopyXML(copyXML);
 
 // Add new host
 try {

Modified: 
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties?rev=1582217r1=1582216r2=1582217view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties 
Thu Mar 27 08:28:00 2014
@@ -70,6 +70,7 @@ htmlHostManagerServlet.addAutoDeploy=Aut
 htmlHostManagerServlet.addDeployOnStartup=DeployOnStartup
 htmlHostManagerServlet.addDeployXML=DeployXML
 htmlHostManagerServlet.addUnpackWARs=UnpackWARs
+htmlHostManagerServlet.addCopyXML=CopyXML
 htmlHostManagerServlet.addButton=Add
 htmlHostManagerServlet.serverTitle=Server Information
 htmlHostManagerServlet.serverVersion=Tomcat Version

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1582217r1=1582216r2=1582217view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Mar 27 08:28:00 2014
@@ -61,6 +61,14 @@
   /fix
 /changelog
   /subsection
+  subsection name=Web applications
+changelog
+  fix
+Add Support for codecopyXML/code attribute of Host to Host Manager.
+(kfujino)
+  /fix
+/changelog
+  /subsection
   subsection name=Other
 scode
   Review source code and take advantage of Java 7apos;s



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

svn commit: r1582218 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/manager/host/ webapps/docs/

2014-03-27 Thread kfujino
Author: kfujino
Date: Thu Mar 27 08:31:33 2014
New Revision: 1582218

URL: http://svn.apache.org/r1582218
Log:
Add Support for copyXML attribute of Host to Host Manager.

Modified:

tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java?rev=1582218r1=1582217r2=1582218view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
 Thu Mar 27 08:31:33 2014
@@ -393,7 +393,12 @@ public final class HTMLHostManagerServle
 args[1] = manager;
 args[2] = checked;
 writer.print(MessageFormat.format(ADD_SECTION_BOOLEAN, args));
-
+
+args[0] = smClient.getString(htmlHostManagerServlet.addCopyXML);
+args[1] = copyXML;
+args[2] = ;
+writer.print(MessageFormat.format(ADD_SECTION_BOOLEAN, args));
+
 args = new Object[1];
 args[0] = smClient.getString(htmlHostManagerServlet.addButton);
 writer.print(MessageFormat.format(ADD_SECTION_END, args));

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=1582218r1=1582217r2=1582218view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
 Thu Mar 27 08:31:33 2014
@@ -265,11 +265,13 @@ public class HostManagerServlet
 boolean deployOnStartup = booleanParameter(request, deployOnStartup, 
true, htmlMode);
 boolean deployXML = booleanParameter(request, deployXML, true, 
htmlMode);
 boolean unpackWARs = booleanParameter(request, unpackWARs, true, 
htmlMode);
+boolean copyXML = booleanParameter(request, copyXML, false, 
htmlMode);
 add(writer, name, aliases, appBase, manager,
 autoDeploy,
 deployOnStartup,
 deployXML,   
 unpackWARs,
+copyXML,
 smClient);
 }
 
@@ -346,6 +348,7 @@ public class HostManagerServlet
  boolean deployOnStartup,
  boolean deployXML,   
  boolean unpackWARs,
+ boolean copyXML,
  StringManager smClient) {
 if (debug = 1) {
 log(sm.getString(hostManagerServlet.add, name));
@@ -449,6 +452,7 @@ public class HostManagerServlet
 host.setDeployOnStartup(deployOnStartup);
 host.setDeployXML(deployXML);
 host.setUnpackWARs(unpackWARs);
+host.setCopyXML(copyXML);
 
 // Add new host
 try {

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties?rev=1582218r1=1582217r2=1582218view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
 Thu Mar 27 08:31:33 2014
@@ -70,6 +70,7 @@ htmlHostManagerServlet.addAutoDeploy=Aut
 htmlHostManagerServlet.addDeployOnStartup=DeployOnStartup
 htmlHostManagerServlet.addDeployXML=DeployXML
 htmlHostManagerServlet.addUnpackWARs=UnpackWARs
+htmlHostManagerServlet.addCopyXML=CopyXML
 htmlHostManagerServlet.addButton=Add
 htmlHostManagerServlet.serverTitle=Server Information
 htmlHostManagerServlet.serverVersion=Tomcat Version

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1582218r1=1582217r2=1582218view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Mar 27 08:31:33 2014
@@ -68,6 +68,14 @@
   /fix
 /changelog
   /subsection
+  subsection name=Web applications
+changelog
+  fix
+Add Support for codecopyXML/code attribute of Host to Host Manager.
+  

[Bug 56320] New: DefaultSever leak files

2014-03-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56320

Bug ID: 56320
   Summary: DefaultSever leak files
   Product: Tomcat 8
   Version: trunk
  Hardware: PC
OS: Linux
Status: NEW
  Severity: regression
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: jfcl...@gmail.com

While running ab test against tomcat 8 I have the following failure:
+++
44714 27-Mar-2014 04:41:00.605 SEVERE [http-bio-8001-Acceptor-0]
org.apache.tomcat.util.net.JIoEndpoint$Acceptor.run Socket accept failed
244715  java.net.SocketException: Too many open files
244716 at java.net.PlainSocketImpl.socketAccept(Native Method)
244717 at
java.net.AbstractPlainSocketImpl.accept(AbstractPlainSocketImpl.java:398)
244718 at java.net.ServerSocket.implAccept(ServerSocket.java:530)
+++
That doesn't depend on the connector.

And lsof says:
+++
[hudson@messaging-09 tc8]$ lsof | grep ROOT | wc -l
32667
[hudson@messaging-09 tc8]$ lsof | grep ROOT | grep 64KiB.bin | wc -l
32667
+++

64KiB.bin is the file I am requesting in ab.

-- 
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



[Bug 56320] DefaultSever leak files

2014-03-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56320

jfclere jfcl...@gmail.com changed:

   What|Removed |Added

  Component|Catalina|Connectors

--- Comment #1 from jfclere jfcl...@gmail.com ---
In fact it seems it is linked with sendfile.

-- 
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: r1582234 - in /tomcat/trunk: java/org/apache/catalina/manager/host/HostManagerServlet.java webapps/docs/changelog.xml

2014-03-27 Thread kfujino
Author: kfujino
Date: Thu Mar 27 09:42:15 2014
New Revision: 1582234

URL: http://svn.apache.org/r1582234
Log:
Ensure that name request parameter is used as a application base of host if 
webapps request parameter is not set when adding host in HostManager 
Application.

Modified:
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=1582234r1=1582233r2=1582234view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java 
Thu Mar 27 09:42:15 2014
@@ -353,11 +353,11 @@ public class HostManagerServlet
 // Validate and create appBase
 File appBaseFile = null;
 File file = null;
-if (appBase == null || appBase.length() == 0) {
-file = new File(name);
-} else {
-file = new File(appBase);
+String applicationBase = appBase;
+if (applicationBase == null || applicationBase.length() == 0) {
+applicationBase = name;
 }
+file = new File(applicationBase);
 if (!file.isAbsolute())
 file = new File(engine.getCatalinaBase(), file.getPath());
 try {
@@ -401,7 +401,7 @@ public class HostManagerServlet
 }
 
 StandardHost host = new StandardHost();
-host.setAppBase(appBase);
+host.setAppBase(applicationBase);
 host.setName(name);
 
 host.addLifecycleListener(new HostConfig());

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1582234r1=1582233r2=1582234view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Mar 27 09:42:15 2014
@@ -67,6 +67,11 @@
 Add Support for codecopyXML/code attribute of Host to Host Manager.
 (kfujino)
   /fix
+  fix
+Ensure that name request parameter is used as a application base of
+host if webapps request parameter is not set when adding host in
+HostManager Application. (kfujino)
+  /fix
 /changelog
   /subsection
   subsection name=Other



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



svn commit: r1582235 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/manager/host/HostManagerServlet.java webapps/docs/changelog.xml

2014-03-27 Thread kfujino
Author: kfujino
Date: Thu Mar 27 09:45:58 2014
New Revision: 1582235

URL: http://svn.apache.org/r1582235
Log:
Ensure that name request parameter is used as a application base of host if 
webapps request parameter is not set when adding host in HostManager 
Application.

Modified:

tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=1582235r1=1582234r2=1582235view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
 Thu Mar 27 09:45:58 2014
@@ -371,11 +371,11 @@ public class HostManagerServlet
 // Validate and create appBase
 File appBaseFile = null;
 File file = null;
-if (appBase == null || appBase.length() == 0) {
-file = new File(name);
-} else {
-file = new File(appBase);
+String applicationBase = appBase;
+if (applicationBase == null || applicationBase.length() == 0) {
+applicationBase = name;
 }
+file = new File(applicationBase);
 if (!file.isAbsolute())
 file = new File(System.getProperty(Globals.CATALINA_BASE_PROP), 
file.getPath());
 try {
@@ -436,7 +436,7 @@ public class HostManagerServlet
 }
 
 StandardHost host = new StandardHost();
-host.setAppBase(appBase);
+host.setAppBase(applicationBase);
 host.setName(name);
 
 host.addLifecycleListener(new HostConfig());

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1582235r1=1582234r2=1582235view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Mar 27 09:45:58 2014
@@ -74,6 +74,11 @@
 Add Support for codecopyXML/code attribute of Host to Host Manager.
 (kfujino)
   /fix
+  fix
+Ensure that name request parameter is used as a application base of
+host if webapps request parameter is not set when adding host in
+HostManager Application. (kfujino)
+  /fix
 /changelog
   /subsection
 /section



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



svn commit: r1582237 - /tomcat/trunk/webapps/docs/changelog.xml

2014-03-27 Thread markt
Author: markt
Date: Thu Mar 27 09:54:53 2014
New Revision: 1582237

URL: http://svn.apache.org/r1582237
Log:
Whitespace police

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1582237r1=1582236r2=1582237view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Mar 27 09:54:53 2014
@@ -77,7 +77,7 @@
   subsection name=Other
 scode
   Review source code and take advantage of Java 7apos;s
-  try-with-resources syntax where possible. (markt)  
+  try-with-resources syntax where possible. (markt)
 /scode
   /subsection
 /section



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



[Bug 56318] Oracle DB cursors are leaking when using org.apache.tomcat.jdbc.pool.DataSourceFactory

2014-03-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56318

Danila Galimov b...@mail.ru changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID

--- Comment #5 from Danila Galimov b...@mail.ru ---
Yes, it helped. Thanks.

-- 
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



[Bug 56321] New: ServletContextListener.contextDestroyed not completely executed when updating war

2014-03-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56321

Bug ID: 56321
   Summary: ServletContextListener.contextDestroyed not completely
executed when updating war
   Product: Tomcat 7
   Version: 7.0.52
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: marco.lapon...@kewill.com

When the contextDestroyed accesses a static method on a class which has not
been loaded yet, the rest of the contextDestroyed code is not executed,e.g.,:

package contexttest;

import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;

public class ContextTest implements ServletContextListener {

public void contextDestroyed(ServletContextEvent arg0) {
System.out.println(Context Destroyed);
MyTest.testStatic();
System.out.println(Context Destroyed Done);

}

public void contextInitialized(ServletContextEvent arg0) {
System.out.println(Context Initialized);
}

}

package contexttest;

public class MyTest {

public static void testStatic(){
System.out.println(My static method call);
}
}

When I created a war based on this code, and copy this war to the tomcat web
apps directory, it logs 'Context Initialized' as expected.

When I remove the war it logs:
Context Destroyed
My static method call
Context Destroyed Done

as expected. However when I copy the war to web apps, wait till it is
initialized, and then touch the war (to simulate the update of a the war). It
logs for the destroy event only:

'Context Destroyed'

So the static method call and the 'Context Destroyed Done' is missing. 

When I execute the above on tomcat 7.0.42 it behaves as I would expect, so no
difference between removing a war or updating the war.

-- 
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



[Bug 56321] ServletContextListener.contextDestroyed not completely executed when updating war

2014-03-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56321

--- Comment #1 from M. Laponder marco.lapon...@kewill.com ---
Created attachment 31446
  -- https://issues.apache.org/bugzilla/attachment.cgi?id=31446action=edit
test project

-- 
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



[Bug 56320] DefaultServlet leaks file handles

2014-03-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56320

Christopher Schultz ch...@christopherschultz.net changed:

   What|Removed |Added

Summary|DefaultSever leak files |DefaultServlet leaks file
   ||handles

-- 
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

2014-03-27 Thread buildbot
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/5644

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

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1582237
Blamelist: kfujino,markt

Build succeeded!

sincerely,
 -The Buildbot





[Bug 56323] New: Include service .bat scripts with Microsoft Windows Installer package

2014-03-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56323

Bug ID: 56323
   Summary: Include service .bat scripts with Microsoft Windows
Installer package
   Product: Tomcat 8
   Version: trunk
  Hardware: PC
OS: Mac OS X 10.4
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Packaging
  Assignee: dev@tomcat.apache.org
  Reporter: ch...@christopherschultz.net

For a long time, the Windows Installer has not included the service batch
scripts which are useful in many cases. There doesn't seem to be a reason not
to include them.

-- 
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: [VOTE] Release Apache Tomcat 8.0.5

2014-03-27 Thread Christopher Schultz
Mark,

On 3/24/14, 2:47 PM, Mark Thomas wrote:
 The proposed Apache Tomcat 8.0.5 release is now available for voting.
 
 The main changes since 8.0.4 are:
 - Fix a regression in the fix for BZ 56190
 - Various NIO2 fixes
 - Fix Java 8 syntax support for JSPs
 
 The main changes since 8.0.3 are:
 - Update Eclipse JDT compiler to enable full Java 8 support for JSPs in
   the default configuration
 - Add new, experimental HTTP and AJP connectors based on NIO2
 - Update the default connection pooling based on a repackaged Commons
   DBCP 2 to use the Commons DBCP 2.0 release
 
 
 It can be obtained from:
 https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.5/
 The Maven staging repo is:
 https://repository.apache.org/content/repositories/orgapachetomcat-1009/
 The svn tag is:
 http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_5/
 
 The proposed 8.0.5 release is:
 [ ] Broken - do not release
 [ ] Alpha  - go ahead and release as 8.0.5 (alpha)
 [X] Beta   - go ahead and release as 8.0.5 (beta)
 [ ] Stable - go ahead and release as 8.0.5 (stable)

Jean-Frederic found this running some performance tests. I think we
should still go ahead with the release as their is a workaround (disable
sendfile), but it's definitely still beta.

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

-chris



signature.asc
Description: OpenPGP digital signature


[Bug 56321] ServletContextListener.contextDestroyed not completely executed when updating war

2014-03-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56321

Christopher Schultz ch...@christopherschultz.net changed:

   What|Removed |Added

 OS||All

--- Comment #2 from Christopher Schultz ch...@christopherschultz.net ---
Are you sure the log hasn't just been buffered? Tomcat doesn't kill threads
like that.

Can you post a thread dump after Context Destroyed has been printed?

-- 
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: [VOTE] Release Apache Tomcat 8.0.5

2014-03-27 Thread Yoav Shapira
On Mon, Mar 24, 2014 at 2:47 PM, Mark Thomas ma...@apache.org wrote:
...
 The proposed 8.0.5 release is:
 [ ] Broken - do not release
 [ ] Alpha  - go ahead and release as 8.0.5 (alpha)
 [ X ] Beta   - go ahead and release as 8.0.5 (beta)
 [ ] Stable - go ahead and release as 8.0.5 (stable)

Works OK on my home-brewed test apps, BIO + NIO (didn't test NIO2 this
time around).

Yoav

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



svn commit: r1582399 - in /tomcat/trunk: java/org/apache/catalina/servlets/DefaultServlet.java webapps/docs/changelog.xml

2014-03-27 Thread markt
Author: markt
Date: Thu Mar 27 16:59:15 2014
New Revision: 1582399

URL: http://svn.apache.org/r1582399
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56320
Fix fd leak when sendfile is used

Modified:
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1582399r1=1582398r2=1582399view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Thu Mar 
27 16:59:15 2014
@@ -928,9 +928,16 @@ public class DefaultServlet extends Http
 // Silent catch
 }
 if (ostream != null) {
-if (!checkSendfile(request, response, resource,
-contentLength, null))
+if (checkSendfile(request, response, resource,
+contentLength, null)) {
+try {
+renderResult.close();
+} catch (IOException ioe) {
+// Ignore
+}
+} else {
 copy(resource, renderResult, ostream);
+}
 } else {
 copy(resource, renderResult, writer, encoding);
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1582399r1=1582398r2=1582399view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Mar 27 16:59:15 2014
@@ -59,6 +59,10 @@
 decoder provided by Java. Java 8apos;s decoder is better than Java
 7apos;s but it is still buggy. (markt)
   /fix
+  fix
+bug56320/bug: Fix a file descriptor leak in the default servlet 
when
+sendfile is used. (markt)
+  /fix
 /changelog
   /subsection
   subsection name=Web applications



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



[Bug 56320] DefaultServlet leaks file handles

2014-03-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56320

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #2 from Mark Thomas ma...@apache.org ---
Thanks for the report. I've fixed this in trunk and it will be included in
8.0.6 onwards.

-- 
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: r1582432 - /tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java

2014-03-27 Thread markt
Author: markt
Date: Thu Mar 27 18:13:14 2014
New Revision: 1582432

URL: http://svn.apache.org/r1582432
Log:
Clean-up. No functional change.

Modified:
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java

Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1582432r1=1582431r2=1582432view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Thu Mar 
27 18:13:14 2014
@@ -707,13 +707,11 @@ public class DefaultServlet extends Http
 } else {
 // We're included
 // SRV.9.3 says we must throw a FNFE
-throw new FileNotFoundException(
-sm.getString(defaultServlet.missingResource,
-requestUri));
+throw new FileNotFoundException(sm.getString(
+defaultServlet.missingResource, requestUri));
 }
 
-response.sendError(HttpServletResponse.SC_NOT_FOUND,
-   requestUri);
+response.sendError(HttpServletResponse.SC_NOT_FOUND, requestUri);
 return;
 }
 
@@ -728,35 +726,29 @@ public class DefaultServlet extends Http
 // We're included
 // Spec doesn't say what to do in this case but a FNFE seems
 // reasonable
-throw new FileNotFoundException(
-sm.getString(defaultServlet.missingResource,
-requestUri));
+throw new FileNotFoundException(sm.getString(
+defaultServlet.missingResource, requestUri));
 }
 
-response.sendError(HttpServletResponse.SC_FORBIDDEN,
-   requestUri);
+response.sendError(HttpServletResponse.SC_FORBIDDEN, requestUri);
 return;
 }
 
 // If the resource is not a collection, and the resource path
 // ends with / or \, return NOT FOUND
-if (resource.isFile()) {
-if (path.endsWith(/) || (path.endsWith(\\))) {
-// Check if we're included so we can return the appropriate
-// missing resource name in the error
-String requestUri = (String) request.getAttribute(
-RequestDispatcher.INCLUDE_REQUEST_URI);
-if (requestUri == null) {
-requestUri = request.getRequestURI();
-}
-response.sendError(HttpServletResponse.SC_NOT_FOUND,
-   requestUri);
-return;
+if (resource.isFile()  (path.endsWith(/) || path.endsWith(\\))) {
+// Check if we're included so we can return the appropriate
+// missing resource name in the error
+String requestUri = (String) request.getAttribute(
+RequestDispatcher.INCLUDE_REQUEST_URI);
+if (requestUri == null) {
+requestUri = request.getRequestURI();
 }
+response.sendError(HttpServletResponse.SC_NOT_FOUND, requestUri);
+return;
 }
 
-boolean isError =
-response.getStatus() = HttpServletResponse.SC_BAD_REQUEST;
+boolean isError = response.getStatus() = 
HttpServletResponse.SC_BAD_REQUEST;
 
 boolean included = false;
 // Check if the conditions specified in the optional If headers are
@@ -765,11 +757,9 @@ public class DefaultServlet extends Http
 // Checking If headers
 included = (request.getAttribute(
 RequestDispatcher.INCLUDE_CONTEXT_PATH) != null);
-if (!included  !isError 
-!checkIfHeaders(request, response, resource)) {
+if (!included  !isError  !checkIfHeaders(request, response, 
resource)) {
 return;
 }
-
 }
 
 // Find content type.
@@ -841,16 +831,13 @@ public class DefaultServlet extends Http
 if (contentLength == 0L) {
 serveContent = false;
 }
-
 }
 
 ServletOutputStream ostream = null;
 PrintWriter writer = null;
 
 if (serveContent) {
-
 // Trying to retrieve the servlet output stream
-
 try {
 ostream = response.getOutputStream();
 } catch (IllegalStateException e) {
@@ -869,7 +856,6 @@ public class DefaultServlet extends Http
 throw e;
 }
 }
-
 }
 
 // Check to see if a Filter, Valve of wrapper has written some content.
@@ -984,12 +970,9 @@ public class DefaultServlet extends Http

svn commit: r1582440 - /tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java

2014-03-27 Thread markt
Author: markt
Date: Thu Mar 27 18:50:05 2014
New Revision: 1582440

URL: http://svn.apache.org/r1582440
Log:
Restore optimisation removed in r1549711
Refactor so InputStream is never opened if sendfile is used
Add lots of comments

Modified:
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java

Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1582440r1=1582439r2=1582440view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Thu Mar 
27 18:50:05 2014
@@ -898,34 +898,48 @@ public class DefaultServlet extends Http
 }
 }
 
-InputStream renderResult = null;
 if (serveContent) {
-if (resource.isDirectory()) {
-// Serve the directory browser
-renderResult = render(getPathPrefix(request), resource);
-} else {
-renderResult = resource.getInputStream();
-}
-
-// Copy the input stream to our output stream
 try {
 response.setBufferSize(output);
 } catch (IllegalStateException e) {
 // Silent catch
 }
-if (ostream != null) {
-if (checkSendfile(request, response, resource,
-contentLength, null)) {
-try {
-renderResult.close();
-} catch (IOException ioe) {
-// Ignore
-}
+InputStream renderResult = null;
+if (ostream == null) {
+// Output via a writer so can't use sendfile or write
+// content directly.
+if (resource.isDirectory()) {
+renderResult = render(getPathPrefix(request), 
resource);
 } else {
-copy(resource, renderResult, ostream);
+renderResult = resource.getInputStream();
 }
-} else {
 copy(resource, renderResult, writer, encoding);
+} else {
+// Output is via an InputStream
+if (resource.isDirectory()) {
+renderResult = render(getPathPrefix(request), 
resource);
+} else {
+// Output is content of resource
+if (!checkSendfile(request, response, resource,
+contentLength, null)) {
+// sendfile not possible so check if resource
+// content is available directly
+byte[] resourceBody = resource.getContent();
+if (resourceBody == null) {
+// Resource content not available, use
+// inputstream
+renderResult = resource.getInputStream();
+} else {
+// Use the resource content directly
+ostream.write(resourceBody);
+}
+}
+// If a stream was configured, it needs to be copied to
+// the output (this method closes the stream)
+if (renderResult != null) {
+copy(resource, renderResult, ostream);
+}
+}
 }
 }
 



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



[Bug 56321] ServletContextListener.contextDestroyed not completely executed when updating war

2014-03-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56321

--- Comment #3 from Mark Thomas ma...@apache.org ---
The test is using stdout. It is unlikely to be buffered for any noticeable
length of time.

I can reproduce this on 7.0.x. Odd. Trying on 8.0.x...

-- 
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



[Bug 56318] Oracle DB cursors are leaking when using org.apache.tomcat.jdbc.pool.DataSourceFactory

2014-03-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56318

--- Comment #6 from Christopher Schultz ch...@christopherschultz.net ---
If the StatementFinalizer fixed your problem, then you should take some time to
look into your application and correct those errors. Head over to the users'
mailing list if you'd like some help with that.

-- 
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: r1582453 - in /tomcat/trunk: java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml

2014-03-27 Thread markt
Author: markt
Date: Thu Mar 27 20:10:31 2014
New Revision: 1582453

URL: http://svn.apache.org/r1582453
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56321
hen a WAR is modified, undeploy the web application before deleting any 
expanded directory as the undeploy process may refer to classes that need to be 
loaded from the expanded directory. If the expanded directory is deleted first, 
any attempt to load a new class during undeploy will fail.

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

Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1582453r1=1582452r2=1582453view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Thu Mar 27 
20:10:31 2014
@@ -1227,8 +1227,8 @@ public class HostConfig
 } else {
 // Everything else triggers a redeploy
 // (just need to undeploy here, deploy will follow)
-deleteRedeployResources(app, resources, i, false);
 undeploy(app);
+deleteRedeployResources(app, resources, i, false);
 return;
 }
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1582453r1=1582452r2=1582453view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Mar 27 20:10:31 2014
@@ -63,6 +63,13 @@
 bug56320/bug: Fix a file descriptor leak in the default servlet 
when
 sendfile is used. (markt)
   /fix
+  fix
+bug56321/bug: When a WAR is modified, undeploy the web application
+before deleting any expanded directory as the undeploy process may
+refer to classes that need to be loaded from the expanded directory. If
+the expanded directory is deleted first, any attempt to load a new 
class
+during undeploy will fail. (markt)
+  /fix
 /changelog
   /subsection
   subsection name=Web applications



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



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

2014-03-27 Thread markt
Author: markt
Date: Thu Mar 27 20:11:34 2014
New Revision: 1582454

URL: http://svn.apache.org/r1582454
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56321
When a WAR is modified, undeploy the web application before deleting any 
expanded directory as the undeploy process may refer to classes that need to be 
loaded from the expanded directory. If the expanded directory is deleted first, 
any attempt to load a new class during undeploy will fail.

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

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

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1582454r1=1582453r2=1582454view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Thu 
Mar 27 20:11:34 2014
@@ -1402,8 +1402,8 @@ public class HostConfig
 } else {
 // Everything else triggers a redeploy
 // (just need to undeploy here, deploy will follow)
-deleteRedeployResources(app, resources, i, false);
 undeploy(app);
+deleteRedeployResources(app, resources, i, false);
 return;
 }
 }

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1582454r1=1582453r2=1582454view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Mar 27 20:11:34 2014
@@ -66,6 +66,13 @@
 decoder provided by Java. Java 8apos;s decoder is better than Java
 7apos;s but it is still buggy. (markt)
   /fix
+  fix
+bug56321/bug: When a WAR is modified, undeploy the web application
+before deleting any expanded directory as the undeploy process may
+refer to classes that need to be loaded from the expanded directory. If
+the expanded directory is deleted first, any attempt to load a new 
class
+during undeploy will fail. (markt)
+  /fix
 /changelog
   /subsection
   subsection name=Web applications



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



[Bug 56321] ServletContextListener.contextDestroyed not completely executed when updating war

2014-03-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56321

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #4 from Mark Thomas ma...@apache.org ---
OK. Found the problem.

Deleting the WAR triggered a code path the undeployed the app and then deleted
the expanded directory so the new class was available to load during
undeployment. Updating the WAR triggered a code path that deleted the expanded
directory and then undeployed the app. That meant the new class was not
available to load at the point.

I've fixed this my making the process consistent (undeploy then delete).

This has been fixed in 8.0.x for 8.0.6 onwards and 7.0.x for 7.0.54 onwards.

-- 
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



[Bug 56318] Oracle DB cursors are leaking when using org.apache.tomcat.jdbc.pool.DataSourceFactory

2014-03-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56318

--- Comment #7 from Danila Galimov b...@mail.ru ---
Thank you :-)

Ideally I would like to have something like stacktrace of statement opening,
and stacktrace of connection close, so when connection is closed, all of the
opened and not closed prepared statments, connections, result sets e.t.c will
be printed with creation trace, so I will be able to check this.

Is it possible to do with currently available jdbc interceptors (or maybe I
need to setup something like proxy jdbc drivers) ?

Unfortunately the project is very big and we're using a lot of libraries, so
it's hard to get the exact place without logging.

-- 
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




[Bug 56327] New: Adding non HTTP (e.g AJP) connector using MBeans is not possible

2014-03-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56327

Bug ID: 56327
   Summary: Adding non HTTP (e.g AJP) connector using MBeans is
not possible
   Product: Tomcat 8
   Version: trunk
  Hardware: PC
OS: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: kgki...@gmail.com

Created attachment 31451
  -- https://issues.apache.org/bugzilla/attachment.cgi?id=31451action=edit
Source code with the fix

Using MBeans (org.apache.catalina.mbeans.ServiceMBean) it is possible to add a
connector during runtime.

API says:
 public void addConnector(String address, int port, boolean isAjp, boolean
isSSL) 


Even adding AJP should be possible. However upon looking at the code, it is
creating a Connector with default constructor that would set the
protocolHandler to HttpProtocolHandler. In other words, to create an AJP
connector, protocol should be available during the construction of the
Connector.

It is a simple fix. 

   public void addConnector(String address, int port, boolean isAjp, boolean
isSSL) throws MBeanException {

Service service; 
try {
service = (Service)getManagedResource();
} catch (InstanceNotFoundException e) {
throw new MBeanException(e);
} catch (RuntimeOperationsException e) {
throw new MBeanException(e);
} catch (InvalidTargetObjectTypeException e) {
throw new MBeanException(e);
}
String protocol = isAjp ? AJP/1.3 : HTTP/1.1;


// Pass the protocol here rather than setting it later
 Connector connector = new Connector(protocol);

if ((address!=null)  (address.length()0)) {
connector.setProperty(address, address);
}
connector.setPort(port);
connector.setSecure(isSSL);
connector.setScheme(isSSL ? https : http);

service.addConnector(connector);   

}

-- 
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: [VOTE] Release Apache Tomcat 8.0.5

2014-03-27 Thread Tim Whittington
 
 The proposed 8.0.5 release is:
 [ ] Broken - do not release
 [ ] Alpha  - go ahead and release as 8.0.5 (alpha)
 [x] Beta   - go ahead and release as 8.0.5 (beta)
 [ ] Stable - go ahead and release as 8.0.5 (stable)
 


cheers
tim


-
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

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

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

Buildslave for this Build: bb-vm_ubuntu

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

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot





[VOTE][RESULT] Release Apache Tomcat 8.0.5

2014-03-27 Thread Mark Thomas
Binding:
 Beta:   markt, remm, schultz, yoavs
 Stable: jfarcand

Non-binding:
 Beta:   timw
 Stable: Ognjen Blagojevic

The vote therefore passes. Apache Tomcat 8.0.5 will be released as beta.

Thanks everyone.

Mark

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



svn commit: r1582511 - /tomcat/trunk/webapps/docs/changelog.xml

2014-03-27 Thread markt
Author: markt
Date: Thu Mar 27 22:19:01 2014
New Revision: 1582511

URL: http://svn.apache.org/r1582511
Log:
Add release date

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1582511r1=1582510r2=1582511view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Mar 27 22:19:01 2014
@@ -92,7 +92,7 @@
 /scode
   /subsection
 /section
-section name=Tomcat 8.0.5 (markt)
+section name=Tomcat 8.0.5 (markt) rtext=beta, 2014-03-27
   subsection name=Catalina
 changelog
   fix



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



svn commit: r4818 - /dev/tomcat/tomcat-8/v8.0.5/ /release/tomcat/tomcat-8/v8.0.5/

2014-03-27 Thread markt
Author: markt
Date: Thu Mar 27 22:21:29 2014
New Revision: 4818

Log:
Release Apache Tomcat 8.0.5 (beta)

Added:
release/tomcat/tomcat-8/v8.0.5/
  - copied from r4791, dev/tomcat/tomcat-8/v8.0.5/
Removed:
dev/tomcat/tomcat-8/v8.0.5/


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



[Bug 56327] Adding non HTTP (e.g AJP) connector using MBeans is not possible

2014-03-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56327

--- Comment #1 from kiran kgki...@gmail.com ---
Original Code

50 public void addConnector(String address, int port, boolean isAjp,
boolean isSSL) throws MBeanException {
51 
52 Service service; 
53 try {
54 service = (Service)getManagedResource();
55 } catch (InstanceNotFoundException e) {
56 throw new MBeanException(e);
57 } catch (RuntimeOperationsException e) {
58 throw new MBeanException(e);
59 } catch (InvalidTargetObjectTypeException e) {
60 throw new MBeanException(e);
61 }
62 
63 Connector connector = new Connector();
64 if ((address!=null)  (address.length()0)) {
65 connector.setProperty(address, address);
66 }
67 
68 connector.setPort(port);
69 connector.setProtocol(isAjp ? AJP/1.3 : HTTP/1.1);
70 connector.setSecure(isSSL);
71 connector.setScheme(isSSL ? https : http);
72 
73 service.addConnector(connector); 


Line 63 is the problem. See the how Connector is created by ConnectorCreateRule
vs in the ServiceMBean

Also interesting is the following code in
org.apache.catalina.connector.Connector
   public Connector() {
this(null);
}

public Connector(String protocol) {
setProtocol(protocol);
// Instantiate protocol handler
try {
Class? clazz = Class.forName(protocolHandlerClassName);
this.protocolHandler = (ProtocolHandler) clazz.newInstance();
} catch (Exception e) {
log.error(sm.getString(
coyoteConnector.protocolHandlerInstantiationFailed), e);
}
}
protocolHandler is created in the beginning and is immutable and by default is
Http1.1.

-- 
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

2014-03-27 Thread buildbot
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/5647

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

Buildslave for this Build: bb-vm_ubuntu

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

Build succeeded!

sincerely,
 -The Buildbot