headers
markt | 1 Oct 02:38
Picon
Favicon
Gravatar

svn commit: r700645 - in /tomcat/trunk: java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java webapps/docs/config/listeners.xml

Author: markt
Date: Tue Sep 30 17:38:00 2008
New Revision: 700645

URL: http://svn.apache.org/viewvc?rev=700645&view=rev
Log:
Fix some issues discovered when using this with PuTTY.

Modified:
    tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
    tomcat/trunk/webapps/docs/config/listeners.xml

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java?rev=700645&r1=700644&r2=700645&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java Tue Sep 30
17:38:00 2008
@@ -18,10 +18,14 @@
 package org.apache.catalina.mbeans;

 import java.io.IOException;
+import java.io.Serializable;
 import java.lang.management.ManagementFactory;
 import java.net.MalformedURLException;
+import java.net.Socket;
 import java.rmi.RemoteException;
 import java.rmi.registry.LocateRegistry;
+import java.rmi.server.RMIClientSocketFactory;
+import java.rmi.server.RMIServerSocketFactory;
(Continue reading)

Permalink | Reply | 0 comments |
headers
bugzilla | 1 Oct 10:30
Picon
Favicon

DO NOT REPLY [Bug 45015] Quoting in attributes

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

Tapas Adhikary <tapas.adhikary <at> gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |tapas.adhikary <at> gmail.com
             Status|RESOLVED                    |REOPENED
         Resolution|FIXED                       |

--- Comment #5 from Tapas Adhikary <tapas.adhikary <at> gmail.com>  2008-10-01 01:30:09 PST ---
Mark,
I am using Tomcat 5.5.27 on Linux but still facing the problem.
I am using c:ret tld and using following code in my abc.jsp,

<c-rt:set var="currUrl"
value="<%=request.getAttribute((String)pageContext.getAttribute("param")+"_Url")%>"
/>
While jsp compilation , I am getting following error,
org.apache.jasper.JasperException: file:browser/abc.jsp(51,42) Attribute value
request.getAttribute((String)pageContext.getAttribute("param")+"_Url") is
quoted with " which must be escaped when used within the value.

When I modify the code with escape character it works fine.This is my modified
code,
<c-rt:set var="currUrl"
value="<%=request.getAttribute((String)pageContext.getAttribute(\"param\")+\"_Url\")%>"
/>

According to comment # 4 this issue is resolved. But I am not sure if it is
(Continue reading)

Permalink | Reply | 0 comments |
headers
bugzilla | 1 Oct 11:16
Picon
Favicon

DO NOT REPLY [Bug 45015] Quoting in attributes

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

--- Comment #6 from Tapas Adhikary <tapas.adhikary <at> gmail.com>  2008-10-01 02:16:03 PST ---
I see the same issue for some files having nested quotes and dont see it for
some other files having the same kind of nested quoting.

The kind of quoting giving the problem is mentioned in my previous comment.
But the following seam to the working.
id="<%= c.var("ActivityBanner.Name") %><%= c.var("ActivityBanner.Index") %>"

I don't see any particular standard way in which it fails. Both the cases i
have used tomcat 5.5.27

--

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
Permalink | Reply | 0 comments |
headers
bugzilla | 1 Oct 12:47
Picon
Favicon

DO NOT REPLY [Bug 45015] Quoting in attributes

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

--- Comment #7 from Mark Thomas <markt <at> apache.org>  2008-10-01 03:47:06 PST ---
Re comment 5, what you are seeing is the correct behaviour. The checking can be
relaxed. See http://tomcat.apache.org/tomcat-5.5-doc/config/systemprops.html

Re comment 6, that could be a bug. Can you provide the simplest complete JSP
that demonstrates the issue please.

--

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
Permalink | Reply | 0 comments |
headers
markt | 1 Oct 12:47
Picon
Favicon
Gravatar

svn commit: r700734 - in /tomcat/trunk: build.xml extras.xml java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java java/org/apache/catalina/mbeans/LocalStrings.properties webapps/docs/config/listeners.xml

Author: markt
Date: Wed Oct  1 03:47:41 2008
New Revision: 700734

URL: http://svn.apache.org/viewvc?rev=700734&view=rev
Log:
Move JmxRemote to extras. Fix Tomcat hang on shutdown. Improve logging. Update the docs.

Modified:
    tomcat/trunk/build.xml
    tomcat/trunk/extras.xml
    tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
    tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties
    tomcat/trunk/webapps/docs/config/listeners.xml

Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=700734&r1=700733&r2=700734&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Oct  1 03:47:41 2008
@@ -259,6 +259,7 @@
         <exclude name="org/apache/catalina/ant/**" />
         <exclude name="org/apache/catalina/cluster/**" />
         <exclude name="org/apache/catalina/ha/**" />
+        <exclude name="org/apache/catalina/mbeans/JmxRemote*" />
         <exclude name="org/apache/catalina/tribes/**" />
         <exclude name="org/apache/catalina/launcher/**" />
         <exclude name="org/apache/catalina/storeconfig/**" />

Modified: tomcat/trunk/extras.xml
(Continue reading)

Permalink | Reply | 0 comments |
headers
markt | 1 Oct 12:54
Picon
Favicon
Gravatar

svn commit: r700735 - /tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java

Author: markt
Date: Wed Oct  1 03:54:34 2008
New Revision: 700735

URL: http://svn.apache.org/viewvc?rev=700735&view=rev
Log:
Update javadoc. Add a todo reminder.

Modified:
    tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java?rev=700735&r1=700734&r2=700735&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java Wed Oct  1
03:54:34 2008
@@ -46,10 +46,13 @@
 /**
  * This listener fixes the port used by JMX/RMI Server making things much
  * simpler if you need to connect jconsole or similar to a remote Tomcat
- * instance that is running behind a firewall. Only this port is configured via
+ * instance that is running behind a firewall. Only the ports are configured via
  * the listener. The remainder of the configuration is via the standard system
  * properties for configuring JMX. Because Tomcat uses a separate MBean server
- * to the platform MBean server, both servers must be configured separately.
+ * to the platform MBean server, ports for both servers must be configured.
+ * TODO: Is there a way to reduce the number of ports and access both servers
+ *       (and any other MBean servers via a single registry and single
+ *       connection?
(Continue reading)

Permalink | Reply | 0 comments |
headers
bugzilla | 1 Oct 13:40
Picon
Favicon

DO NOT REPLY [Bug 45925] New: Name Based Vhosts not working

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

           Summary: Name Based Vhosts not working
           Product: Tomcat 6
           Version: 6.0.18
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P4
         Component: Catalina
        AssignedTo: dev <at> tomcat.apache.org
        ReportedBy: cmr <at> financial.com

I upgraded a system wich is running several vhosts from 6.0.14 to 6.0.18. After
upgrading the Systems the virtual Hosts only report 404 for every request.
I know the correct Host is choosen since each has its own access log configured
and all requests show in the rigth log files. Here is the relevant config 
part:

      <Host name="somehost.financial.com"
appBase="webapps/somehost.financial.com"
            unpackWARs="true" autoDeploy="true"
            xmlValidation="false" xmlNamespaceAware="false">
        <Alias>somehost1.internal.financial.com</Alias>
        <Alias>somehost2.internal.financial.com</Alias>
        <Valve className="org.apache.catalina.valves.AccessLogValve" 
                directory="/var/log/tomcat"  
                suffix="_somehost.financial.com_access.log" 
                prefix=""
(Continue reading)

Permalink | Reply | 1 comment |
headers
sebb | 1 Oct 14:19
Picon

Re: svn commit: r700170 - /tomcat/tc6.0.x/trunk/STATUS.txt

On 29/09/2008, Mark Thomas <markt <at> apache.org> wrote:
> sebb wrote:
>  > On 29/09/2008, Mark Thomas <markt <at> apache.org> wrote:
>
> >>  ThreadLocals and container classloader environments need careful handling
>  >>  to avoid memory leaks.
>  >
>  > I would have thought that was a good reason to keep the class - one
>  > only needs to get the code right once?
>
> If you don't use ThreadLocal, the code is much simpler so there is little
>  to be gained by using a utility class. In this case of the two formats that
>  were still used, one class was using each. It makes more sense to me to put
>  the code specific to a class in that class and do away with what was a
>  broken, deprecated and little used utility class.
>
>
>  >>  In this case the pain to make sure there wasn't a  memory leak wasn't worth the gain.
>  >
>  > OK, point taken w.r.t. using synchronisation - the code should be
>  > reasonably quick.
>  >
>  > But why not use an instance variable rather than a static class variable?
>  > If there is more than 1 instance, each instance will have its own lock.
>  > Which may share the load better.
>
> Creating the object is likely to be more expensive than using it. True I
>  haven't tested it and if you have performance figures that suggest
>  otherwise then it may be worth changing.
(Continue reading)

Permalink | Reply | 1 comment |
headers
mturk | 1 Oct 16:10
Picon
Favicon
Gravatar

svn commit: r700777 - in /tomcat/connectors/trunk/jk/native/common: jk_global.h jk_util.c jk_util.h

Author: mturk
Date: Wed Oct  1 07:10:56 2008
New Revision: 700777

URL: http://svn.apache.org/viewvc?rev=700777&view=rev
Log:
Add util function for fdopen the log file. Used by OS provided loggers

Modified:
    tomcat/connectors/trunk/jk/native/common/jk_global.h
    tomcat/connectors/trunk/jk/native/common/jk_util.c
    tomcat/connectors/trunk/jk/native/common/jk_util.h

Modified: tomcat/connectors/trunk/jk/native/common/jk_global.h
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_global.h?rev=700777&r1=700776&r2=700777&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_global.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_global.h Wed Oct  1 07:10:56 2008
@@ -120,6 +120,7 @@
 #endif /* _WINDOWS_ */
 #include <sys/timeb.h>
 #include <process.h>
+#include <io.h>
 #else /* WIN32 */
 #include <unistd.h>
 #if defined(NETWARE) && defined(__NOVELL_LIBC__)

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?rev=700777&r1=700776&r2=700777&view=diff
==============================================================================
(Continue reading)

Permalink | Reply | 0 comments |
headers
markt | 1 Oct 16:23
Picon
Favicon
Gravatar

svn commit: r700784 - /tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java

Author: markt
Date: Wed Oct  1 07:23:09 2008
New Revision: 700784

URL: http://svn.apache.org/viewvc?rev=700784&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45403
When listing the resources for a collection, don't include invalid resources, particularly linked
resources when allowLinking=false

Modified:
    tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java

Modified: tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=700784&r1=700783&r2=700784&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java Wed Oct  1 07:23:09 2008
@@ -896,7 +896,9 @@

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

-            File currentFile = new File(file, names[i]);
+            File currentFile = file(file.getName() + "/" + names[i]);
+            if (currentFile == null) continue;
+
             Object object = null;
             if (currentFile.isDirectory()) {
                 FileDirContext tempContext = new FileDirContext(env);
(Continue reading)

Permalink | Reply | 0 comments |

Gmane