svn commit: r1297374 - in /tomcat/maven-plugin/trunk: ./ tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/ tomcat7-maven-plugin/src/test/resources/deploy-war-project/ tomcat7-maven-plug

[olamy]

Author: olamy
Date: Tue Mar  6 08:07:33 2012
New Revision: 1297374

URL: http://svn.apache.org/viewvc?rev=1297374&view=rev
Log:
upgrade failsafe version and use variable for version in it tests

Modified:
tomcat/maven-plugin/trunk/pom.xml

tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml

tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/pom.xml

tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/simple-war-project/pom.xml

tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml

Modified: tomcat/maven-plugin/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1297374&r1=1297373&r2=1297374&view=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Tue Mar  6 08:07:33 2012
@@ -46,7 +46,7 @@
 2.0.8
 
 
false
-2.11
+2.12
 4.10
 2000
 false

Modified: 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml?rev=1297374&r1=1297373&r2=1297374&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
 Tue Mar  6 08:07:33 2012
@@ -25,6 +25,9 @@
   1.0-SNAPSHOT
   war
 
+  
+
${project.build.sourceEncoding}
+  
 
   
 
@@ -88,17 +91,17 @@
   
   
 tomcat-shutdown
+post-integration-test
 
   shutdown
 
-post-integration-test
   
 
   
   
 org.apache.maven.plugins
 maven-failsafe-plugin
-2.9
+${failsafe.version}
 
   
 integration-test

Modified: 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/pom.xml?rev=1297374&r1=1297373&r2=1297374&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/pom.xml
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/pom.xml
 Tue Mar  6 08:07:33 2012
@@ -25,6 +25,9 @@
   1.0-SNAPSHOT
   war
 
+  
+
${project.build.sourceEncoding}
+  
 
   
 
@@ -86,17 +89,17 @@
   
   
 tomcat-shutdown
+post-integration-test
 
   shutdown
 
-post-integration-test
   
 
   
   
 org.apache.maven.plugins
 maven-failsafe-plugin
-2.9
+${failsafe.version}
 
   
 integration-test

Modified: 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/simple-war-project/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/simple-war-project/pom.xml?rev=1297374&r1=1297373&r2=1297374&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/simple-war-project/pom.xml
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/simple-war-project/pom.xml
 Tue Mar  6 08:07:33 2012
@@ -24,6 +24,9 @@
   simple-war-project
   1.0-SNAPSHOT
   war
+  
+
${project.build.sourceEncoding}
+  
 
 
   
@@ -77,17 +80,17 @@
   
   
 tomcat-shutdown
+post-integration-test
 
   shutdown
 
-post-integration-test
   
 
   
   
 org.apache.maven.plugins
 maven-failsafe-plugin
-2.10
+${failsafe.version}
 
   
 integration-test

Modified: 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml?rev=1297374&r1=1297373&r2=1297374&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
 Tue Mar  6 08:07:33 2012
@@ -79,10 +

svn commit: r1297379 - /tomcat/maven-plugin/trunk/pom.xml

[olamy]

Author: olamy
Date: Tue Mar  6 08:27:31 2012
New Revision: 1297379

URL: http://svn.apache.org/viewvc?rev=1297379&view=rev
Log:
back to tomcat7 7.0.25 due to 
https://issues.apache.org/bugzilla/show_bug.cgi?id=52833

Modified:
tomcat/maven-plugin/trunk/pom.xml

Modified: tomcat/maven-plugin/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1297379&r1=1297378&r2=1297379&view=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Tue Mar  6 08:27:31 2012
@@ -66,7 +66,8 @@
 2001
 
 2008
-7.0.26
+
+7.0.25
   
 
   



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

svn commit: r1297380 - in /tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources: basic-webapp-it/pom.xml pom.xml

[olamy]

Author: olamy
Date: Tue Mar  6 08:27:42 2012
New Revision: 1297380

URL: http://svn.apache.org/viewvc?rev=1297380&view=rev
Log:
set some maven plugin versions in archetype sample as it's a sample it must be 
a good sample

Modified:

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/basic-webapp-it/pom.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/basic-webapp-it/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/basic-webapp-it/pom.xml?rev=1297380&r1=1297379&r2=1297380&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/basic-webapp-it/pom.xml
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/basic-webapp-it/pom.xml
 Tue Mar  6 08:27:42 2012
@@ -31,7 +31,7 @@
 
   
 2.2
-2.16.0
+2.20.0
 
 9898
 http://localhost:${tomcat.port}/
@@ -110,7 +110,6 @@
   
 org.apache.maven.plugins
 maven-surefire-plugin
-2.11
 
   
 selenium-integration-tests

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml?rev=1297380&r1=1297379&r2=1297380&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
 Tue Mar  6 08:27:42 2012
@@ -44,6 +44,16 @@
   
 
 
+  org.apache.maven.plugins
+  maven-surefire-plugin
+  2.12
+
+
+  org.apache.maven.plugins
+  maven-war-plugin
+  2.2
+
+
   org.apache.tomcat.maven
   tomcat6-maven-plugin
   ${tomcatPluginVersion}



-
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

[bugzilla]

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

--- Comment #1 from moogle  2012-03-06 09:57:15 UTC ---
Doesn't work with a javax.naming.Name create with key "java:comp/env/jdbc/mydb"
If you look at
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/SelectorContext.java?revision=1225625&view=markup

You could see that prefix is only "java:" and  protected Name parseName(Name
name) return name.getSuffix(1)

-- 
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: r1297411 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/CatalinaFactory.java

[rjung]

Author: rjung
Date: Tue Mar  6 10:30:24 2012
New Revision: 1297411

URL: http://svn.apache.org/viewvc?rev=1297411&view=rev
Log:
Fix comment typo.

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/CatalinaFactory.java

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/CatalinaFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/CatalinaFactory.java?rev=1297411&r1=1297410&r2=1297411&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/CatalinaFactory.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/CatalinaFactory.java Tue Mar  
6 10:30:24 2012
@@ -27,7 +27,7 @@ import org.apache.catalina.core.Standard
  * alternative defaults.
  *
  * @deprecated There was no demand for this capability and it will be removed 
in
- * Tomact 8.0.x
+ * Tomcat 8.0.x
  */
 public class CatalinaFactory {
 



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

svn commit: r1297439 - in /tomcat/jk/trunk/native: common/jk_global.h common/jk_uri_worker_map.c iis/jk_isapi_plugin.c

[mturk]

Author: mturk
Date: Tue Mar  6 12:21:02 2012
New Revision: 1297439

URL: http://svn.apache.org/viewvc?rev=1297439&view=rev
Log:
Use global mutex instead critical section so that multiple instance don't init 
at once in case IIS starts multiple processes

Modified:
tomcat/jk/trunk/native/common/jk_global.h
tomcat/jk/trunk/native/common/jk_uri_worker_map.c
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

Modified: tomcat/jk/trunk/native/common/jk_global.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_global.h?rev=1297439&r1=1297438&r2=1297439&view=diff
==
--- tomcat/jk/trunk/native/common/jk_global.h (original)
+++ tomcat/jk/trunk/native/common/jk_global.h Tue Mar  6 12:21:02 2012
@@ -384,7 +384,9 @@ typedef int jk_sock_t;
 #define IS_VALID_SOCKET(s) ((s) > 0)
 #define JK_INVALID_SOCKET  (-1)
 #endif
-
+#if defined(_MSC_VER) && (_MSC_VER > 1200)
+#define stat  _stat
+#endif
 #ifdef NETWARE
 #ifdef __NOVELL_LIBC__
 #define MAX_PATH 511

Modified: tomcat/jk/trunk/native/common/jk_uri_worker_map.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_uri_worker_map.c?rev=1297439&r1=1297438&r2=1297439&view=diff
==
--- tomcat/jk/trunk/native/common/jk_uri_worker_map.c (original)
+++ tomcat/jk/trunk/native/common/jk_uri_worker_map.c Tue Mar  6 12:21:02 2012
@@ -1075,7 +1075,7 @@ const char *map_uri_to_worker_ext(jk_uri
 off = 1;
 }
 /* Size including leading slash. */
-vhost_len = strlen(vhost);
+vhost_len = (unsigned int)strlen(vhost);
 if (vhost_len + off >= JK_MAX_URI_LEN) {
 vhost_len = 0;
 jk_log(l, JK_LOG_WARNING,

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1297439&r1=1297438&r2=1297439&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Tue Mar  6 12:21:02 2012
@@ -468,7 +468,7 @@ static struct error_reasons {
 static char dll_file_path[MAX_PATH];
 static char ini_file_name[MAX_PATH];
 static int using_ini_file = JK_FALSE;
-static JK_CRIT_SEC init_cs;
+static HANDLE init_cs = NULL;
 static int is_inited = JK_FALSE;
 static int is_mapread = JK_FALSE;
 
@@ -505,6 +505,8 @@ static HANDLE watchdog_handle = NULL;
 static char error_page_buf[INTERNET_MAX_URL_LENGTH] = {0};
 static char *error_page = NULL;
 
+static const char *JK_MUTEX_NAME = "Global\\ISAPI_REDIRECT_MUTEX";
+
 #define URI_SELECT_OPT_PARSED   0
 #define URI_SELECT_OPT_UNPARSED 1
 #define URI_SELECT_OPT_ESCAPED  2
@@ -1490,11 +1492,11 @@ BOOL WINAPI GetFilterVersion(PHTTP_FILTE
 if (pVer->dwFilterVersion > http_filter_revision) {
 pVer->dwFilterVersion = http_filter_revision;
 }
-EnterCriticalSection(&init_cs);
+WaitForSingleObject(init_cs, INFINITE);
 if (!is_inited) {
 rv = initialize_extension();
 }
-LeaveCriticalSection(&init_cs);
+ReleaseMutex(init_cs);
 if (iis_info.major < 5 || (iis_info.major == 5 && iis_info.minor < 1)) {
 SetLastError(ERROR_OLD_WIN_VERSION);
 return FALSE;
@@ -2166,10 +2168,10 @@ DWORD WINAPI HttpFilterProc(PHTTP_FILTER
 StringCbCat(serverName, MAX_SERVERNAME, instanceId);
 }
 }
-EnterCriticalSection(&init_cs);
+WaitForSingleObject(init_cs, INFINITE);
 if (!is_mapread)
 is_mapread = init_jk(serverName);
-LeaveCriticalSection(&init_cs);
+ReleaseMutex(init_cs);
 }
 /* If we can't read the map we become dormant */
 if (!is_mapread)
@@ -2209,11 +2211,11 @@ BOOL WINAPI GetExtensionVersion(HSE_VERS
 StringCbCopy(pVer->lpszExtensionDesc, HSE_MAX_EXT_DLL_NAME_LEN, 
(VERSION_STRING));
 
 
-EnterCriticalSection(&init_cs);
+WaitForSingleObject(init_cs, INFINITE);
 if (!is_inited) {
 rv = initialize_extension();
 }
-LeaveCriticalSection(&init_cs);
+ReleaseMutex(init_cs);
 
 return rv;
 }
@@ -2246,10 +2248,10 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI
 StringCbCat(serverName, MAX_SERVERNAME, instanceId);
 }
 }
-EnterCriticalSection(&init_cs);
+WaitForSingleObject(init_cs, INFINITE);
 if (!is_mapread)
 is_mapread = init_jk(serverName);
-LeaveCriticalSection(&init_cs);
+ReleaseMutex(init_cs);
 }
 if (!is_mapread)
 is_inited = JK_FALSE;
@@ -2349,7 +2351,7 @@ BOOL WINAPI TerminateFilter(DWORD dwFlag
 {
 UNREFERENCED_PARAMETER(dwFlags);
 
-EnterCriticalSection(&init_cs);
+WaitForSingleObject(init_cs, INFINITE)

svn commit: r1297441 - /tomcat/jk/trunk/native/common/jk_global.h

[mturk]

Author: mturk
Date: Tue Mar  6 12:23:25 2012
New Revision: 1297441

URL: http://svn.apache.org/viewvc?rev=1297441&view=rev
Log:
Presume MSVC defines ansi name for stat

Modified:
tomcat/jk/trunk/native/common/jk_global.h

Modified: tomcat/jk/trunk/native/common/jk_global.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_global.h?rev=1297441&r1=1297440&r2=1297441&view=diff
==
--- tomcat/jk/trunk/native/common/jk_global.h (original)
+++ tomcat/jk/trunk/native/common/jk_global.h Tue Mar  6 12:23:25 2012
@@ -384,9 +384,6 @@ typedef int jk_sock_t;
 #define IS_VALID_SOCKET(s) ((s) > 0)
 #define JK_INVALID_SOCKET  (-1)
 #endif
-#if defined(_MSC_VER) && (_MSC_VER > 1200)
-#define stat  _stat
-#endif
 #ifdef NETWARE
 #ifdef __NOVELL_LIBC__
 #define MAX_PATH 511



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

svn commit: r1297445 - in /tomcat/jk/trunk/native: common/jk_global.h iis/Makefile.amd64

[mturk]

Author: mturk
Date: Tue Mar  6 12:33:58 2012
New Revision: 1297445

URL: http://svn.apache.org/viewvc?rev=1297445&view=rev
Log:
Use _stat for newest MSVC's and axe bufferoverflow library. If needed user can 
provide it inside EXTRA_LIBS

Modified:
tomcat/jk/trunk/native/common/jk_global.h
tomcat/jk/trunk/native/iis/Makefile.amd64

Modified: tomcat/jk/trunk/native/common/jk_global.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_global.h?rev=1297445&r1=1297444&r2=1297445&view=diff
==
--- tomcat/jk/trunk/native/common/jk_global.h (original)
+++ tomcat/jk/trunk/native/common/jk_global.h Tue Mar  6 12:33:58 2012
@@ -392,6 +392,10 @@ typedef int jk_sock_t;
 #endif
 #endif
 
+#if defined(_MSC_VER) && (_MSC_VER > 1200)
+#define stat_stat
+#endif
+
 #ifdef AS400_UTF8
 #define strcasecmp(a,b) apr_strnatcasecmp(a,b)
 #endif

Modified: tomcat/jk/trunk/native/iis/Makefile.amd64
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.amd64?rev=1297445&r1=1297444&r2=1297445&view=diff
==
--- tomcat/jk/trunk/native/iis/Makefile.amd64 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.amd64 Tue Mar  6 12:33:58 2012
@@ -83,7 +83,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\isapi.b
 BSC32_SBRS= \
 
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib 
strsafe.lib bufferoverflowu.lib $(EXTRA_LIBS) /nologo /dll /incremental:no 
/pdb:"$(OUTDIR)\$(TARGET).pdb" /debug /machine:AMD64 /def:".\isapi.def" 
/out:"$(OUTDIR)\$(TARGET).dll" /implib:"$(OUTDIR)\isapi_redirect.lib"
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib 
strsafe.lib $(EXTRA_LIBS) /nologo /dll /incremental:no 
/pdb:"$(OUTDIR)\$(TARGET).pdb" /debug /machine:AMD64 /def:".\isapi.def" 
/out:"$(OUTDIR)\$(TARGET).dll" /implib:"$(OUTDIR)\isapi_redirect.lib"
 DEF_FILE= \
".\isapi.def"
 LINK32_OBJS= \



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

svn commit: r1297452 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

[mturk]

Author: mturk
Date: Tue Mar  6 12:48:48 2012
New Revision: 1297452

URL: http://svn.apache.org/viewvc?rev=1297452&view=rev
Log:
Use the same prefix as for shared memory mutex

Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1297452&r1=1297451&r2=1297452&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Tue Mar  6 12:48:48 2012
@@ -505,7 +505,7 @@ static HANDLE watchdog_handle = NULL;
 static char error_page_buf[INTERNET_MAX_URL_LENGTH] = {0};
 static char *error_page = NULL;
 
-static const char *JK_MUTEX_NAME = "Global\\ISAPI_REDIRECT_MUTEX";
+static const char *JK_MUTEX_NAME = "Global\\JK_ISAPI_REDIRECT_MUTEX";
 
 #define URI_SELECT_OPT_PARSED   0
 #define URI_SELECT_OPT_UNPARSED 1



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

DO NOT REPLY [Bug 52837] New: NullPointerException at AprEndpoint.getCometPoller()

[bugzilla]

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

 Bug #: 52837
   Summary: NullPointerException at AprEndpoint.getCometPoller()
   Product: Tomcat 6
   Version: 6.0.20
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: me_o...@inbox.ru
Classification: Unclassified


For unknown reason we've got the following exception in our application which
causes its death. This happened once but still important for us to research as
we need some prevention plan not to have system down time.
Exception in thread "tomcat-exec-171" java.lang.NullPointerException
at
org.apache.tomcat.util.net.AprEndpoint.getCometPoller(AprEndpoint.java:368)
at
org.apache.coyote.http11.Http11AprProtocol$Http11ConnectionHandler.event(Http11AprProtocol.java:556)
at
org.apache.tomcat.util.net.AprEndpoint$SocketEventProcessor.run(AprEndpoint.java:2049)
at
java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)

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

[jira] [Commented] (MTOMCAT-123) Can't add test scoped dependency filters to web.xml

[Hudson (Commented) (JIRA)]

[ 
https://issues.apache.org/jira/browse/MTOMCAT-123?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13223273#comment-13223273
 ] 

Hudson commented on MTOMCAT-123:


Integrated in TomcatMavenPlugin-mvn3.x #114 (See 
[https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x/114/])
[MTOMCAT-123] Can't add test scoped dependency filters to web.xml. 
(Revision 1297241)

 Result = FAILURE
olamy : http://svn.apache.org/viewvc/?view=rev&rev=1297241
Files : 
* 
/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java


> Can't add test scoped dependency filters to web.xml
> ---
>
> Key: MTOMCAT-123
> URL: https://issues.apache.org/jira/browse/MTOMCAT-123
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Bug
>  Components: tomcat7
>Affects Versions: 2.0-beta-1, 2.0
> Environment: Apache Maven 3.0.3 (r1075438; 2011-02-28 11:31:09-0600)
> Maven home: /usr/local/Cellar/maven/3.0.3/libexec
> Java version: 1.6.0_29, vendor: Apple Inc.
> Java home: /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
> Default locale: en_US, platform encoding: MacRoman
> OS name: "mac os x", version: "10.6.8", arch: "i386", family: "mac"
>Reporter: Nathan Schile
>Assignee: Olivier Lamy
> Fix For: 2.0
>
> Attachments: tomcat-testcase.zip
>
>
> When a Filter that is from a test scoped dependency is added to the web.xml, 
> a ClassNotFoundException is thrown when starting the Tomcat server.  
> Everything runs fine when dependency is changed to compile.
> 
> org.apache.tomcat.maven
> tomcat7-maven-plugin
> 2.0-beta-1
> 
> 
> tomcat-run
> 
> run
> 
> pre-integration-test
> 
> /
> true
> true
> 
> ${basedir}/src/test/webapp
> true
> 
> 
> 
> tomcat-shutdown
> 
> shutdown
> 
> post-integration-test
> 
> 
> 

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

DO NOT REPLY [Bug 52833] NPE with 7.0.26

[bugzilla]

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

--- Comment #2 from Mark Thomas  2012-03-06 14:21:25 UTC ---
Hmm. I'm failing to understand how the StandardServer ends up with a parent
class loader that is not a child of the system class loader.

At the moment this looks like a configuration error and I am leaning towards
resolving this as INVALID.

-- 
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 52833] NPE with 7.0.26

[bugzilla]

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

--- Comment #3 from olamy  2012-03-06 14:28:44 UTC ---
see
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?revision=1297073&view=markup
line 674.
BTW works fine with 7.0.25.

-- 
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 52819] problems in org.apache.jasper.xmlparser.EncodingMap#fIANA2JavaMap

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID
 OS/Version||All

--- Comment #1 from Mark Thomas  2012-03-06 14:33:58 UTC ---
I don't see a description of an actual bug here.

See http://markmail.org/message/pmk3n7czhh57sgho

-- 
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: r1297158 - in /tomcat/trunk/test/org/apache/catalina/authenticator: TestDigestAuthenticator.java TestNonLoginAndBasicAuthenticator.java TestSSOnonLoginAndBasicAuthenticator.java

[Brian Burch]

On 05/03/12 18:45, ma...@apache.org wrote:

Author: markt
Date: Mon Mar  5 18:45:27 2012
New Revision: 1297158

URL: http://svn.apache.org/viewvc?rev=1297158&view=rev
Log:
Fix some test failures now response bodies are available for error
responses.

Modified:
 
tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
 
tomcat/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
 
tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java




My proposed new test class has not yet been committed:

org.apache.catalina.authenticator.TestSSOnonLoginAndDigestAuthenticator

I have already updated it to make it consistent with Mark's changes (above).


However, this new version of my test is failing in a peculiar manner and 
I am currently investigating the problem.


I will make any further comments on the original thread "New unit tests 
for Authenticators and SingleSignOn" in the hope of avoiding wasted 
effort or confusion.


Brian

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

Re: svn commit: r1297158 - in /tomcat/trunk/test/org/apache/catalina/authenticator: TestDigestAuthenticator.java TestNonLoginAndBasicAuthenticator.java TestSSOnonLoginAndBasicAuthenticator.java

[Konstantin Kolinko]

2012/3/6 Brian Burch :
> On 05/03/12 18:45, ma...@apache.org wrote:
>>
>> Author: markt
>> Date: Mon Mar  5 18:45:27 2012
>> New Revision: 1297158
>>
>> URL: http://svn.apache.org/viewvc?rev=1297158&view=rev
>> Log:
>> Fix some test failures now response bodies are available for error
>> responses.
>>
>> Modified:
>>
>> tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
>>
>> tomcat/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
>>
>> tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java
>>
> 
>
> My proposed new test class has not yet been committed:
>
> org.apache.catalina.authenticator.TestSSOnonLoginAndDigestAuthenticator
>
> I have already updated it to make it consistent with Mark's changes (above).
>
>
> However, this new version of my test is failing in a peculiar manner and I
> am currently investigating the problem.
>
> I will make any further comments on the original thread "New unit tests for
> Authenticators and SingleSignOn" in the hope of avoiding wasted effort or
> confusion.

It is better to propose new code and parches through Bugzilla.
That way there are lesser chances that it is lost in the flood of e-mails.

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: r1297520 - in /tomcat/trunk/webapps/examples: WEB-INF/ WEB-INF/classes/websocket/snake/ websocket/

[markt]

Author: markt
Date: Tue Mar  6 15:14:50 2012
New Revision: 1297520

URL: http://svn.apache.org/viewvc?rev=1297520&view=rev
Log:
Add a multi-player snake example for WebSocket.
Patch provide by Johno Crawford.

Added:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/Direction.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/Location.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/Snake.java

tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/SnakeWebSocketServlet.java
tomcat/trunk/webapps/examples/websocket/snake.html
Modified:
tomcat/trunk/webapps/examples/WEB-INF/web.xml
tomcat/trunk/webapps/examples/websocket/echo.html
tomcat/trunk/webapps/examples/websocket/index.html

Added: 
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/Direction.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/Direction.java?rev=1297520&view=auto
==
--- 
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/Direction.java 
(added)
+++ 
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/Direction.java 
Tue Mar  6 15:14:50 2012
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+package websocket.snake;
+
+public enum Direction {
+NONE, NORTH, SOUTH, EAST, WEST
+}

Added: 
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/Location.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/Location.java?rev=1297520&view=auto
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/Location.java 
(added)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/Location.java 
Tue Mar  6 15:14:50 2012
@@ -0,0 +1,65 @@
+/*
+ * 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.
+ */
+package websocket.snake;
+
+public class Location {
+
+public int x;
+public int y;
+
+public Location(int x, int y) {
+this.x = x;
+this.y = y;
+}
+
+public Location getAdjacentLocation(Direction direction) {
+switch (direction) {
+case NORTH:
+return new Location(x, y - SnakeWebSocketServlet.GRID_SIZE);
+case SOUTH:
+return new Location(x, y + SnakeWebSocketServlet.GRID_SIZE);
+case EAST:
+return new Location(x + SnakeWebSocketServlet.GRID_SIZE, y);
+case WEST:
+return new Location(x - SnakeWebSocketServlet.GRID_SIZE, y);
+case NONE:
+// fall through
+default:
+return this;
+}
+}
+
+@Override
+public boolean equals(Object o) {
+if (this == o) return true;
+if (o == null || getClass() != o.getClass()) return false;
+
+Location location = (Location) o;
+
+if (x != location.x) return false;
+if (y != location.y) return false;
+
+return true;
+}
+
+@Override
+public int hashCode() {
+int result = x;
+result = 31 * result + y;
+return result;
+}
+}

Added: tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/Snake.java
URL: 
http://svn.apache.org/viewvc/tomcat/t

DO NOT REPLY [Bug 51181] Add support for Web Sockets

[bugzilla]

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

--- Comment #57 from Mark Thomas  2012-03-06 15:15:27 UTC ---
(In reply to comment #56)
> Created attachment 28420 [details]
> Multiplayer snake example

Brilliant. Simply brilliant.

I did clean up a few warnings and reduced some line lengths. I also removed the
author tags since we no longer add those. You will get credit in the commit
message and the change log.

The only niggle I could find is that a snake can cross over itself. Is that
meant to be allowed?

-- 
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: r1297540 - in /tomcat/jk/trunk/xdocs: ajp/project.xml generic_howto/project.xml index.xml miscellaneous/project.xml news/20120301.xml news/project.xml project.xml reference/project.xml web

[mturk]

Author: mturk
Date: Tue Mar  6 15:51:38 2012
New Revision: 1297540

URL: http://svn.apache.org/viewvc?rev=1297540&view=rev
Log:
Add year 2012 news section

Added:
tomcat/jk/trunk/xdocs/news/20120301.xml   (with props)
Modified:
tomcat/jk/trunk/xdocs/ajp/project.xml
tomcat/jk/trunk/xdocs/generic_howto/project.xml
tomcat/jk/trunk/xdocs/index.xml
tomcat/jk/trunk/xdocs/miscellaneous/project.xml
tomcat/jk/trunk/xdocs/news/project.xml
tomcat/jk/trunk/xdocs/project.xml
tomcat/jk/trunk/xdocs/reference/project.xml
tomcat/jk/trunk/xdocs/webserver_howto/project.xml

Modified: tomcat/jk/trunk/xdocs/ajp/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/ajp/project.xml?rev=1297540&r1=1297539&r2=1297540&view=diff
==
--- tomcat/jk/trunk/xdocs/ajp/project.xml (original)
+++ tomcat/jk/trunk/xdocs/ajp/project.xml Tue Mar  6 15:51:38 2012
@@ -67,6 +67,7 @@
 
 
 
+
 
 
 

Modified: tomcat/jk/trunk/xdocs/generic_howto/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/generic_howto/project.xml?rev=1297540&r1=1297539&r2=1297540&view=diff
==
--- tomcat/jk/trunk/xdocs/generic_howto/project.xml (original)
+++ tomcat/jk/trunk/xdocs/generic_howto/project.xml Tue Mar  6 15:51:38 2012
@@ -67,6 +67,7 @@
 
 
 
+
 
 
 

Modified: tomcat/jk/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/index.xml?rev=1297540&r1=1297539&r2=1297540&view=diff
==
--- tomcat/jk/trunk/xdocs/index.xml (original)
+++ tomcat/jk/trunk/xdocs/index.xml Tue Mar  6 15:51:38 2012
@@ -273,6 +273,8 @@ This page contains information, on some 
 
 
 
+2012
+
 2011
 
 2010

Modified: tomcat/jk/trunk/xdocs/miscellaneous/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/project.xml?rev=1297540&r1=1297539&r2=1297540&view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/project.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/project.xml Tue Mar  6 15:51:38 2012
@@ -67,6 +67,7 @@
 
 
 
+
 
 
 

Added: tomcat/jk/trunk/xdocs/news/20120301.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/news/20120301.xml?rev=1297540&view=auto
==
--- tomcat/jk/trunk/xdocs/news/20120301.xml (added)
+++ tomcat/jk/trunk/xdocs/news/20120301.xml Tue Mar  6 15:51:38 2012
@@ -0,0 +1,38 @@
+
+
+
+]>
+
+
+  &project;
+
+  
+Apache Tomcat Connectors 
Project
+2011 News and Status
+  
+
+
+
+
+
+
+
+
+
+

Propchange: tomcat/jk/trunk/xdocs/news/20120301.xml
--
svn:eol-style = native

Modified: tomcat/jk/trunk/xdocs/news/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/news/project.xml?rev=1297540&r1=1297539&r2=1297540&view=diff
==
--- tomcat/jk/trunk/xdocs/news/project.xml (original)
+++ tomcat/jk/trunk/xdocs/news/project.xml Tue Mar  6 15:51:38 2012
@@ -67,6 +67,7 @@
 
 
 
+
 
 
 
@@ -76,6 +77,6 @@
 
 
 
-
+
 
 

Modified: tomcat/jk/trunk/xdocs/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/project.xml?rev=1297540&r1=1297539&r2=1297540&view=diff
==
--- tomcat/jk/trunk/xdocs/project.xml (original)
+++ tomcat/jk/trunk/xdocs/project.xml Tue Mar  6 15:51:38 2012
@@ -67,6 +67,7 @@
 
 
 
+
 
 
 

Modified: tomcat/jk/trunk/xdocs/reference/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/reference/project.xml?rev=1297540&r1=1297539&r2=1297540&view=diff
==
--- tomcat/jk/trunk/xdocs/reference/project.xml (original)
+++ tomcat/jk/trunk/xdocs/reference/project.xml Tue Mar  6 15:51:38 2012
@@ -67,6 +67,7 @@
 
 
 
+
 
 
 

Modified: tomcat/jk/trunk/xdocs/webserver_howto/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/webserver_howto/project.xml?rev=1297540&r1=1297539&r2=1297540&view=diff
==
--- tomcat/jk/trunk/xdocs/webserver_howto/project.xml (original)
+++ tomcat/jk/trunk/xdocs/webserver_howto/project.xml Tue Mar  6 15:51:38 2012
@@ -67,6 +67,7 @@
 
 
 
+
 
 
 



-
T

Re: svn commit: r1297158 - in /tomcat/trunk/test/org/apache/catalina/authenticator: TestDigestAuthenticator.java TestNonLoginAndBasicAuthenticator.java TestSSOnonLoginAndBasicAuthenticator.java

[Brian Burch]

On 06/03/12 14:58, Konstantin Kolinko wrote:

2012/3/6 Brian Burch:

However, this new version of my test is failing in a peculiar manner and I
am currently investigating the problem.

I will make any further comments on the original thread "New unit tests for
Authenticators and SingleSignOn" in the hope of avoiding wasted effort or
confusion.


It is better to propose new code and parches through Bugzilla.
That way there are lesser chances that it is lost in the flood of e-mails.

Best regards,
Konstantin Kolinko


Thanks for your advice, Konstantin. I hadn't thought of bugzilla because 
I didn't think it was appropriate for new unit test code. Now that I 
have rtfm'd, I see that I was wrong.


Just for the record, the "failing in a peculiar manner" was my fault, I 
didn't spot the crucial bc.recycle() Mark had added prior to reusing the 
ByteChunk in the second getUrl call.


Brian

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

svn commit: r1297548 - /tomcat/jk/trunk/native/common/jk_version.h

[mturk]

Author: mturk
Date: Tue Mar  6 16:09:35 2012
New Revision: 1297548

URL: http://svn.apache.org/viewvc?rev=1297548&view=rev
Log:
Temporary promote to release

Modified:
tomcat/jk/trunk/native/common/jk_version.h

Modified: tomcat/jk/trunk/native/common/jk_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_version.h?rev=1297548&r1=1297547&r2=1297548&view=diff
==
--- tomcat/jk/trunk/native/common/jk_version.h (original)
+++ tomcat/jk/trunk/native/common/jk_version.h Tue Mar  6 16:09:35 2012
@@ -29,7 +29,7 @@
 #define JK_VERFIX   33
 
 /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
-#define JK_VERISRELEASE 0
+#define JK_VERISRELEASE 1
 /* Beta number */
 #define JK_VERBETA  0
 #define JK_BETASTRING   "0"



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

svn commit: r1297551 - /tomcat/jk/trunk/tools/jkrelease.sh

[mturk]

Author: mturk
Date: Tue Mar  6 16:11:42 2012
New Revision: 1297551

URL: http://svn.apache.org/viewvc?rev=1297551&view=rev
Log:
Do not distribute KEYS with package. If someone tampers the package he can 
tamper the KEYS file as well. User must validate againt the KEYS file from ASF 
web site

Modified:
tomcat/jk/trunk/tools/jkrelease.sh

Modified: tomcat/jk/trunk/tools/jkrelease.sh
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/jkrelease.sh?rev=1297551&r1=1297550&r2=1297551&view=diff
==
--- tomcat/jk/trunk/tools/jkrelease.sh (original)
+++ tomcat/jk/trunk/tools/jkrelease.sh Tue Mar  6 16:11:42 2012
@@ -33,7 +33,6 @@ JK_OWNER="root"
 JK_GROUP="bin"
 JK_TOOLS="`pwd`"
 
-COPY_TOP="KEYS"
 COPY_JK="BUILD.txt native jkstatus support tools xdocs"
 COPY_NATIVE="LICENSE NOTICE"
 COPY_BUILD="docs"
@@ -210,11 +209,6 @@ if [ $? -ne 0 ]; then
   exit 1
 fi
 
-for item in ${COPY_TOP}
-do
-svn export $revision "${JK_SVN_URL}/${item}" ${JK_DIST}.tmp/${item}
-done
-
 # Build documentation.
 cd ${JK_DIST}.tmp/jk/xdocs
 ant
@@ -228,7 +222,6 @@ sed -e 's/^#define JK_REVISION .*/#defin
 rm $file.orig
 
 # Copying things into the source distribution
-copy_files ${JK_DIST}.tmp $JK_DIST "$COPY_TOP"
 copy_files ${JK_DIST}.tmp/jk $JK_DIST "$COPY_JK"
 copy_files ${JK_DIST}.tmp/jk/native $JK_DIST "$COPY_NATIVE"
 copy_files ${JK_DIST}.tmp/jk/build $JK_DIST "$COPY_BUILD"



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

DO NOT REPLY [Bug 52839] New: New unit test for DigestAuthenticator and SingleSignOn

[bugzilla]

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

 Bug #: 52839
   Summary: New unit test for DigestAuthenticator and SingleSignOn
   Product: Tomcat 7
   Version: trunk
  Platform: PC
OS/Version: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: br...@pingtoo.com
Classification: Unclassified


Created attachment 28425
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=28425
complete new class file

New test class for SingleSignOn and the Digest Authenticator. Code passes
validation and executes successfully against trunk svn commit: r1297158.

-- 
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: r1297571 - in /tomcat/jk/trunk: tools/jkrelease.sh xdocs/style.xsl

[mturk]

Author: mturk
Date: Tue Mar  6 16:54:34 2012
New Revision: 1297571

URL: http://svn.apache.org/viewvc?rev=1297571&view=rev
Log:
Add support for lynx html to txt converter

Modified:
tomcat/jk/trunk/tools/jkrelease.sh
tomcat/jk/trunk/xdocs/style.xsl

Modified: tomcat/jk/trunk/tools/jkrelease.sh
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/jkrelease.sh?rev=1297571&r1=1297570&r2=1297571&view=diff
==
--- tomcat/jk/trunk/tools/jkrelease.sh (original)
+++ tomcat/jk/trunk/tools/jkrelease.sh Tue Mar  6 16:54:34 2012
@@ -244,8 +244,9 @@ cd ${JK_DIST}/native
 W3MOPTS="-dump -cols 80 -t 4 -S -O iso-8859-1 -T text/html"
 ELNKOPTS="-dump -dump-width 80 -dump-charset iso-8859-1 -no-numbering -no-home"
 LNKOPTS="-dump -width 80 -codepage iso-8859-1 -no-g -html-numbered-links 0"
+LYXOPTS="-dump -width=80 -nolist -nostatus -noprint 
-assume_local_charset=iso-8859-1"
 failed=true
-for tool in `echo "w3m elinks links"`
+for tool in `echo "w3m elinks links lynx"`
 do
   found=false
   for dir in `echo ${PATH} | sed 's!^:!.:!;s!:$!:.!;s!::!:.:!g;s!:! !g'`
@@ -270,6 +271,9 @@ do
   elinks)
 TOOL="elinks $ELNKOPTS"
 ;;
+  lynx)
+TOOL="lynx $LYXKOPTS"
+;;
 esac
 rm -f CHANGES
 echo "Creating the CHANGES file using '$TOOL' ..."

Modified: tomcat/jk/trunk/xdocs/style.xsl
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/style.xsl?rev=1297571&r1=1297570&r2=1297571&view=diff
==
--- tomcat/jk/trunk/xdocs/style.xsl (original)
+++ tomcat/jk/trunk/xdocs/style.xsl Tue Mar  6 16:54:34 2012
@@ -106,7 +106,7 @@
   APACHE LOGO
   http://www.apache.org/";>
 http://www.apache.org/images/asf-logo.gif";
- align="right" alt="Apache Logo" border="0"/>
+ align="right" alt=":: Apache Software Foundation" border="0"/>
   
 
 
@@ -158,7 +158,7 @@
   
 
 
-  
+  
 
   
 



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

svn commit: r1297577 - in /tomcat/jk/trunk: tools/dist/README.html tools/dist/binaries/windows/README.html xdocs/style.xsl

[mturk]

Author: mturk
Date: Tue Mar  6 17:03:53 2012
New Revision: 1297577

URL: http://svn.apache.org/viewvc?rev=1297577&view=rev
Log:
Update to target release

Modified:
tomcat/jk/trunk/tools/dist/README.html
tomcat/jk/trunk/tools/dist/binaries/windows/README.html
tomcat/jk/trunk/xdocs/style.xsl

Modified: tomcat/jk/trunk/tools/dist/README.html
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/dist/README.html?rev=1297577&r1=1297576&r2=1297577&view=diff
==
--- tomcat/jk/trunk/tools/dist/README.html (original)
+++ tomcat/jk/trunk/tools/dist/README.html Tue Mar  6 17:03:53 2012
@@ -47,13 +47,13 @@ nearest mirror site!
 
 
 % pgpk -a KEYS
-% pgpv tomcat-connectors-1.2.32-src.tar.gz.asc
+% pgpv tomcat-connectors-1.2.33-src.tar.gz.asc
 or,
 % pgp -ka KEYS
-% pgp tomcat-connectors-1.2.32-src.tar.gz.asc
+% pgp tomcat-connectors-1.2.33-src.tar.gz.asc
 or,
 % gpg --import KEYS
-% gpg --verify tomcat-connectors-1.2.32-src.tar.gz.asc
+% gpg --verify tomcat-connectors-1.2.33-src.tar.gz.asc
 
 
 We offer MD5 and SHA1 hashes as an alternative to validate the integrity

Modified: tomcat/jk/trunk/tools/dist/binaries/windows/README.html
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/dist/binaries/windows/README.html?rev=1297577&r1=1297576&r2=1297577&view=diff
==
--- tomcat/jk/trunk/tools/dist/binaries/windows/README.html (original)
+++ tomcat/jk/trunk/tools/dist/binaries/windows/README.html Tue Mar  6 17:03:53 
2012
@@ -35,7 +35,7 @@
connector to fail.
 
 
-The current stable release is 1.2.32
+The current stable release is 1.2.33
 
 See the Apache Tomcat Connectors
 http://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html";>changelog

Modified: tomcat/jk/trunk/xdocs/style.xsl
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/style.xsl?rev=1297577&r1=1297576&r2=1297577&view=diff
==
--- tomcat/jk/trunk/xdocs/style.xsl (original)
+++ tomcat/jk/trunk/xdocs/style.xsl Tue Mar  6 17:03:53 2012
@@ -106,7 +106,7 @@
   APACHE LOGO
   http://www.apache.org/";>
 http://www.apache.org/images/asf-logo.gif";
- align="right" alt=":: Apache Software Foundation" border="0"/>
+ align="right" alt=" :: Apache Software Foundation" 
border="0"/>
   
 
 



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

DO NOT REPLY [Bug 52591] UnsupportedOperationException logged when fetching BasicDataSource 'loginTimeout'

[bugzilla]

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

--- Comment #3 from Jonathan Hodges  2012-03-06 17:20:48 UTC 
---
I am not sure this issue is fixed as I am still seeing a variant of this
behavior in 7.0.26.

I just posted the following to the Tomcat user forum.

Hi, 

We have been using the following two JMXProxy URLs for monitoring without issue
in 6.0.29. 

http://localhost:8080/manager/jmxproxy/?qry=*:type=Executor,name=tomcatThreadPool


OK - Number of results: 1 

Name: Catalina:type=Executor,name=tomcatThreadPool 
modelerType: org.apache.tomcat.util.modeler.BaseModelMBean 
threadPriority: 5 
queueSize: 0 
corePoolSize: 4 
maxIdleTime: 6 
threadRenewalDelay: 1000 
minSpareThreads: 4 
activeCount: 1 
maxThreads: 150 
completedTaskCount: 17 
maxQueueSize: 2147483647 
largestPoolSize: 5 
stateName: STARTED 
name: tomcatThreadPool 
poolSize: 3 
namePrefix: catalina-exec- 


http://localhost:8080/manager/jmxproxy/?qry=bean:name=eventingDataSource


OK - Number of results: 1 

Name: bean:name=eventingDataSource 
modelerType: org.apache.tomcat.jdbc.pool.DataSource 
MaxIdle: 100 
JdbcInterceptors:
org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer
 
DefaultTransactionIsolation: -1 
ValidationQuery: SELECT 1 FROM dual 
TestOnConnect: false 
Password: Password not available as DataSource/JMX operation. 
AbandonWhenPercentageFull: 0 
TestOnReturn: false 
Username:  
NumActive: 0 
MinIdle: 10 
PoolSize: 4 
ValidationInterval: 180 
Connection:
ProxyConnection[PooledConnection[oracle.jdbc.driver.T4CConnection@17f8b39]] 
NumIdle: 2 
AccessToUnderlyingConnectionAllowed: true 
Url: jdbc:oracle:thin:@(DESCRIPTION =(ADDRESS = (PROTOCOL = TCP)(HOST =
localhost)(PORT = 1580))(CONNECT_DATA =(SERVER = DEDICATED)( SERVICE_NAME =
anywhere.com )(INSTANCE_NAME = xxx)(SID = xxx))) 
Size: 4 
Active: 2 
AlternateUsernameAllowed: false 
TestOnBorrow: true 
LoginTimeout: 6 
MaxActive: 100 
MaxAge: 0 
SuspectTimeout: 0 
Pool: org.apache.tomcat.jdbc.pool.ConnectionPool@9283bf 
NumTestsPerEvictionRun: 0 
Name: Tomcat Connection Pool[1-6300663] 
MaxWait: 6000 
PoolProperties: ConnectionPool[defaultAutoCommit=null; defaultReadOnly=null;
defaultTransactionIsolation=-1; defaultCatalog=null;
driverClassName=oracle.jdbc.driver.OracleDriver; maxActive=100; maxIdle=100;
minIdle=10; initialSize=10; maxWait=6000; testOnBorrow=true;
testOnReturn=false; timeBetweenEvictionRunsMillis=3;
numTestsPerEvictionRun=0; minEvictableIdleTimeMillis=3;
testWhileIdle=false; testOnConnect=false; password=x;
url=jdbc:oracle:thin:@(DESCRIPTION =(ADDRESS = (PROTOCOL = TCP)(HOST =
localhost)(PORT = 1580))(CONNECT_DATA =(SERVER = DEDICATED)( SERVICE_NAME =
p201.nbcuni.ge.com )(INSTANCE_NAME = xxx)(SID = xxx))); username=NBCAFS_GUSER;
validationQuery=SELECT 1 FROM dual; validationInterval=180;
accessToUnderlyingConnectionAllowed=true; removeAbandoned=true;
removeAbandonedTimeout=60; logAbandoned=true; connectionProperties=null;
initSQL=null;
jdbcInterceptors=org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer;
jmxEnabled=true; fairQueue=false; useEquals=false; abandonWhenPercentageFull=0;
maxAge=0; useLock=false; dataSource=null; dataSourceJNDI=null;
alternateUsernameAllowed=false; 
PoolName: Tomcat Connection Pool[1-6300663] 
WaitCount: 0 
JmxEnabled: true 
TestWhileIdle: false 
UseEquals: false 
UseLock: false 
DriverClassName: oracle.jdbc.driver.OracleDriver 
RemoveAbandonedTimeout: 60 
DbProperties: {user=, password=} 
Idle: 2 
LogAbandoned: true 
FairQueue: false 
PoolSweeperEnabled: true 
ConnectionAsync:
org.apache.tomcat.jdbc.pool.ConnectionPool$ConnectionFuture@e9c2d3 
JdbcInterceptorsAsArray:
Array[org.apache.tomcat.jdbc.pool.PoolProperties$InterceptorDefinition] of
length 2 
   
org.apache.tomcat.jdbc.pool.PoolProperties$InterceptorDefinition@125f027 
   
org.apache.tomcat.jdbc.pool.PoolProperties$InterceptorDefinition@1b99628 
RemoveAbandoned: true 
TimeBetweenEvictionRunsMillis: 3 
MinEvictableIdleTimeMillis: 3 
InitialSize: 10 


After upgrading to 7.0.26 the JMXProxy URLs still return the correct data
however I am now seeing the following exceptions in the Tomcat logs. 


Mar 6, 2012 9:17:40 AM org.apache.catalina.mbeans.MBeanDumper dumpBeans 
SEVERE: Error getting attribute Catalina:type=Executor,name=tomcatThreadPool
prestartminSpareThreads 
javax.management.ReflectionException: Cannot find getter method
getPrestartminSpareThreads 
at
org.apache.tomcat.util.modeler.ManagedBean.getGetter(ManagedBean.java:517) 
at
org.apache.tomcat.util.modeler.BaseModelMBean.getAttribute(BaseModelMBean.java:181)
 
at
com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.getAttribute(DefaultMBeanServerInterceptor.java:666)
 
at
com.sun.jmx.mbeanserver.JmxMBeanServer.getAttribute(JmxMBeanServer.java:638) 
at
org.apache.catalina.mbeans.MBeanDumpe

svn commit: r1297583 - /tomcat/jk/trunk/tools/jkrelease.sh

[mturk]

Author: mturk
Date: Tue Mar  6 17:21:12 2012
New Revision: 1297583

URL: http://svn.apache.org/viewvc?rev=1297583&view=rev
Log:
No need for local links in dump

Modified:
tomcat/jk/trunk/tools/jkrelease.sh

Modified: tomcat/jk/trunk/tools/jkrelease.sh
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/jkrelease.sh?rev=1297583&r1=1297582&r2=1297583&view=diff
==
--- tomcat/jk/trunk/tools/jkrelease.sh (original)
+++ tomcat/jk/trunk/tools/jkrelease.sh Tue Mar  6 17:21:12 2012
@@ -242,7 +242,7 @@ cd ${JK_DIST}/native
 
 # Check for links, elinks or w3m
 W3MOPTS="-dump -cols 80 -t 4 -S -O iso-8859-1 -T text/html"
-ELNKOPTS="-dump -dump-width 80 -dump-charset iso-8859-1 -no-numbering -no-home"
+ELNKOPTS="-dump -dump-width 80 -dump-charset iso-8859-1 -no-numbering -no-home 
-no-references"
 LNKOPTS="-dump -width 80 -codepage iso-8859-1 -no-g -html-numbered-links 0"
 LYXOPTS="-dump -width=80 -nolist -nostatus -noprint 
-assume_local_charset=iso-8859-1"
 failed=true



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

Removing html to txt conversion for changelog and news in JK (1.2.33+)

[Mladen Turk]

Hi,

Converted html files (no mater which tool used)
just look ugly. I see no point of having trash-like content
distributed, so can we just axe those conversion?

The content is already present in src as generated html file(s)
so converting them to .txt is useless if unreadable and IMHO
nowadays everyone has a web browser at disposal ;)

Objections?


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 52591] UnsupportedOperationException logged when fetching BasicDataSource 'loginTimeout'

[bugzilla]

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

--- Comment #4 from Christopher Schultz  
2012-03-06 18:52:02 UTC ---
Jonathan,

I think this is a different bug: my original report was about
UnsupportedOperationExceptions being thrown by the beans themselves. In your
case, it looks like the JDBC pool doesn't implement some expected interface
("Connection from pool does not implement javax.sql.XAConnection") and/or the
MBean has been registered/configured incorrectly.

I'm not saying this isn't a bug... it's just not THIS bug. Could you re-file
under a new bug id?

-- 
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: r1297716 - /tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java

[markt]

Author: markt
Date: Tue Mar  6 20:55:29 2012
New Revision: 1297716

URL: http://svn.apache.org/viewvc?rev=1297716&view=rev
Log:
Code clean-up promoted by the UCDetector.

Modified:
tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java

Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java?rev=1297716&r1=1297715&r2=1297716&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java Tue Mar 
 6 20:55:29 2012
@@ -64,9 +64,7 @@ public class MemoryUserDatabase implemen
  * Create a new instance with default values.
  */
 public MemoryUserDatabase() {
-
-super();
-
+this(null);
 }
 
 
@@ -76,10 +74,7 @@ public class MemoryUserDatabase implemen
  * @param id Unique global identifier of this user database
  */
 public MemoryUserDatabase(String id) {
-
-super();
 this.id = id;
-
 }
 
 
@@ -90,13 +85,13 @@ public class MemoryUserDatabase implemen
  * The set of {@link Group}s defined in this database, keyed by
  * group name.
  */
-protected HashMap groups = new HashMap();
+protected final HashMap groups = new HashMap();
 
 
 /**
  * The unique global identifier of this user database.
  */
-protected String id = null;
+protected final String id;
 
 
 /**
@@ -129,7 +124,7 @@ public class MemoryUserDatabase implemen
  * The set of {@link Role}s defined in this database, keyed by
  * role name.
  */
-protected HashMap roles = new HashMap();
+protected final HashMap roles = new HashMap();
 
 
 /**
@@ -143,7 +138,7 @@ public class MemoryUserDatabase implemen
  * The set of {@link User}s defined in this database, keyed by
  * user name.
  */
-protected HashMap users = new HashMap();
+protected final HashMap users = new HashMap();
 
 
 // - Properties



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

svn commit: r1297717 - /tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java

[markt]

Author: markt
Date: Tue Mar  6 20:56:10 2012
New Revision: 1297717

URL: http://svn.apache.org/viewvc?rev=1297717&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52726
Clean-up. Avoid unlikely fd leak.

Modified:
tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java

Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java?rev=1297717&r1=1297716&r2=1297717&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java Tue Mar 
 6 20:56:10 2012
@@ -14,11 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina.users;
 
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -35,13 +32,11 @@ import org.apache.catalina.User;
 import org.apache.catalina.UserDatabase;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.digester.AbstractObjectCreationFactory;
 import org.apache.tomcat.util.digester.Digester;
 import org.apache.tomcat.util.res.StringManager;
 import org.xml.sax.Attributes;
 
-
 /**
  * Concrete implementation of {@link UserDatabase} that loads all
  * defined users, groups, and roles into an in-memory data structure,
@@ -51,7 +46,6 @@ import org.xml.sax.Attributes;
  * @version $Id$
  * @since 4.1
  */
-
 public class MemoryUserDatabase implements UserDatabase {
 
 
@@ -410,7 +404,6 @@ public class MemoryUserDatabase implemen
 if (!file.exists()) {
 return;
 }
-FileInputStream fis = new FileInputStream(file);
 
 // Construct a digester to read the XML input file
 Digester digester = new Digester();
@@ -432,16 +425,18 @@ public class MemoryUserDatabase implemen
  new MemoryUserCreationFactory(this), true);
 
 // Parse the XML input file to load this database
+FileInputStream fis = null;
 try {
+fis =  new FileInputStream(file);
 digester.parse(fis);
-fis.close();
-} catch (Exception e) {
-try {
-fis.close();
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
+} finally {
+if (fis != null) {
+try {
+fis.close();
+} catch (IOException ioe) {
+// Ignore
+}
 }
-throw e;
 }
 
 }



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

svn commit: r1297720 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/users/MemoryUserDatabase.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Mar  6 21:03:29 2012
New Revision: 1297720

URL: http://svn.apache.org/viewvc?rev=1297720&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52726
Clean-up. Avoid unlikely fd leak.

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  6 21:03:29 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
 
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237

DO NOT REPLY [Bug 52726] An incomplete fix for the resource leak bug in MemoryUserDatabase.java

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED
 OS/Version||All

--- Comment #1 from Mark Thomas  2012-03-06 21:04:39 UTC ---
revision 423920 has nothing to do with attempting to prevent a resource leak.

The situation described in this report would generate an error message to the
logs on start-up which is very likely to result in Tomcat being shut down and
the issue fixed.

Even if the issue is not fixed, it would result in a single fd leak.

The component that this report references is not intended for production use.

Taken together, the above mean that a severity of critical is not appropriate
for this issue. It would do very little / no harm to leave the code as it is.
This is really an enhancement request to clean up the code a little.

This is the second issue of this nature I have reviewed from this reporter that
has demonstrated a lack of understanding of the code concerned and over
inflated the severity of the issue. It is becoming increasingly tempting to
simply close all the issues from this reporter as INVALID until they
demonstrate the ability to do some proper analysis.

-- 
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: r1297722 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java

[markt]

Author: markt
Date: Tue Mar  6 21:15:26 2012
New Revision: 1297722

URL: http://svn.apache.org/viewvc?rev=1297722&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=52727
Code clean-up

Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java

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=1297722&r1=1297721&r2=1297722&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Tue Mar  6 
21:15:26 2012
@@ -778,6 +778,7 @@ public class HostConfig
 JarFile jar = null;
 JarEntry entry = null;
 InputStream istream = null;
+FileOutputStream fos = null;
 BufferedOutputStream ostream = null;
 File xml;
 if (copyXML) {
@@ -798,9 +799,8 @@ public class HostConfig
 if ((copyXML || unpackWARs) && xmlInWar) {
 istream = jar.getInputStream(entry);
 
-ostream =
-new BufferedOutputStream
-(new FileOutputStream(xml), 1024);
+fos = new FileOutputStream(xml);
+ostream = new BufferedOutputStream(fos, 1024);
 byte buffer[] = new byte[1024];
 while (true) {
 int n = istream.read(buffer);
@@ -810,10 +810,6 @@ public class HostConfig
 ostream.write(buffer, 0, n);
 }
 ostream.flush();
-ostream.close();
-ostream = null;
-istream.close();
-istream = null;
 }
 } catch (IOException e) {
 /* Ignore */
@@ -821,16 +817,24 @@ public class HostConfig
 if (ostream != null) {
 try {
 ostream.close();
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
+} catch (IOException ioe) {
+// Ignore
 }
 ostream = null;
 }
+if (fos != null) {
+try {
+fos.close();
+} catch (IOException ioe) {
+// Ignore
+}
+fos = null;
+}
 if (istream != null) {
 try {
 istream.close();
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
+} catch (IOException ioe) {
+// Ignore
 }
 istream = null;
 }
@@ -838,8 +842,8 @@ public class HostConfig
 if (jar != null) {
 try {
 jar.close();
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
+} catch (IOException ioe) {
+// Ignore;
 }
 jar = null;
 }



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

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

[markt]

Author: markt
Date: Tue Mar  6 21:16:44 2012
New Revision: 1297723

URL: http://svn.apache.org/viewvc?rev=1297723&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=52727
Code clean-up

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/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  6 21:16:44 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
 
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,12

DO NOT REPLY [Bug 52727] An incomplete fix for the resource leak bug in HostConfig.java

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED
 OS/Version||All
   Severity|critical|enhancement

--- Comment #1 from Mark Thomas  2012-03-06 21:16:48 UTC ---
r423920 had nothing to do with attempting to fix a resource leak.

The only failures that might occur during the constructor of
BufferedOutputStream are the sort that signify far bigger problems that a
resource leak.

Yet another bug with an over-stated severity that should be an enhancement
request to clean-up the code.

-- 
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: r1297728 - /tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java

[markt]

Author: markt
Date: Tue Mar  6 21:25:32 2012
New Revision: 1297728

URL: http://svn.apache.org/viewvc?rev=1297728&view=rev
Log:
Code clean-up prompted by the UCDetector.

Modified:

tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java

Modified: 
tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java?rev=1297728&r1=1297727&r2=1297728&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java 
Tue Mar  6 21:25:32 2012
@@ -65,14 +65,14 @@ public class CometConnectionManagerValve
 /**
  * List of current Comet connections.
  */
-protected List cometRequests =
+protected final List cometRequests =
 Collections.synchronizedList(new ArrayList());
 
 
 /**
  * Name of session attribute used to store list of comet connections.
  */
-protected String cometRequestsAttribute =
+protected final String cometRequestsAttribute =
 "org.apache.tomcat.comet.connectionList";
 
 



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

svn commit: r1297729 - /tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java

[markt]

Author: markt
Date: Tue Mar  6 21:26:11 2012
New Revision: 1297729

URL: http://svn.apache.org/viewvc?rev=1297729&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=52729
Even if the end event fails, try and perform the close.

Modified:

tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java

Modified: 
tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java?rev=1297729&r1=1297728&r2=1297729&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java 
Tue Mar  6 21:26:11 2012
@@ -126,17 +126,23 @@ public class CometConnectionManagerValve
 session.removeAttribute(cometRequestsAttribute);
 }
 // Close the comet connection
+CometEventImpl cometEvent = request.getEvent();
 try {
-CometEventImpl cometEvent = request.getEvent();
 cometEvent.setEventType(CometEvent.EventType.END);
 cometEvent.setEventSubType(
 CometEvent.EventSubType.WEBAPP_RELOAD);
 getNext().event(request, request.getResponse(), 
cometEvent);
-cometEvent.close();
 } catch (Exception e) {
 container.getLogger().warn(
 sm.getString("cometConnectionManagerValve.event"),
 e);
+} finally {
+try {
+cometEvent.close();
+} catch (IOException e) {
+container.getLogger().warn(sm.getString(
+"cometConnectionManagerValve.event"), e);
+}
 }
 }
 cometRequests.clear();



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

svn commit: r1297730 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/CometConnectionManagerValve.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Mar  6 21:27:04 2012
New Revision: 1297730

URL: http://svn.apache.org/viewvc?rev=1297730&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=52729
Even if the end event fails, try and perform the close.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  6 21:27:04 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
 
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427

DO NOT REPLY [Bug 52729] An incomplete fix for the resource leak bug in CometConnectionManagerValve.java

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED
 OS/Version||All
   Severity|critical|enhancement

--- Comment #1 from Mark Thomas  2012-03-06 21:27:10 UTC ---
r640273 has nothing to do with fixing potential resource leaks.

If the end event fails, the chances of the close event working are pretty slim.

Given that this code is part of the shutdown, a resource leak at this point is
a minor issue at best and is probably not an issue at all.

Yet another enhancement where the severity has been badly mis-judged.

-- 
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 failure in ASF Buildbot on tomcat-trunk

[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/2816

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

Buildslave for this Build: bb-vm_ubuntu

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

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot

DO NOT REPLY [Bug 52730] Another incomplete fix for the resource leak bug in CometConnectionManagerValve.java

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #1 from Mark Thomas  2012-03-06 21:30:09 UTC ---
Complete, total and utter nonsense.

r730178 has nothing to do with either the CometConnectionManagerValve nor
fixing a resource leak.

The line number referenced does not exist in CometConnectionManagerValve.java

This looks like an incoherent  mish-mash of bug 52729 and bug 52724.

-- 
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: buildbot failure in ASF Buildbot on tomcat-trunk

[Mark Thomas]

On 06/03/2012 21:27, build...@apache.org wrote:
> 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/2816
> 
> Buildbot URL: http://ci.apache.org/
> 
> Buildslave for this Build: bb-vm_ubuntu
> 
> Build Reason: scheduler
> Build Source Stamp: [branch tomcat/trunk] 1297717
> Blamelist: markt
> 
> BUILD FAILED: failed compile_1

Drat. The Comet unit tests are still failing. I had hoped we had fixed that.

We really need the Gump run to fail so we have access to the full logs
to better understand which test is failing and why. Either that or a way
to extract the logs from buildbot. Hmm. I probably have access to that
machine. I'll go and have a look.

Mark

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

Re: buildbot failure in ASF Buildbot on tomcat-trunk

[Konstantin Kolinko]

2012/3/7 Mark Thomas :
> On 06/03/2012 21:27, build...@apache.org wrote:
>> 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/2816
>>
>> Buildbot URL: http://ci.apache.org/
>>
>> Buildslave for this Build: bb-vm_ubuntu
>>
>> Build Reason: scheduler
>> Build Source Stamp: [branch tomcat/trunk] 1297717
>> Blamelist: markt
>>
>> BUILD FAILED: failed compile_1
>
> Drat. The Comet unit tests are still failing. I had hoped we had fixed that.
>
> We really need the Gump run to fail so we have access to the full logs
> to better understand which test is failing and why. Either that or a way
> to extract the logs from buildbot. Hmm. I probably have access to that
> machine. I'll go and have a look.
>

It is possible to make junit to spew the logs onto stdout by defining
junit.formatter.usefile=false

I mentioned that in
https://issues.apache.org/jira/browse/INFRA-3948

Maybe go this way, because the task of providing us access to separate
log files like in Gump has no progress at all.

>From RAT report I know that buildbot has build.properties file in the
root of the project. I do not know how it is created - probably by
some shell script.  The new property can be added there.

Best regards,
Konstantin Kolinko

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

DO NOT REPLY [Bug 51181] Add support for Web Sockets

[bugzilla]

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

--- Comment #58 from Johno Crawford  2012-03-06 21:54:46 UTC 
---
Created attachment 28426
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=28426
Multiplayer snake collision fix

Thanks for taking the time to fix the warnings, formatting and taking in the
patch Mark. Please find attached patch which should fix the collision problems.

-- 
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: r1297571 - in /tomcat/jk/trunk: tools/jkrelease.sh xdocs/style.xsl

[Konstantin Kolinko]

2012/3/6  :
> Author: mturk
> Date: Tue Mar  6 16:54:34 2012
> New Revision: 1297571
>
> URL: http://svn.apache.org/viewvc?rev=1297571&view=rev
> Log:
> Add support for lynx html to txt converter
>
> Modified:
>    tomcat/jk/trunk/tools/jkrelease.sh
>    tomcat/jk/trunk/xdocs/style.xsl
>
> Modified: tomcat/jk/trunk/tools/jkrelease.sh
> URL: 
> http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/jkrelease.sh?rev=1297571&r1=1297570&r2=1297571&view=diff
> ==
> --- tomcat/jk/trunk/tools/jkrelease.sh (original)
> +++ tomcat/jk/trunk/tools/jkrelease.sh Tue Mar  6 16:54:34 2012
> @@ -244,8 +244,9 @@ cd ${JK_DIST}/native
>  W3MOPTS="-dump -cols 80 -t 4 -S -O iso-8859-1 -T text/html"
>  ELNKOPTS="-dump -dump-width 80 -dump-charset iso-8859-1 -no-numbering 
> -no-home"
>  LNKOPTS="-dump -width 80 -codepage iso-8859-1 -no-g -html-numbered-links 0"
> +LYXOPTS="-dump -width=80 -nolist -nostatus -noprint 
> -assume_local_charset=iso-8859-1"

Is typo in the variable name above a deliberate one?
(LYX vs LYNX ?)

Though I see that it follows the link->LNK, elink ->ELNK pattern.


>  failed=true
> -for tool in `echo "w3m elinks links"`
> +for tool in `echo "w3m elinks links lynx"`
>  do
>   found=false
>   for dir in `echo ${PATH} | sed 's!^:!.:!;s!:$!:.!;s!::!:.:!g;s!:! !g'`
> @@ -270,6 +271,9 @@ do
>       elinks)
>         TOOL="elinks $ELNKOPTS"
>         ;;
> +      lynx)
> +        TOOL="lynx $LYXKOPTS"
> +        ;;
>     esac
>     rm -f CHANGES
>     echo "Creating the CHANGES file using '$TOOL' ..."
>
> Modified: tomcat/jk/trunk/xdocs/style.xsl

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: r1297760 - in /tomcat/trunk/webapps/examples: WEB-INF/classes/websocket/snake/Snake.java WEB-INF/classes/websocket/snake/SnakeWebSocketServlet.java websocket/snake.html

[markt]

Author: markt
Date: Tue Mar  6 22:21:11 2012
New Revision: 1297760

URL: http://svn.apache.org/viewvc?rev=1297760&view=rev
Log:
Fix collision bug (steering into your own snake now kills the snake)

Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/Snake.java

tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/SnakeWebSocketServlet.java
tomcat/trunk/webapps/examples/websocket/snake.html

Modified: 
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/Snake.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/Snake.java?rev=1297760&r1=1297759&r2=1297760&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/Snake.java 
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/Snake.java 
Tue Mar  6 22:21:11 2012
@@ -21,19 +21,20 @@ import java.nio.CharBuffer;
 import java.util.ArrayDeque;
 import java.util.Collection;
 import java.util.Deque;
-import java.util.Iterator;
 
 import org.apache.catalina.websocket.WsOutbound;
 
 public class Snake {
 
-private static final int DEFAULT_LENGTH = 6;
+private static final int DEFAULT_LENGTH = 5;
 
 private final int id;
 private final WsOutbound outbound;
 
 private Direction direction;
-private Deque locations = new ArrayDeque();
+private int length = DEFAULT_LENGTH;
+private Location head;
+private Deque tail = new ArrayDeque();
 private String hexColor;
 
 public Snake(int id, WsOutbound outbound) {
@@ -45,14 +46,12 @@ public class Snake {
 
 private void resetState() {
 this.direction = Direction.NONE;
-this.locations.clear();
-Location startLocation = SnakeWebSocketServlet.getRandomLocation();
-for (int i = 0; i < DEFAULT_LENGTH; i++) {
-locations.add(startLocation);
-}
+this.head = SnakeWebSocketServlet.getRandomLocation();
+this.tail.clear();
+this.length = DEFAULT_LENGTH;
 }
 
-private void kill() {
+private synchronized void kill() {
 resetState();
 try {
 CharBuffer response = CharBuffer.wrap("{'type': 'dead'}");
@@ -62,8 +61,8 @@ public class Snake {
 }
 }
 
-private void reward() {
-grow();
+private synchronized void reward() {
+length++;
 try {
 CharBuffer response = CharBuffer.wrap("{'type': 'kill'}");
 outbound.writeTextMessage(response);
@@ -73,8 +72,7 @@ public class Snake {
 }
 
 public synchronized void update(Collection snakes) {
-Location firstLocation = locations.getFirst();
-Location nextLocation = firstLocation.getAdjacentLocation(direction);
+Location nextLocation = head.getAdjacentLocation(direction);
 if (nextLocation.x >= SnakeWebSocketServlet.PLAYFIELD_WIDTH) {
 nextLocation.x = 0;
 }
@@ -87,42 +85,40 @@ public class Snake {
 if (nextLocation.y < 0) {
 nextLocation.y = SnakeWebSocketServlet.PLAYFIELD_HEIGHT;
 }
-locations.addFirst(nextLocation);
-locations.removeLast();
+if (direction != Direction.NONE) {
+tail.addFirst(head);
+if (tail.size() > length) {
+tail.removeLast();
+}
+head = nextLocation;
+}
 
 for (Snake snake : snakes) {
-if (snake.getId() != getId() &&
-colliding(snake.getHeadLocation())) {
-snake.kill();
-reward();
+if (snake.getTail().contains(head)) {
+kill();
+if (id != snake.id) {
+snake.reward();
+}
 }
 }
 }
 
-private void grow() {
-Location lastLocation = locations.getLast();
-Location newLocation = new Location(lastLocation.x, lastLocation.y);
-locations.add(newLocation);
-}
-
-private boolean colliding(Location location) {
-return direction != Direction.NONE && locations.contains(location);
+public synchronized Collection getTail() {
+return tail;
 }
 
-public void setDirection(Direction direction) {
+public synchronized void setDirection(Direction direction) {
 this.direction = direction;
 }
 
 public synchronized String getLocationsJson() {
 StringBuilder sb = new StringBuilder();
-for (Iterator iterator = locations.iterator();
-iterator.hasNext();) {
-Location location = iterator.next();
+sb.append(String.format("{x: %d, y: %d}",
+Integer.valueOf(head.x), Integer.valueOf(head.y)));
+for (Location location : tail) {
+sb.append(',');
 sb.append(String.format("{x: %d, y: %d}",
 Integer.valueOf(location.x), Integer.va

DO NOT REPLY [Bug 51181] Add support for Web Sockets

[bugzilla]

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

--- Comment #59 from Mark Thomas  2012-03-06 22:21:36 UTC ---
(In reply to comment #58)
> Created attachment 28426 [details]
> Multiplayer snake collision fix
> 
> Thanks for taking the time to fix the warnings, formatting and taking in the
> patch Mark. Please find attached patch which should fix the collision 
> problems.

Many thanks for such a speedy response. I wasn't even sure it was a bug.

As an example, this really is fantastic. Your efforts are very much
appreciated.

-- 
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 propchange: r1297760 - svn:log

[markt]

Author: markt
Revision: 1297760
Modified property: svn:log

Modified: svn:log at Tue Mar  6 22:23:25 2012
--
--- svn:log (original)
+++ svn:log Tue Mar  6 22:23:25 2012
@@ -1 +1,2 @@
 Fix collision bug (steering into your own snake now kills the snake)
+Patch provided by Johno Crawford


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

svn commit: r1297768 - /tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java

[markt]

Author: markt
Date: Tue Mar  6 22:38:54 2012
New Revision: 1297768

URL: http://svn.apache.org/viewvc?rev=1297768&view=rev
Log:
Code clean-up prompted by the UCDetector.

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java?rev=1297768&r1=1297767&r2=1297768&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java Tue Mar  6 
22:38:54 2012
@@ -90,8 +90,8 @@ public class JDTCompiler extends org.apa
 
 class CompilationUnit implements ICompilationUnit {
 
-String className;
-String sourceFile;
+private final String className;
+private final String sourceFile;
 
 CompilationUnit(String sourceFile, String className) {
 this.className = className;



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

svn commit: r1297769 - /tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java

[markt]

Author: markt
Date: Tue Mar  6 22:39:33 2012
New Revision: 1297769

URL: http://svn.apache.org/viewvc?rev=1297769&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52731
Clean-up code. Fixes potential resource leak although the problems that
would trigger the leak are far more serious than the leak.

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java?rev=1297769&r1=1297768&r2=1297769&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java Tue Mar  6 
22:39:33 2012
@@ -107,12 +107,13 @@ public class JDTCompiler extends org.apa
 public char[] getContents() {
 char[] result = null;
 FileInputStream is = null;
+InputStreamReader isr = null;
 Reader reader = null;
 try {
 is = new FileInputStream(sourceFile);
-
-reader = new BufferedReader(new InputStreamReader(is,
-ctxt.getOptions().getJavaEncoding()));
+isr = new InputStreamReader(is,
+ctxt.getOptions().getJavaEncoding());
+reader = new BufferedReader(isr);
 char[] chars = new char[8192];
 StringBuilder buf = new StringBuilder();
 int count;
@@ -130,6 +131,11 @@ public class JDTCompiler extends org.apa
 reader.close();
 } catch (IOException ioe) {/*Ignore*/}
 }
+if (isr != null) {
+try {
+isr.close();
+} catch (IOException ioe) {/*Ignore*/}
+}
 if (is != null) {
 try {
 is.close();



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

svn commit: r1297770 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/JDTCompiler.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Mar  6 22:40:36 2012
New Revision: 1297770

URL: http://svn.apache.org/viewvc?rev=1297770&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52731
Clean-up code. Fixes potential resource leak although the problems that
would trigger the leak are far more serious than the leak.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  6 22:40:36 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
 
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1

DO NOT REPLY [Bug 52731] An incomplete fix for the resource leak bug in JDTCompiler.java

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED
 OS/Version||All
   Severity|critical|enhancement

--- Comment #1 from Mark Thomas  2012-03-06 22:40:57 UTC ---
The failures that might trigger this issue are either an
UnsupportedEncodingException in which case JSP compilation would be completely
broken (and a much bigger issue that any resource leak) or the sort of error
(e.g. OOME) that is far more serious than the resource leak and is likely to
cause the JVM to terminate anyway.

Over all, not a critical issue. More like an enhancement request to clean up
the code.

Fixed in trunk and 7.0.x and will be included in 7.0.27 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

svn commit: r1297778 - /tomcat/trunk/java/javax/el/ExpressionFactory.java

[markt]

Author: markt
Date: Tue Mar  6 22:56:31 2012
New Revision: 1297778

URL: http://svn.apache.org/viewvc?rev=1297778&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52732
Clean-up code. Fixes potential resource leak although the problems that
would trigger the leak are far more serious than the leak.

Modified:
tomcat/trunk/java/javax/el/ExpressionFactory.java

Modified: tomcat/trunk/java/javax/el/ExpressionFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ExpressionFactory.java?rev=1297778&r1=129&r2=1297778&view=diff
==
--- tomcat/trunk/java/javax/el/ExpressionFactory.java (original)
+++ tomcat/trunk/java/javax/el/ExpressionFactory.java Tue Mar  6 22:56:31 2012
@@ -227,8 +227,10 @@ public abstract class ExpressionFactory 
 if (is != null) {
 String line = null;
 BufferedReader br = null;
+InputStreamReader isr = null;
 try {
-br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+isr = new InputStreamReader(is, "UTF-8");
+br = new BufferedReader(isr);
 line = br.readLine();
 if (line != null && line.trim().length() > 0) {
 return line.trim();
@@ -246,6 +248,11 @@ public abstract class ExpressionFactory 
 }
 } catch (IOException ioe) {/*Ignore*/}
 try {
+if (isr != null) {
+isr.close();
+}
+} catch (IOException ioe) {/*Ignore*/}
+try {
 is.close();
 } catch (IOException ioe) {/*Ignore*/}
 }



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

DO NOT REPLY [Bug 52732] An incomplete fix for the resource leak bug in ExpressionFactory.java

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED
 OS/Version||All
   Severity|critical|enhancement

--- Comment #1 from Mark Thomas  2012-03-06 22:58:31 UTC ---
Yet another enhancement claiming greater severity than deserved.

Fixed in trunk and 7.0.x and will be included in 7.0.27 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

svn commit: r1297781 - in /tomcat/tc7.0.x/trunk: ./ java/javax/el/ExpressionFactory.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Mar  6 22:58:30 2012
New Revision: 1297781

URL: http://svn.apache.org/viewvc?rev=1297781&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52732
Clean-up code. Fixes potential resource leak although the problems that
would trigger the leak are far more serious than the leak.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/javax/el/ExpressionFactory.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  6 22:58:30 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
 
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,12371

Re: buildbot failure in ASF Buildbot on tomcat-trunk

[Konstantin Kolinko]

2012/3/7 Mark Thomas :
> On 06/03/2012 21:27, build...@apache.org wrote:
>> 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/2816
>>
>> Buildbot URL: http://ci.apache.org/
>>
>> Buildslave for this Build: bb-vm_ubuntu
>>
>> Build Reason: scheduler
>> Build Source Stamp: [branch tomcat/trunk] 1297717
>> Blamelist: markt
>>
>> BUILD FAILED: failed compile_1
>
> Drat. The Comet unit tests are still failing. I had hoped we had fixed that.
>
> We really need the Gump run to fail so we have access to the full logs
> to better understand which test is failing and why. Either that or a way
> to extract the logs from buildbot. Hmm. I probably have access to that
> machine. I'll go and have a look.
>

One more:
Gump MacOS server fails the Comet tests in trunk and 7.0.x

See
http://tomcat.apache.org/ci.html#Gump
then look for "Adam"

http://adam.apache.org/gump/tomcat-trunk/tomcat-trunk-test/gump_file/TEST-org.apache.catalina.comet.TestCometProcessor.NIO.txt.html

The trunk and tc7.0.x runs have the same failure - the stop test fails:
[[[
Testcase: testCometConnectorStop took 13.144 sec
FAILED
Comet END event not received
junit.framework.AssertionFailedError: Comet END event not received
at 
org.apache.catalina.comet.TestCometProcessor.testCometConnectorStop(TestCometProcessor.java:325)
]]]

Log:

[[[
Mar 6, 2012 11:43:24 AM org.apache.coyote.AbstractProtocol init
INFO: Initializing ProtocolHandler ["http-nio-127.0.0.1-auto-6"]
Mar 6, 2012 11:43:24 AM org.apache.tomcat.util.net.NioSelectorPool
getSharedSelector
INFO: Using a shared selector for servlet write/read
Mar 6, 2012 11:43:24 AM org.apache.catalina.core.StandardService startInternal
INFO: Starting service Tomcat
Mar 6, 2012 11:43:24 AM org.apache.catalina.core.StandardEngine startInternal
INFO: Starting Servlet Engine: Apache Tomcat/8.0.0-dev
Mar 6, 2012 11:43:24 AM org.apache.coyote.AbstractProtocol start
INFO: Starting ProtocolHandler ["http-nio-127.0.0.1-auto-6"]
Mar 6, 2012 11:43:27 AM org.apache.coyote.AbstractProtocol stop
INFO: Stopping ProtocolHandler ["http-nio-127.0.0.1-auto-6"]
Mar 6, 2012 11:43:37 AM org.apache.coyote.AbstractProtocol destroy
INFO: Destroying ProtocolHandler ["http-nio-127.0.0.1-auto-6"]
Mar 6, 2012 11:43:37 AM org.apache.catalina.comet.TestCometProcessor
testCometConnectorStop
SEVERE: Status:
WriterThread exception: null
ReaderThread exception: java.net.SocketTimeoutException: Read timed out
Last message: [Client: READ: 4 bytes]
Last response line: [Client: READ: 4 bytes]
Last comet event: [READ]
Mar 6, 2012 11:43:37 AM org.apache.catalina.core.StandardService stopInternal
INFO: Stopping service Tomcat
]]]

It is likely that Tomcat stops without delivering END event to the
servlet. So the last event that it sees was "READ".

I think that this issue is not a serious one.

Best regards,
Konstantin Kolinko

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

Re: buildbot failure in ASF Buildbot on tomcat-trunk

[Konstantin Kolinko]

2012/3/7 Konstantin Kolinko :
> 2012/3/7 Mark Thomas :
>> On 06/03/2012 21:27, build...@apache.org wrote:
>>> 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/2816
>>>
>>> Buildbot URL: http://ci.apache.org/
>>>
>>> Buildslave for this Build: bb-vm_ubuntu
>>>
>>> Build Reason: scheduler
>>> Build Source Stamp: [branch tomcat/trunk] 1297717
>>> Blamelist: markt
>>>
>>> BUILD FAILED: failed compile_1
>>
>> Drat. The Comet unit tests are still failing. I had hoped we had fixed that.
>>
>> We really need the Gump run to fail so we have access to the full logs
>> to better understand which test is failing and why. Either that or a way
>> to extract the logs from buildbot. Hmm. I probably have access to that
>> machine. I'll go and have a look.
>>
>
> One more:
> Gump MacOS server fails the Comet tests in trunk and 7.0.x
>
> See
> http://tomcat.apache.org/ci.html#Gump
> then look for "Adam"
>
> http://adam.apache.org/gump/tomcat-trunk/tomcat-trunk-test/gump_file/TEST-org.apache.catalina.comet.TestCometProcessor.NIO.txt.html
>
> The trunk and tc7.0.x runs have the same failure - the stop test fails:
> [[[
> Testcase: testCometConnectorStop took 13.144 sec
>        FAILED
> Comet END event not received
> junit.framework.AssertionFailedError: Comet END event not received
>        at 
> org.apache.catalina.comet.TestCometProcessor.testCometConnectorStop(TestCometProcessor.java:325)
> ]]]
>
> Log:
>
> [[[
> Mar 6, 2012 11:43:24 AM org.apache.coyote.AbstractProtocol init
> INFO: Initializing ProtocolHandler ["http-nio-127.0.0.1-auto-6"]
> Mar 6, 2012 11:43:24 AM org.apache.tomcat.util.net.NioSelectorPool
> getSharedSelector
> INFO: Using a shared selector for servlet write/read
> Mar 6, 2012 11:43:24 AM org.apache.catalina.core.StandardService startInternal
> INFO: Starting service Tomcat
> Mar 6, 2012 11:43:24 AM org.apache.catalina.core.StandardEngine startInternal
> INFO: Starting Servlet Engine: Apache Tomcat/8.0.0-dev
> Mar 6, 2012 11:43:24 AM org.apache.coyote.AbstractProtocol start
> INFO: Starting ProtocolHandler ["http-nio-127.0.0.1-auto-6"]
> Mar 6, 2012 11:43:27 AM org.apache.coyote.AbstractProtocol stop
> INFO: Stopping ProtocolHandler ["http-nio-127.0.0.1-auto-6"]
> Mar 6, 2012 11:43:37 AM org.apache.coyote.AbstractProtocol destroy
> INFO: Destroying ProtocolHandler ["http-nio-127.0.0.1-auto-6"]
> Mar 6, 2012 11:43:37 AM org.apache.catalina.comet.TestCometProcessor
> testCometConnectorStop
> SEVERE: Status:
> WriterThread exception: null
> ReaderThread exception: java.net.SocketTimeoutException: Read timed out
> Last message: [Client: READ: 4 bytes]
> Last response line: [Client: READ: 4 bytes]
> Last comet event: [READ]
> Mar 6, 2012 11:43:37 AM org.apache.catalina.core.StandardService stopInternal
> INFO: Stopping service Tomcat
> ]]]
>
> It is likely that Tomcat stops without delivering END event to the
> servlet. So the last event that it sees was "READ".
>
> I think that this issue is not a serious one.
>

And that is the same as in Buildbot stdout log from
http://ci.apache.org/builders/tomcat-trunk/builds/2816/

[[[
[junit] SEVERE: Status:
[junit] WriterThread exception: null
[junit] ReaderThread exception: java.net.SocketTimeoutException:
Read timed out
[junit] Last message: [Client: READ: 4 bytes]
[junit] Last response line: [Client: READ: 4 bytes]
[junit] Last comet event: [READ]
[junit] Mar 6, 2012 9:18:31 PM
org.apache.catalina.core.StandardService stopInternal
[junit] INFO: Stopping service Tomcat
[junit] Test org.apache.catalina.comet.TestCometProcessor FAILED
]]]

Best regards,
Konstantin Kolinko

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

DO NOT REPLY [Bug 52842] New: MBeanDumper dumpBeans SEVERE: Error getting attribute while using JMXProxy servlet

[bugzilla]

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

 Bug #: 52842
   Summary: MBeanDumper dumpBeans SEVERE: Error getting attribute
while using JMXProxy servlet
   Product: Tomcat 7
   Version: 7.0.26
  Platform: PC
OS/Version: Windows Vista
Status: NEW
  Severity: minor
  Priority: P2
 Component: Manager
AssignedTo: dev@tomcat.apache.org
ReportedBy: hodg...@gmail.com
Classification: Unclassified


Hi, 

We have been using the following two JMXProxy URLs for monitoring without issue
in 6.0.29. 

http://localhost:8080/manager/jmxproxy/?qry=*:type=Executor,name=tomcatThreadPool


OK - Number of results: 1 

Name: Catalina:type=Executor,name=tomcatThreadPool 
modelerType: org.apache.tomcat.util.modeler.BaseModelMBean 
threadPriority: 5 
queueSize: 0 
corePoolSize: 4 
maxIdleTime: 6 
threadRenewalDelay: 1000 
minSpareThreads: 4 
activeCount: 1 
maxThreads: 150 
completedTaskCount: 17 
maxQueueSize: 2147483647 
largestPoolSize: 5 
stateName: STARTED 
name: tomcatThreadPool 
poolSize: 3 
namePrefix: catalina-exec- 


http://localhost:8080/manager/jmxproxy/?qry=bean:name=eventingDataSource


OK - Number of results: 1 

Name: bean:name=eventingDataSource 
modelerType: org.apache.tomcat.jdbc.pool.DataSource 
MaxIdle: 100 
JdbcInterceptors:
org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer
 
DefaultTransactionIsolation: -1 
ValidationQuery: SELECT 1 FROM dual 
TestOnConnect: false 
Password: Password not available as DataSource/JMX operation. 
AbandonWhenPercentageFull: 0 
TestOnReturn: false 
Username:  
NumActive: 0 
MinIdle: 10 
PoolSize: 4 
ValidationInterval: 180 
Connection:
ProxyConnection[PooledConnection[oracle.jdbc.driver.T4CConnection@17f8b39]] 
NumIdle: 2 
AccessToUnderlyingConnectionAllowed: true 
Url: jdbc:oracle:thin:@(DESCRIPTION =(ADDRESS = (PROTOCOL = TCP)(HOST =
localhost)(PORT = 1580))(CONNECT_DATA =(SERVER = DEDICATED)( SERVICE_NAME =
anywhere.com )(INSTANCE_NAME = xxx)(SID = xxx))) 
Size: 4 
Active: 2 
AlternateUsernameAllowed: false 
TestOnBorrow: true 
LoginTimeout: 6 
MaxActive: 100 
MaxAge: 0 
SuspectTimeout: 0 
Pool: org.apache.tomcat.jdbc.pool.ConnectionPool@9283bf 
NumTestsPerEvictionRun: 0 
Name: Tomcat Connection Pool[1-6300663] 
MaxWait: 6000 
PoolProperties: ConnectionPool[defaultAutoCommit=null; defaultReadOnly=null;
defaultTransactionIsolation=-1; defaultCatalog=null;
driverClassName=oracle.jdbc.driver.OracleDriver; maxActive=100; maxIdle=100;
minIdle=10; initialSize=10; maxWait=6000; testOnBorrow=true;
testOnReturn=false; timeBetweenEvictionRunsMillis=3;
numTestsPerEvictionRun=0; minEvictableIdleTimeMillis=3;
testWhileIdle=false; testOnConnect=false; password=x;
url=jdbc:oracle:thin:@(DESCRIPTION =(ADDRESS = (PROTOCOL = TCP)(HOST =
localhost)(PORT = 1580))(CONNECT_DATA =(SERVER = DEDICATED)( SERVICE_NAME =
anywhere.com )(INSTANCE_NAME = xxx)(SID = xxx))); username=xxx;
validationQuery=SELECT 1 FROM dual; validationInterval=180;
accessToUnderlyingConnectionAllowed=true; removeAbandoned=true;
removeAbandonedTimeout=60; logAbandoned=true; connectionProperties=null;
initSQL=null;
jdbcInterceptors=org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer;
jmxEnabled=true; fairQueue=false; useEquals=false; abandonWhenPercentageFull=0;
maxAge=0; useLock=false; dataSource=null; dataSourceJNDI=null;
alternateUsernameAllowed=false; 
PoolName: Tomcat Connection Pool[1-6300663] 
WaitCount: 0 
JmxEnabled: true 
TestWhileIdle: false 
UseEquals: false 
UseLock: false 
DriverClassName: oracle.jdbc.driver.OracleDriver 
RemoveAbandonedTimeout: 60 
DbProperties: {user=, password=} 
Idle: 2 
LogAbandoned: true 
FairQueue: false 
PoolSweeperEnabled: true 
ConnectionAsync:
org.apache.tomcat.jdbc.pool.ConnectionPool$ConnectionFuture@e9c2d3 
JdbcInterceptorsAsArray:
Array[org.apache.tomcat.jdbc.pool.PoolProperties$InterceptorDefinition] of
length 2 

org.apache.tomcat.jdbc.pool.PoolProperties$InterceptorDefinition@125f027 

org.apache.tomcat.jdbc.pool.PoolProperties$InterceptorDefinition@1b99628 
RemoveAbandoned: true 
TimeBetweenEvictionRunsMillis: 3 
MinEvictableIdleTimeMillis: 3 
InitialSize: 10 


After upgrading to 7.0.26 the JMXProxy URLs still return the correct data
however I am now seeing the following exceptions in the Tomcat logs. 


Mar 6, 2012 9:17:40 AM org.apache.catalina.mbeans.MBeanDumper dumpBeans 
SEVERE: Error getting attribute Catalina:type=Executor,name=tomcatThreadPool
prestartminSpareThreads 
javax.management.ReflectionException: Cannot find getter method
getPrestartminSpareThreads 
at
org.apache.tomcat.util.modeler.ManagedBean.getGetter(ManagedBean.java:517) 
at
org.apache.tomcat.util.modeler.BaseModelMBean.getAttribute(BaseModelMBean.java:181)
 
at
com.sun.jmx.

buildbot success in ASF Buildbot on tomcat-trunk

[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/2821

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

Buildslave for this Build: bb-vm_ubuntu

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

Build succeeded!

sincerely,
 -The Buildbot

DO NOT REPLY [Bug 52842] MBeanDumper dumpBeans SEVERE: Error getting attribute while using JMXProxy servlet

[bugzilla]

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

--- Comment #1 from Jonathan Hodges  2012-03-06 23:58:42 UTC 
---
This also appears on HP hardware with RHEL on both 32-bit and 64-bit Sun JVMs.

We are using the APR Native Tomcat library with a Executor thread pool.

As I mentioned before JMXProxy still returns the data correctly and the server
appears to be unimpacted by the exceptions.  

They are really just a nuisance and red herrings for the server guys.

-- 
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: Removing html to txt conversion for changelog and news in JK (1.2.33+)

[Rainer Jung]

On 06.03.2012 18:40, Mladen Turk wrote:

Hi,

Converted html files (no mater which tool used)
just look ugly. I see no point of having trash-like content
distributed, so can we just axe those conversion?

The content is already present in src as generated html file(s)
so converting them to .txt is useless if unreadable and IMHO
nowadays everyone has a web browser at disposal ;)

Objections?


I'm OK with no longer generating the text files. As far as I can see, it 
is CHANGES and NEWS.


Regards,

Rainer


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

svn commit: r1297816 - /tomcat/jk/trunk/tools/jkrelease.sh

[rjung]

Author: rjung
Date: Wed Mar  7 00:56:18 2012
New Revision: 1297816

URL: http://svn.apache.org/viewvc?rev=1297816&view=rev
Log:
Fix name inconsistency for new variable.
Now it should be actually used.

Modified:
tomcat/jk/trunk/tools/jkrelease.sh

Modified: tomcat/jk/trunk/tools/jkrelease.sh
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/jkrelease.sh?rev=1297816&r1=1297815&r2=1297816&view=diff
==
--- tomcat/jk/trunk/tools/jkrelease.sh (original)
+++ tomcat/jk/trunk/tools/jkrelease.sh Wed Mar  7 00:56:18 2012
@@ -272,7 +272,7 @@ do
 TOOL="elinks $ELNKOPTS"
 ;;
   lynx)
-TOOL="lynx $LYXKOPTS"
+TOOL="lynx $LYXOPTS"
 ;;
 esac
 rm -f CHANGES



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

Re: svn commit: r1297571 - in /tomcat/jk/trunk: tools/jkrelease.sh xdocs/style.xsl

[Rainer Jung]

Hi Konstantin,

On 06.03.2012 23:03, Konstantin Kolinko wrote:

2012/3/6:

Author: mturk
Date: Tue Mar  6 16:54:34 2012
New Revision: 1297571

URL: http://svn.apache.org/viewvc?rev=1297571&view=rev
Log:
Add support for lynx html to txt converter

Modified:
tomcat/jk/trunk/tools/jkrelease.sh
tomcat/jk/trunk/xdocs/style.xsl

Modified: tomcat/jk/trunk/tools/jkrelease.sh
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/jkrelease.sh?rev=1297571&r1=1297570&r2=1297571&view=diff
==
--- tomcat/jk/trunk/tools/jkrelease.sh (original)
+++ tomcat/jk/trunk/tools/jkrelease.sh Tue Mar  6 16:54:34 2012
@@ -244,8 +244,9 @@ cd ${JK_DIST}/native
  W3MOPTS="-dump -cols 80 -t 4 -S -O iso-8859-1 -T text/html"
  ELNKOPTS="-dump -dump-width 80 -dump-charset iso-8859-1 -no-numbering 
-no-home"
  LNKOPTS="-dump -width 80 -codepage iso-8859-1 -no-g -html-numbered-links 0"
+LYXOPTS="-dump -width=80 -nolist -nostatus -noprint 
-assume_local_charset=iso-8859-1"


Is typo in the variable name above a deliberate one?
(LYX vs LYNX ?)


I didn't change this line, but ...


Though I see that it follows the link->LNK, elink ->ELNK pattern.



  failed=true
-for tool in `echo "w3m elinks links"`
+for tool in `echo "w3m elinks links lynx"`
  do
   found=false
   for dir in `echo ${PATH} | sed 's!^:!.:!;s!:$!:.!;s!::!:.:!g;s!:! !g'`
@@ -270,6 +271,9 @@ do
   elinks)
 TOOL="elinks $ELNKOPTS"
 ;;
+  lynx)
+TOOL="lynx $LYXKOPTS"


I changed this line to use LYXOPTS and not the undefined LYXKOPTS.

Note that Mladen started a discuttion about removing the whole HTML to 
text conversion, so all of this will probably be gone before the next 
release.


Thanks for your always careful review!

Regards,

Rainer



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

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

[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-eoln has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 14 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-validate-eoln :  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-validate-eoln/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/gump_work/build_tomcat-trunk_tomcat-trunk-validate-eoln.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate-eoln (Type: Build)
Work ended in a state of : Failed
Elapsed: 19 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 validate-eoln 
[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/classes:/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
-
Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml

build-prepare:
[mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/classes
[mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/bin
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/conf
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/lib
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/logs
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/webapps

compile-prepare:
 [copy] Copying 1 file to 
/srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/startup
 [copy] Copying 1 file to 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs

validate-eoln:
[javac] Compiling 1 source file to 
/srv/gump/public/workspace/tomcat-trunk/output/classes
 [checkeol] Checking line ends in 2164 file(s)
 [checkeol] Checking line ends in 79 file(s)
 [checkeol] Done line ends check in 2243 file(s), 4 error(s) found.
 [checkeol] The following files have wrong line ends: [
 [checkeol] 
/srv/gump/public/workspace/tomcat-trunk/webapps/examples/WEB-INF/classes/websocket/snake/Direction.java:
 uses CRLF on line 1, 
 [checkeol] 
/srv/gump/public/workspace/tomcat-trunk/webapps/examples/WEB-INF/classes/websocket/snake/Location.java:
 uses CRLF on line 1, 
 [checkeol] 
/srv/gump/public/workspace/tomcat-trunk/webapps/examples/WEB-INF/classes/websocket/snake/Snake.java:
 uses CRLF on line 1, 
 [checkeol] 
/srv/gump/public/workspace/tomcat-trunk/webapps/examples/websocket/snake.html: 
uses CRLF on line 1]

BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:511: The following files have 
wrong line ends: [
/srv/gump/public/workspace/tomcat-trunk/webapps/examples/WEB-INF/classes/websocket/snake/Direction.java:
 uses CRLF on line 1, 
/srv/gump/public/workspace/tomcat-trunk/webapps/examples/WEB-INF/classes/websocket/snake/Location.java:
 uses CRLF on line 1, 
/srv/gump/public/workspace/tomcat-trunk/webapps/examples/WEB-INF/classes/websocket/snake/Snake.java:
 uses CRLF on line 1, 
/srv/gump/public/workspace/tomcat-trunk/webapps/examples/websocket/snake.html: 
uses CRLF on line 1]

Total time: 19 seconds
-

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

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

svn commit: r1297818 - /tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml

[rjung]

Author: rjung
Date: Wed Mar  7 01:02:28 2012
New Revision: 1297818

URL: http://svn.apache.org/viewvc?rev=1297818&view=rev
Log:
BZ 52842: Exception in MBeanDumper.

StandardThreadExecutor attribute prestartminSpareThread
uses "is". Fix MBean descriptor.

Modified:
tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=1297818&r1=1297817&r2=1297818&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Wed Mar  
7 01:02:28 2012
@@ -1525,6 +1525,7 @@
 
 
 
 

svn commit: r1297820 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/mbeans-descriptors.xml webapps/docs/changelog.xml

[rjung]

Author: rjung
Date: Wed Mar  7 01:08:52 2012
New Revision: 1297820

URL: http://svn.apache.org/viewvc?rev=1297820&view=rev
Log:
BZ 52842: Exception in MBeanDumper.

StandardThreadExecutor attribute prestartminSpareThread
uses "is". Fix MBean descriptor.

Backport of r1297818 from trunk.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar  7 01:08:52 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
 
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-12371

DO NOT REPLY [Bug 52842] MBeanDumper dumpBeans SEVERE: Error getting attribute while using JMXProxy servlet

[bugzilla]

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

Rainer Jung  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Rainer Jung  2012-03-07 01:13:55 
UTC ---
For most MBeans there's a descriptor defining how the MBean attributes relate
to the members of the base objects. For the StandardThreadExecutor there was a
bug in this descriptor, so that the MBean dumper tried to retrieve the boolean
prestartminSpareThreads using a "get" getter instead of an "is" getter.

The attribute didn't exist in 6.0 so that's why there's no exception for 6.0.

Fixed now in trunk by r1297818 and 7.0 by r1297820.
Will be part of TC 7.0.27.

Thanks for the detailed report.

Regards,

Rainer

-- 
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: r1297828 - /tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml

[rjung]

Author: rjung
Date: Wed Mar  7 01:30:59 2012
New Revision: 1297828

URL: http://svn.apache.org/viewvc?rev=1297828&view=rev
Log:
Another StandardThreadExecutor attribute with "is"
getter. Fix MBean descriptor.

Modified:
tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=1297828&r1=1297827&r2=1297828&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Wed Mar  
7 01:30:59 2012
@@ -1487,6 +1487,7 @@
 
 
 
 

svn commit: r1297829 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/mbeans-descriptors.xml

[rjung]

Author: rjung
Date: Wed Mar  7 01:32:29 2012
New Revision: 1297829

URL: http://svn.apache.org/viewvc?rev=1297829&view=rev
Log:
Another StandardThreadExecutor attribute with "is"
getter. Fix MBean descriptor.

Backport of r1297828 from trunk.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar  7 01:32:29 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
 
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,123904

buildbot failure in ASF Buildbot on tomcat-trunk

[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/2823

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

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1297828
Blamelist: rjung

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot

DO NOT REPLY [Bug 52842] MBeanDumper dumpBeans SEVERE: Error getting attribute while using JMXProxy servlet

[bugzilla]

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

--- Comment #3 from Jonathan Hodges  2012-03-07 02:17:27 UTC 
---
Will this fix the other following exception concerning objects exposed with the
org.springframework.jmx.export.MBeanExporter?



Mar 6, 2012 9:18:20 AM org.apache.catalina.mbeans.MBeanDumper dumpBeans 
SEVERE: Error getting attribute bean:name=eventingDataSource PooledConnection 
javax.management.MBeanException: RuntimeException thrown in RequiredModelMBean
while trying to invoke operation getPooledConnection 
at
javax.management.modelmbean.RequiredModelMBean.invokeMethod(RequiredModelMBean.java:1091)
 
at
javax.management.modelmbean.RequiredModelMBean.invoke(RequiredModelMBean.java:955)
 
at
org.springframework.jmx.export.SpringModelMBean.invoke(SpringModelMBean.java:90)
 
at
javax.management.modelmbean.RequiredModelMBean.getAttribute(RequiredModelMBean.java:1358)
 
at
org.springframework.jmx.export.SpringModelMBean.getAttribute(SpringModelMBean.java:109)
 
at
com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.getAttribute(DefaultMBeanServerInterceptor.java:666)
 
at
com.sun.jmx.mbeanserver.JmxMBeanServer.getAttribute(JmxMBeanServer.java:638) 
at
org.apache.catalina.mbeans.MBeanDumper.dumpBeans(MBeanDumper.java:82) 
at
org.apache.catalina.manager.JMXProxyServlet.listBeans(JMXProxyServlet.java:172) 
at
org.apache.catalina.manager.JMXProxyServlet.doGet(JMXProxyServlet.java:121) 
at javax.servlet.http.HttpServlet.service(HttpServlet.java:621) 
at javax.servlet.http.HttpServlet.service(HttpServlet.java:722)

-- 
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 52844] New: CVE-2002-1060

[bugzilla]

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

 Bug #: 52844
   Summary: CVE-2002-1060
   Product: Tomcat 5
   Version: 5.5.0
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Unknown
AssignedTo: dev@tomcat.apache.org
ReportedBy: hudeng...@163.com
Classification: Unclassified


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

[GUMP@vmgump]: Project tomcat-tc7.0.x-test (in module tomcat-7.0.x) failed

[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-tc7.0.x-test has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 2 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-test :  Tomcat 7.x, a web server implementing Java Servlet 
3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-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-tc7.0.x-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-tc7.0.x-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-7.0.x/output/build/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test (Type: Build)
Work ended in a state of : Failed
Elapsed: 20 mins 34 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-07032012.jar 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-07032012-native-src.tar.gz
 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-07032012-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/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-07032012.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/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-7.0.x/tomcat-deps/tomcat-dbcp-07032012.jar
 test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/outp
 
ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/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-7.
 
0.x/tomcat-deps/tomcat-dbcp-07032012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-07032012.jar:

[GUMP@vmgump]: Project tomcat-taglibs-standard (in module tomcat-taglibs) failed

[Gump]

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 20 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 
org.apache