date:20050215

DO NOT REPLY [Bug 33601] New: - org.apache.jasper.JasperException: Unable to compile class for JSPNote: sun.tools.javac.Main has been deprecated

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33601

   Summary: org.apache.jasper.JasperException: Unable to compile
class for JSPNote: sun.tools.javac.Main has been
deprecated
   Product: Tomcat 4
   Version: Unknown
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: Unknown
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


org.apache.jasper.JasperException: Unable to compile class for JSPNote: 
sun.tools.javac.Main has been deprecated.


An error occurred at line: 1 in the jsp file: /ConnectionManagerTest.jsp

Generated servlet error:
C:\Tomcat\work\localhost\_\ConnectionManagerTest$jsp.java:56: Class c7.Bean_1 
not found.
c7.Bean_1 CM = null;
  ^


An error occurred at line: 1 in the jsp file: /ConnectionManagerTest.jsp

Generated servlet error:
C:\Tomcat\work\localhost\_\ConnectionManagerTest$jsp.java:59: Class c7.Bean_1 
not found.
CM= (c7.Bean_1)
   ^


An error occurred at line: 1 in the jsp file: /ConnectionManagerTest.jsp

Generated servlet error:
C:\Tomcat\work\localhost\_\ConnectionManagerTest$jsp.java:64: Class c7.Bean_1 
not found.
CM = (c7.Bean_1) java.beans.Beans.instantiate
(this.getClass().getClassLoader(), "c7.Bean_1");
^
3 errors, 1 warning

at org.apache.jasper.compiler.Compiler.compile(Compiler.java:285)
at org.apache.jasper.servlet.JspServlet.loadJSP(JspServlet.java:552)
at 
org.apache.jasper.servlet.JspServlet$JspServletWrapper.loadIfNecessary
(JspServlet.java:177)
at org.apache.jasper.servlet.JspServlet$JspServletWrapper.service
(JspServlet.java:189)
at org.apache.jasper.servlet.JspServlet.serviceJspFile
(JspServlet.java:382)
at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:474)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:853)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter
(ApplicationFilterChain.java:247)
at org.apache.catalina.core.ApplicationFilterChain.doFilter
(ApplicationFilterChain.java:193)
at org.apache.catalina.core.StandardWrapperValve.invoke
(StandardWrapperValve.java:243)
at org.apache.catalina.core.StandardPipeline.invokeNext
(StandardPipeline.java:566)
at org.apache.catalina.core.StandardPipeline.invoke
(StandardPipeline.java:472)
at org.apache.catalina.core.ContainerBase.invoke
(ContainerBase.java:943)
at org.apache.catalina.core.StandardContextValve.invoke
(StandardContextValve.java:190)
at org.apache.catalina.core.StandardPipeline.invokeNext
(StandardPipeline.java:566)
at org.apache.catalina.valves.CertificatesValve.invoke
(CertificatesValve.java:246)
at org.apache.catalina.core.StandardPipeline.invokeNext
(StandardPipeline.java:564)
at org.apache.catalina.core.StandardPipeline.invoke
(StandardPipeline.java:472)
at org.apache.catalina.core.ContainerBase.invoke
(ContainerBase.java:943)
at org.apache.catalina.core.StandardContext.invoke
(StandardContext.java:2343)
at org.apache.catalina.core.StandardHostValve.invoke
(StandardHostValve.java:180)
at org.apache.catalina.core.StandardPipeline.invokeNext
(StandardPipeline.java:566)
at org.apache.catalina.valves.ErrorDispatcherValve.invoke
(ErrorDispatcherValve.java:170)
at org.apache.catalina.core.StandardPipeline.invokeNext
(StandardPipeline.java:564)
at org.apache.catalina.valves.ErrorReportValve.invoke
(ErrorReportValve.java:170)
at org.apache.catalina.core.StandardPipeline.invokeNext
(StandardPipeline.java:564)
at org.apache.catalina.valves.AccessLogValve.invoke
(AccessLogValve.java:468)
at org.apache.catalina.core.StandardPipeline.invokeNext
(StandardPipeline.java:564)
at org.apache.catalina.core.StandardPipeline.invoke
(StandardPipeline.java:472)
at org.apache.catalina.core.ContainerBase.invoke
(ContainerBase.java:943)
at org.apache.catalina.core.StandardEngineValve.invoke
(StandardEngineValve.java:174)
at org.apache.catalina.core.StandardPipeline.invokeNext
(StandardPipeline.java:566)
at org.apache.catalina.core.StandardPipeline.invoke
(StandardPipeline.java:472)
at org.apache.catalina.core.ContainerBase.invoke
(ContainerBase.java:943)
at org.apache.catalina.connector.http.HttpProcessor.process
(HttpProcessor.java:1012)
at org.apache.catalina.connector.http.HttpProcessor.run
(HttpProcessor.

DO NOT REPLY [Bug 32898] - Cluster restart fails

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=32898





--- Additional Comments From [EMAIL PROTECTED]  2005-02-16 08:31 ---
I am also having this problem, can you clarify the fix?  Is this a code change,
if so is a patch avail or can you direct me to the classes you modified?  I
tried 5.0.30 and had the same problem.



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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33598] - EL in tag file not evaluated when 2.3 web.xml used

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33598


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID




--- Additional Comments From [EMAIL PROTECTED]  2005-02-16 03:15 ---
Tag files are new in JSP 2.0 and therefore should not be used with 2.3 web.xml.
 The behavior for a JSP page using JSP 2.0 features with 2.3 web.xml is 
undefined.

I interpret the sentence

"The default setting does not apply to tag files, which always default to
 evaluating expressions."

to mean the critera for setting the default does not apply to tag files since
2.4 web.xml is assumed, and in 2.4, the default is to evaluate.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 31232] - response.encodeURL() not encoding URL when mix of cookies and URL rewriting

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=31232


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|WONTFIX |




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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 31232] - response.encodeURL() not encoding URL when mix of cookies and URL rewriting

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=31232





--- Additional Comments From [EMAIL PROTECTED]  2005-02-16 02:24 ---
Created an attachment (id=14294)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=14294&action=view)
Patch for issue

Hey Yoav,

I've got a patch for this. Finally got some time to track it down.

Currently the cookie session ID always overrides the URL session ID, regardless
if the context enables cookies or not.

This patch will check to see if the context enables cookies first. If it does
then the cookie session ID overrides the session ID from the URL. If it does
not then the parseSessionCookieId is skipped completely.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33598] New: - EL in tag file not evaluated when 2.3 web.xml used

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33598

   Summary: EL in tag file not evaluated when 2.3 web.xml used
   Product: Tomcat 5
   Version: 5.5.7
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: minor
  Priority: P4
 Component: Jasper
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


Overview:
According to JSP 2.0 specification, the default setting for ignore EL does not 
apply to tag files, which always default to evaluating expressions (JSP.3.3.2 
page 123) 
On Tomcat, when 2.3 web.xml is used, EL in tag document file are not evaluated.

Steps to reproduce:
- create a 2.3 web.xml
- create a tag document file that contains expressions, for example

http://java.sun.com/JSP/Page"; version="2.0">
  
  ${expr}
  Sample EL Expression : ${5+8}

- create a jsp that uses the above tag

Expected result:
${expr} evaluated to 30 and ${5+8} evaluated to 13

Actual Results:
${expr} and ${5+8} are displayed unevaluated

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 25273] - Exception processing TLD at resource path - say where it is really looking for this file

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=25273


[EMAIL PROTECTED] changed:

   What|Removed |Added

   Severity|normal  |enhancement




--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 23:35 ---
Actually changing the severity this time...

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 25273] - Exception processing TLD at resource path - say where it is really looking for this file

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=25273





--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 23:34 ---
Changing this to an enhancement request.

It doesn't seem unreasonable to me to expect a sysadmin to know where the
docBase is for the "/myApp" context. Additionally, since Context.getDocBase()
may return an absolute pathname, a relative pathname or a URL displaying the
real location correctly in all of these circumstances seems like a lot of work
for relatively little benefit.

That said, patches will always be considered.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 26558] - Misleading error message from setclasspath.sh if Java SDK not installed

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=26558


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 23:18 ---
A modified version of your patch has been applied to CVS.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-4.0/catalina/src/bin setclasspath.bat setclasspath.sh

2005-02-15 Thread markt

markt   2005/02/15 14:17:53

  Modified:catalina/src/bin setclasspath.bat setclasspath.sh
  Log:
  Fix bug 26558. Improve error message when there is a problem with JAVA_HOME.
   - Based on a patch supplied by Kent Schnaith,
  
  Revision  ChangesPath
  1.10  +19 -7 jakarta-tomcat-4.0/catalina/src/bin/setclasspath.bat
  
  Index: setclasspath.bat
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/setclasspath.bat,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- setclasspath.bat  12 Feb 2004 21:38:12 -  1.9
  +++ setclasspath.bat  15 Feb 2005 22:17:53 -  1.10
  @@ -10,13 +10,25 @@
   echo This environment variable is needed to run this program
   goto end
   :gotJavaHome
  -if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
  -if not exist "%JAVA_HOME%\bin\javaw.exe" goto noJavaHome
  -if not exist "%JAVA_HOME%\bin\jdb.exe" goto noJavaHome
  -if not exist "%JAVA_HOME%\bin\javac.exe" goto noJavaHome
  +if not exist "%JAVA_HOME%\bin\java.exe" goto noJava
  +if not exist "%JAVA_HOME%\bin\javaw.exe" goto noJavaw
  +if not exist "%JAVA_HOME%\bin\jdb.exe" goto noJdb
  +if not exist "%JAVA_HOME%\bin\javac.exe" goto noJavac
   goto okJavaHome
  -:noJavaHome
  -echo The JAVA_HOME environment variable is not defined correctly
  +:noJava
  +echo JAVA_HOME\bin\java.exe is missing
  +goto badJavaHome
  +:noJavaw
  +echo JAVA_HOME\bin\javaw.exe is missing
  +goto badJavaHome
  +:noJdb
  +echo JAVA_HOME\bin\jdb.exe is missing
  +goto badJavaHome
  +:noJavac
  +echo JAVA_HOME\bin\javac.exe is missing
  +goto badJavaHome
  +:badJavaHome
  +echo The JAVA_HOME environment variable may not be defined correctly
   echo This environment variable is needed to run this program
   echo NB: JAVA_HOME should point to a JDK not a JRE
   goto end
  
  
  
  1.14  +21 -13jakarta-tomcat-4.0/catalina/src/bin/setclasspath.sh
  
  Index: setclasspath.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/setclasspath.sh,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- setclasspath.sh   26 Jul 2004 21:29:42 -  1.13
  +++ setclasspath.sh   15 Feb 2005 22:17:53 -  1.14
  @@ -10,21 +10,29 @@
 echo "This environment variable is needed to run this program"
 exit 1
   fi
  -if $os400; then
  -  if [ ! -x "$JAVA_HOME"/bin/java -o ! -x "$JAVA_HOME"/bin/javac ]; then
  -echo "The JAVA_HOME environment variable is not defined correctly"
  -echo "This environment variable is needed to run this program"
  -echo "NB: JAVA_HOME should point to a JDK not a JRE"
  -exit 1
  -  fi
  -else
  -  if [ ! -x "$JAVA_HOME"/bin/java -o ! -x "$JAVA_HOME"/bin/jdb -o ! -x 
"$JAVA_HOME"/bin/javac ]; then
  -echo "The JAVA_HOME environment variable is not defined correctly"
  -echo "This environment variable is needed to run this program"
  -echo "NB: JAVA_HOME should point to a JDK not a JRE"
  +if [ ! -x "$JAVA_HOME"/bin/java ]; then
  +  echo "Error: The JAVA_HOME/bin/java directory is missing or not 
executable."
  +  echo "The JAVA_HOME environment variable is not defined correctly."
  +  echo "This environment variable is needed to run this program."
  +  echo "NB: JAVA_HOME should point to a JDK not a JRE."
  +  exit 1
  +fi
  +if [ ! "$os400" ]; then
  +  if [ ! -x "$JAVA_HOME"/bin/jdb ]; then
  +echo "Error: The JAVA_HOME/bin/jdb directory is missing or not 
executable."
  +echo "The JAVA_HOME environment variable is not defined correctly."
  +echo "This environment variable is needed to run this program."
  +echo "NB: JAVA_HOME should point to a JDK not a JRE."
   exit 1
 fi
   fi
  +if [ ! -x "$JAVA_HOME"/bin/javac ]; then
  +  echo "Error: The JAVA_HOME/bin/javac directory is missing or not 
executable."
  +  echo "The JAVA_HOME environment variable is not defined correctly."
  +  echo "This environment variable is needed to run this program."
  +  echo "NB: JAVA_HOME should point to a JDK not a JRE."
  +  exit 1
  +fi
   if [ -z "$BASEDIR" ]; then
 echo "The BASEDIR environment variable is not defined"
 echo "This environment variable is needed to run this program"
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session ManagerBase.java mbeans-descriptors.xml

2005-02-15 Thread luehe

luehe   2005/02/15 13:10:35

  Modified:catalina/src/share/org/apache/catalina/session
ManagerBase.java mbeans-descriptors.xml
  Log:
  Added getSession() action on session manager mbean
  
  Revision  ChangesPath
  1.40  +38 -1 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/ManagerBase.java
  
  Index: ManagerBase.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/ManagerBase.java,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- ManagerBase.java  11 Feb 2005 00:05:54 -  1.39
  +++ ManagerBase.java  15 Feb 2005 21:10:35 -  1.40
  @@ -29,6 +29,7 @@
   import java.security.NoSuchAlgorithmException;
   import java.security.PrivilegedAction;
   import java.util.Date;
  +import java.util.Enumeration;
   import java.util.HashMap;
   import java.util.Iterator;
   import java.util.Random;
  @@ -1124,6 +1125,42 @@
   }
   
   
  +/**
  + * Returns information about the session with the given session id.
  + * 
  + * The session information is organized as a HashMap, mapping 
  + * session attribute names to the String representation of their values.
  + *
  + * @param sessionId Session id
  + * 
  + * @return HashMap mapping session attribute names to the String
  + * representation of their values, or null if no session with the
  + * specified id exists, or if the session does not have any attributes
  + */
  +public HashMap getSession(String sessionId) {
  +Session s = (Session) sessions.get(sessionId);
  +if (s == null) {
  +if (log.isInfoEnabled()) {
  +log.info("Session not found " + sessionId);
  +}
  +return null;
  +}
  +
  +Enumeration ee = s.getSession().getAttributeNames();
  +if (ee == null || !ee.hasMoreElements()) {
  +return null;
  +}
  +
  +HashMap map = new HashMap();
  +while (ee.hasMoreElements()) {
  +String attrName = (String) ee.nextElement();
  +map.put(attrName, getSessionAttribute(sessionId, attrName));
  +}
  +
  +return map;
  +}
  +
  +
   public void expireSession( String sessionId ) {
   Session s=(Session)sessions.get(sessionId);
   if( s==null ) {
  
  
  
  1.11  +9 -0  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/mbeans-descriptors.xml
  
  Index: mbeans-descriptors.xml
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/mbeans-descriptors.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mbeans-descriptors.xml2 Nov 2004 19:07:51 -   1.10
  +++ mbeans-descriptors.xml15 Feb 2005 21:10:35 -  1.11
  @@ -260,6 +260,15 @@
type="java.lang.String"/>
   
   
  +
  +  
  +
  +

DO NOT REPLY [Bug 26681] - Wrong invoking ServletContextListener's methods

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=26681


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 20:45 ---
This has now been fixed in CVS.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33518] - org.apache.jasper.JspCompilationContext.createCompiler

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33518


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID




--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 20:43 ---
Please provide steps to reproduce this.  If you took out the required compiler 
distros to get this exception, that's not a bug, it's user error.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33465] - StandardSession.removeAttriube throws NullPointerException

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33465





--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 20:43 ---
Please add the rest of the stack trace.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33589] - stop a context without interrupting its running threads

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33589





--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 20:41 ---
This is a fairly terrible request.  A context stop is a significant 
administrative event, and clearing all the resources associated with a context 
upon a stop is imperative.  We hear complaints all the time that resources 
aren't cleaned up quickly or efficiently enough.

I'll give other developers ample time to express opinions and/or suggest 
patches for this, but if nothing is done for a few weeks, I'll close this 
issue as WONTFIX.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33588] - HEAD request are sent as GET in NameVirtualHost using mod_jk

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33588


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 20:33 ---
Same bug reorted to tomcat-dev today:

http://marc.theaimsgroup.com/?l=tomcat-dev&m=110846894706676&w=2

Fixed by Mladen Turk in development tree for 1.2.9:

http://marc.theaimsgroup.com/?l=tomcat-dev&m=110846972011636&w=2

and

http://marc.theaimsgroup.com/?l=tomcat-dev&m=110846948908355&w=2

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33589] - stop a context without interrupting its running threads

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33589


[EMAIL PROTECTED] changed:

   What|Removed |Added

   Severity|major   |enhancement
  Component|Webapps:Manager |Catalina
 OS/Version|Linux   |All
   Platform|PC  |All




--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 20:32 ---
Just fixing the severity and a couple of other flags.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: cvs commit: jakarta-tomcat-catalina/catalina/src/conf context.xml

2005-02-15 Thread Mladen Turk

TECHNICAL DIRECTOR wrote:
PLEASE PLEASE STOP SENDING US YOUR E-MAILS...Satalogue
Can someone unsubscribe this user.
He's really annoying :).
Mladen.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: cvs commit: jakarta-tomcat-catalina/catalina/src/conf context.xml

2005-02-15 Thread TECHNICAL DIRECTOR

PLEASE PLEASE STOP SENDING US YOUR E-MAILS...Satalogue
--- [EMAIL PROTECTED] wrote:

> remm2005/02/15 07:42:58
> 
>   Modified:catalina/src/share/org/apache/catalina/startup
> HostConfig.java LocalStrings.properties
>catalina/src/conf context.xml
>   Log:
>   - Tentative fix for 33572: context.xml should be a redeploy resource.
> This is done by prioritizing the redeploy resources.
>   - I need to test this better. The basic cases seem to be working
> (editing manager.xml, as well as an expanded folder as per the bug
> report).
>   - Remove context.xml from the list of watched resources.
>   
>   Revision  ChangesPath
>   1.55  +36 -23   
>
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java
>   
>   Index: HostConfig.java
>   ===
>   RCS file:
>
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
>   retrieving revision 1.54
>   retrieving revision 1.55
>   diff -u -r1.54 -r1.55
>   --- HostConfig.java 29 Jan 2005 19:45:55 -  1.54
>   +++ HostConfig.java 15 Feb 2005 15:42:58 -  1.55
>   @@ -25,6 +25,7 @@
>import java.io.InputStream;
>import java.util.ArrayList;
>import java.util.HashMap;
>   +import java.util.LinkedHashMap;
>import java.util.jar.JarEntry;
>import java.util.jar.JarFile;
>
>   @@ -572,9 +573,6 @@
>}
>context.setConfigFile(contextXml.getAbsolutePath());
>context.setPath(contextPath);
>   -// Add the context XML to the list of watched files
>   -deployedApp.reloadResources.put
>   -(contextXml.getAbsolutePath(), new
> Long(contextXml.lastModified()));
>// Add the associated docBase to the redeployed list if
> it's a WAR
>boolean isWar = false;
>if (context.getDocBase() != null) {
>   @@ -628,7 +626,6 @@
>external = true;
>deployedApp.redeployResources.put
>(contextXml.getAbsolutePath(), new
> Long(contextXml.lastModified()));
>   -   
> deployedApp.reloadResources.remove(contextXml.getAbsolutePath());
>}
>} catch (IOException e) {
>// Ignore
>   @@ -645,8 +642,14 @@
>addWatchedResources(deployedApp, 
>   
> expandedDocBase.getAbsolutePath(), context);
>}
>   +// Add the context XML to the list of files
> which should trigger a redeployment
>   +deployedApp.redeployResources.put
>   +(contextXml.getAbsolutePath(), new
> Long(contextXml.lastModified()));
>}
>} else {
>   +// Add the context XML to the list of files which
> should trigger a redeployment
>   +deployedApp.redeployResources.put
>   +(contextXml.getAbsolutePath(), new
> Long(contextXml.lastModified()));
>addWatchedResources(deployedApp, null, context);
>}
>}
>   @@ -904,13 +907,17 @@
>}
>context.setPath(contextPath);
>context.setDocBase(file);
>   +File configFile = new File(dir,
> Constants.ApplicationContextXml);
>if (deployXML) {
>   -context.setConfigFile
>   -((new File(dir,
> Constants.ApplicationContextXml)).getAbsolutePath());
>   +context.setConfigFile(configFile.getAbsolutePath());
>}
>host.addChild(context);
>deployedApp.redeployResources.put(dir.getAbsolutePath(),
>new Long(dir.lastModified()));
>   +if (deployXML) {
>   +   
> deployedApp.redeployResources.put(configFile.getAbsolutePath(),
>   +new Long(configFile.lastModified()));
>   +}
>addWatchedResources(deployedApp, dir.getAbsolutePath(),
> context);
>} catch (Throwable t) {
>log.error(sm.getString("hostConfig.deployDir.error",
> file), t);
>   @@ -974,7 +981,9 @@
>if (resource.exists()) {
>long lastModified = ((Long)
> app.redeployResources.get(resources[i])).longValue();
>if ((!resource.isDirectory()) &&
> resource.lastModified() > lastModified) {
>   -// Redeploy application
>   +// Undeploy application
>   +if (log.isInfoEnabled())
>   +log.info(sm.getString("hostConfig.undeploy",
> app.name));
>

Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml

2005-02-15 Thread TECHNICAL DIRECTOR

PLEASE PLEASE STOP SENDING US YOUR E-MAILS...Satalogue
--- [EMAIL PROTECTED] wrote:

> yoavs   2005/02/15 07:32:32
> 
>   Modified:.tomcat.nsi
>webapps/docs changelog.xml
>   Log:
>   Bugzilla 33489.
>   
>   Revision  ChangesPath
>   1.69  +2 -2  jakarta-tomcat-5/tomcat.nsi
>   
>   Index: tomcat.nsi
>   ===
>   RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
>   retrieving revision 1.68
>   retrieving revision 1.69
>   diff -u -r1.68 -r1.69
>   --- tomcat.nsi  2 Feb 2005 12:01:43 -   1.68
>   +++ tomcat.nsi  15 Feb 2005 15:32:32 -  1.69
>   @@ -631,7 +631,7 @@
>  ; if $INSTDIR was removed, skip these next ones
>  IfFileExists "$INSTDIR" 0 Removed 
>MessageBox MB_YESNO|MB_ICONQUESTION \
>   -  "Remove all files in your Tomcat 5.5 directory? (If you have
> anything \
>   +  "Remove all files in your Tomcat 5.5 directory? (If you have
> anything  \
> you created that you want to keep, click No)" IDNO Removed
>RMDir /r "$INSTDIR\webapps\ROOT" ; this would be skipped if the
> user hits no
>RMDir "$INSTDIR\webapps"
>   
>   
>   
>   1.236 +3 -0 
> jakarta-tomcat-catalina/webapps/docs/changelog.xml
>   
>   Index: changelog.xml
>   ===
>   RCS file:
> /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
>   retrieving revision 1.235
>   retrieving revision 1.236
>   diff -u -r1.235 -r1.236
>   --- changelog.xml   15 Feb 2005 09:58:06 -  1.235
>   +++ changelog.xml   15 Feb 2005 15:32:32 -  1.236
>   @@ -35,6 +35,9 @@
>  
>33351: Fix silent uninstallation. (remm)
>  
>   +  
>   +33489: Missing space in uninstaller message.
> (yoavs)
>   +  
>
>  
>
>   
>   
>   
> 
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
> 
> 


=
FROM SATALOGUE TECHNICAL DEPARTMENT...WE HAVE READ YOUR E-MAIL...

Please call our Duty Engineer on 01332 811564 - for a proper 'one to one' 
answer as further information and / or clarification is required from you in 
order to answer your question properly .
   He is available from 10am until 5pm Monday to Friday inclusive.

TO  RETURN TO  SATALOGUE WEBSITE: Click on to link below.

  http://www.satalogue.com/about.htm

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: JK Removing local_worker and local_worker_only directives

2005-02-15 Thread TECHNICAL DIRECTOR

PLEASE STOP SENDING US YOUR E-MAILSSatalogue
--- Henri Gomez <[EMAIL PROTECTED]> wrote:

> +1, I was unconfortable to explain these.
> 
> Simpler the better
> 
> 
> On Tue, 15 Feb 2005 08:58:11 +0100, Mladen Turk <[EMAIL PROTECTED]>
> wrote:
> > Hi,
> > 
> > I would like to deprecate the local_worker and local_worker_only
> > directives.
> > 
> > The reason is that we have now shared memory, and thus more powerful
> > ways to accomplish it's use.
> > 
> > Now, we two new directives 'redirect' and 'domain' that are more
> > powerful then exiting ones.
> > 
> > Here is how it works:
> > 
> > 1. If there is a session the request is routed to the worker.
> > 2. If there is no session and the worker is disabled, meaning not
> > accepting new connections then the request is redirected to
> > the 'redirect' router if present or 'domain' if not.
> > 3. If there is a session and the worker is in error state and
> > the 'sticky_session_force' is not set then the 'redirect'
> > and 'domain' are checked.
> > 4. If there is a session and the worker is in error state and
> > the 'sticky_session_force' is set the 500 is returned.
> > 
> > Here is the simple state table:
> > ('x' means don't care, '-' means not set)
> >   
> > | worker | session | route | domain | force | err | dis | result |
> >   
> > | w1 | w1  |   x   |   x| x | 0   |  x  | w1 |
> >   
> > | w1 | w1  |   x   |   x| 1 | 1   |  x  | 500|
> >   
> > | w1 | w1  |   w2  |   x| 0 | 1   |  x  | w2 |
> >   
> > | w1 | w1  |   -   |   grp  | 0 | 1   |  x  | grp|
> >   
> > | w1 | -   |   -   |   -| x | 0   |  0  | any|
> >   
> > | w1 | -   |   -   |   grp  | x | 0   |  0  | grp|
> >   
> > | w1 | -   |   -   |   -| x | 0   |  1  | !w1|
> >   
> > 
> > So, basically the local_worker_only will become
> 'sticky_session_force',
> > that is more descriptive meaning of the actual usage.
> > 
> > Regards,
> > Mladen.
> > 
> > -
> > To unsubscribe, e-mail: [EMAIL PROTECTED]
> > For additional commands, e-mail: [EMAIL PROTECTED]
> > 
> >
> 
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
> 
> 


=
FROM SATALOGUE TECHNICAL DEPARTMENT...WE HAVE READ YOUR E-MAIL...

Please call our Duty Engineer on 01332 811564 - for a proper 'one to one' 
answer as further information and / or clarification is required from you in 
order to answer your question properly .
   He is available from 10am until 5pm Monday to Friday inclusive.

TO  RETURN TO  SATALOGUE WEBSITE: Click on to link below.

  http://www.satalogue.com/about.htm

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: First look at new mod_jk status page

2005-02-15 Thread TECHNICAL DIRECTOR

PLEASE STOP SENDING US YOUR E-MAILS...Satalogue
--- Peter Rossbach <[EMAIL PROTECTED]> wrote:

> Hello Mladen,
> 
> new status page work fine. Really cool ;-)
> 
> Only the type of a workers was currently not correct displayed. 
> I got "unknown" as value. opps! Is it planned that we can save the
> worker configuration as seperate workers.properties? How we can transfer
> the information to an Tomcat MBeanServer? Can I help to fix the old Java
> AJP jk2 handler or start with a new implementaion? Can we get the status
> information as XML document? Not really important but easier to
> integrate in some monitoring products.
> 
> What are your next steps?
> 
> Here my working configuration:
> 
> workers.properties
> 
> worker.list=lb,status
> 
> worker.node1.port=9012
> worker.node1.host=localhost
> worker.node1.type=ajp13
> 
> worker.node2.port=9022
> worker.node2.host=localhost
> worker.node2.type=ajp13
> 
> worker.node3.port=9032
> worker.node3.host=localhost
> worker.node3.type=ajp13
> 
> worker.lb.balanced_workers=node1,node2,node3
> worker.lb.type=lb
> 
> worker.status.type=status
> 
> 
> And at httpd.conf
> JkMount /status/* status
> 
> Many Thanx
> Peter
> 
> 
> 
> 
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
> 
> 


=
FROM SATALOGUE TECHNICAL DEPARTMENT...WE HAVE READ YOUR E-MAIL...

Please call our Duty Engineer on 01332 811564 - for a proper 'one to one' 
answer as further information and / or clarification is required from you in 
order to answer your question properly .
   He is available from 10am until 5pm Monday to Friday inclusive.

TO  RETURN TO  SATALOGUE WEBSITE: Click on to link below.

  http://www.satalogue.com/about.htm

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Fwd: Bug and Possible Fix in JK 1.2.8 (I am not sure where/how to post this)

2005-02-15 Thread TECHNICAL DIRECTOR

PLEASE STOP SENDINU US YOUR E-MAILS...Satalogue
--- Mladen Turk <[EMAIL PROTECTED]> wrote:

> Pier Fumagalli wrote:
> > 
> > 
> >> From: "Ivo Conde" <[EMAIL PROTECTED]>
> >> Here is the buggy part of the method:
> >>
> >>  case 4:
> >>  switch (method[0])
> >>  {
> >>  case 'H':
> >>  return (method[1] == 'E'
> >>  && method[2] == 'A'
> >>  && method[3] == 'D'
> >>  ? SC_M_GET : UNKNOWN_METHOD);
> >>
> 
> Standard copy/paste error :).
> Commited. Thanks for spotting that.
> 
> Regards,
> Mladen.
> 
> 
> 
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
> 
> 

=
FROM SATALOGUE TECHNICAL DEPARTMENT...WE HAVE READ YOUR E-MAIL...

Please call our Duty Engineer on 01332 811564 - for a proper 'one to one' 
answer as further information and / or clarification is required from you in 
order to answer your question properly .
   He is available from 10am until 5pm Monday to Friday inclusive.

TO  RETURN TO  SATALOGUE WEBSITE: Click on to link below.

  http://www.satalogue.com/about.htm

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Fwd: Bug and Possible Fix in JK 1.2.8 (I am not sure where/how to post this)

2005-02-15 Thread TECHNICAL DIRECTOR

PLEASE STOP SENDING US YOUR E-MAILSSatalogue
--- Pier Fumagalli <[EMAIL PROTECTED]> wrote:

> 
> 
> Begin forwarded message:
> 
> > From: "Ivo Conde" <[EMAIL PROTECTED]>
> > Date: 15 February 2005 01:43:39 GMT
> > To: <[EMAIL PROTECTED]>
> > Subject: Bug and Possible Fix in JK 1.2.8 (I am not sure where/how to 
> > post this)
> >
> > Hi,
> >
> >   
> >
> > I have found a bug and possible fix in the latest version (1.2.8) of 
> > the JK Connector for Apache+Tomcat.
> >
> >   
> >
> > The bug:
> >
> > JK converts user http HEAD requests made to Apache into http GET 
> > calls to Tomcat
> >
> >  
> >
> > The fix:
> >
> > There seems to be in a error in jk_ajp_common.c , inside the method 
> > static int sc_for_req_method(const char *method, size_t len).
> >
> > The switch statement is incorrectly returning the GET method for the 
> > HEAD case.
> >
> >  
> >
> > Here is the buggy part of the method:
> >
> >  case 4:
> >  switch (method[0])
> >  {
> >  case 'H':
> >  return (method[1] == 'E'
> >  && method[2] == 'A'
> >  && method[3] == 'D'
> >  ? SC_M_GET : UNKNOWN_METHOD);
> >
> > 
> >
> > The fix:
> >
> >  
> >
> >  case 4:
> >  switch (method[0])
> >  {
> >  case 'H':
> >  return (method[1] == 'E'
> >  && method[2] == 'A'
> >  && method[3] == 'D'
> >  ? SC_M_HEAD : UNKNOWN_METHOD);  // REPLACE GET BY
> 
> > HEAD
> >
> >  
> >
> >  
> >
> > The fix worked, at least for me.
> >
> >  
> >
> > The bug occurred in a Linux Red Hat Entreprise, Kernel 2.4.21-27.EL , 
> > EMT64 Processor (x86_64 GNU/Linux)
> >
> >  
> >
> > Can you please forward this email to the right place? Sorry if Im not
> 
> > following the proper rules to report this, but I dont have much time 
> > to learn about bug/patch submission methods on jakarta. I did search 
> > your bug database but did not find this bug anywhere. I hope this can 
> > be of some help anyway. This is my first contribution to the open 
> > source community since years, and  I wouldnt sleep at night if I 
> > missed this opportunity to give something back, after having received 
> > so much from it.
> >
> >  
> >
> > Thanks and best regards,
> >
> >  Ivo
> >
> >  
> >
> >  
> 

> ATTACHMENT part 2 application/pkcs7-signature name=smime.p7s



=
FROM SATALOGUE TECHNICAL DEPARTMENT...WE HAVE READ YOUR E-MAIL...

Please call our Duty Engineer on 01332 811564 - for a proper 'one to one' 
answer as further information and / or clarification is required from you in 
order to answer your question properly .
   He is available from 10am until 5pm Monday to Friday inclusive.

TO  RETURN TO  SATALOGUE WEBSITE: Click on to link below.

  http://www.satalogue.com/about.htm

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33564] - Servlet Init Params for a jsp cannot be obtained

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33564





--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 19:05 ---
Thanks for the more detailed response.

May I ask a question:  Why would my JSP config object have *both* my params
*and* the params from the JSP invoker?  I would expect one set or the other, but
I would not expect both combined into one set of init params for both servlet
definitions.
Just curious.

Thanks,
Bryan


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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: cvs commit: jakarta-tomcat-connectors/jk/native/common jk_global.h

2005-02-15 Thread TECHNICAL DIRECTOR

PLEASE STOP SENDING ME YOUR E-MAILS...Satalogue.
--- [EMAIL PROTECTED] wrote:

> mturk   2005/02/15 03:43:15
> 
>   Modified:jk/native/common jk_global.h
>   Log:
>   The saga continues. Remove CRLFs, again :).
>   
>   Revision  ChangesPath
>   1.43  +28 -28   
> jakarta-tomcat-connectors/jk/native/common/jk_global.h
>   
>   Index: jk_global.h
>   ===
>   RCS file:
> /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_global.h,v
>   retrieving revision 1.42
>   retrieving revision 1.43
>   diff -u -r1.42 -r1.43
>   --- jk_global.h 15 Feb 2005 11:40:00 -  1.42
>   +++ jk_global.h 15 Feb 2005 11:43:15 -  1.43
>   @@ -61,33 +61,33 @@
>#include 
>
>#ifdef WIN32
>   -#ifndef _WINDOWS_
>   -#ifndef WIN32_LEAN_AND_MEAN
>   -#define WIN32_LEAN_AND_MEAN
>   -#endif
>   -#ifndef _WIN32_WINNT
>   -
>   -/* Restrict the server to a subset of Windows NT 4.0 header files by
> default
>   - */
>   -#define _WIN32_WINNT 0x0400
>   -#endif
>   -#ifndef NOUSER
>   -#define NOUSER
>   -#endif
>   -#ifndef NOMCX
>   -#define NOMCX
>   -#endif
>   -#ifndef NOIME
>   -#define NOIME
>   -#endif
>   -#include 
>   -/* 
>   - * Add a _very_few_ declarations missing from the restricted set of
> headers
>   - * (If this list becomes extensive, re-enable the required headers
> above!)
>   - * winsock headers were excluded by WIN32_LEAN_AND_MEAN, so include
> them now
>   - */
>   -#include 
>   -#include 
>   +#ifndef _WINDOWS_
>   +#ifndef WIN32_LEAN_AND_MEAN
>   +#define WIN32_LEAN_AND_MEAN
>   +#endif
>   +#ifndef _WIN32_WINNT
>   +
>   +/* Restrict the server to a subset of Windows NT 4.0 header files by
> default
>   + */
>   +#define _WIN32_WINNT 0x0400
>   +#endif
>   +#ifndef NOUSER
>   +#define NOUSER
>   +#endif
>   +#ifndef NOMCX
>   +#define NOMCX
>   +#endif
>   +#ifndef NOIME
>   +#define NOIME
>   +#endif
>   +#include 
>   +/* 
>   + * Add a _very_few_ declarations missing from the restricted set of
> headers
>   + * (If this list becomes extensive, re-enable the required headers
> above!)
>   + * winsock headers were excluded by WIN32_LEAN_AND_MEAN, so include
> them now
>   + */
>   +#include 
>   +#include 
>#include 
>#endif
>#include 
>   
>   
>   
> 
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
> 
> 


=
FROM SATALOGUE TECHNICAL DEPARTMENT...WE HAVE READ YOUR E-MAIL...

Please call our Duty Engineer on 01332 811564 - for a proper 'one to one' 
answer as further information and / or clarification is required from you in 
order to answer your question properly .
   He is available from 10am until 5pm Monday to Friday inclusive.

TO  RETURN TO  SATALOGUE WEBSITE: Click on to link below.

  http://www.satalogue.com/about.htm

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33588] - HEAD request are sent as GET in NameVirtualHost using mod_jk

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33588


[EMAIL PROTECTED] changed:

   What|Removed |Added

 AssignedTo|[EMAIL PROTECTED]   |tomcat-
   ||[EMAIL PROTECTED]




--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 18:39 ---
This bug only appears with mod_jk and not with a regular apache static file 
server or a tomcat server behind mod_proxy. Could it be related to AJP13 or 
something like that ?

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33589] - stop a context without interrupting its running threads

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33589





--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 18:30 ---
Clarification: yes, the threads will be "stopped" when stopping the webapp
(obviously, they are not, but after the classloader stops doing anything, your
requests are basically dead). You just have the option of hacking a little in
the source to wait more.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33159] - ant task should cause a failure in target when encountering a failure

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33159





--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 18:25 ---
Does it fail properly if you don't do foreach, i.e. just try a simple deploy?  
I think foreach/parallel explicitly does not fail overall execution if one 
path/list fails.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33469] - OutOfMemoryError when upload a jpg image for process

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33469





--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 18:22 ---
Without a test we can use to reproduce your results, this issue will be marked 
as invalid, because we will assume that the fault lies with your code.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33564] - Servlet Init Params for a jsp cannot be obtained

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33564


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|CLOSED




--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 18:21 ---
That's not surprising (to us at least), because a  tag is nice by 
itself but doesn't mean anything, seeing as how it's never used because it 
doesn't match any URL-pattern.  So your JSP page still matches the JSPServlet 
because of its *.jsp mapping.  This is what the initial responses to this 
issue (the ones dismissed as "shooting from the hip" ;)) meant.

You have a couple of options, by the way.  You can precisely map 
your "servlet."  You can customize Tomcat's JSPServlet (or a copy of it) to 
fit your needs.  You can use application-level parameters, the ones that go 
under the  element in web.xml and not in a  tag.  You can 
use resource or env-entry references to accomplish these same things.  Pretty 
much any of these are better than the approach of declaring a  tag 
for a JSP page.

And of course, none of these are a Tomcat bug, and the initial responses 
(although possibly curt, or simply expecting a high level of knowledge from 
the reader) were right on.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33589] - stop a context without interrupting its running threads

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33589





--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 18:19 ---
No.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: HR Ozone IT

2005-02-15 Thread hr

Dear Applicant,



We appreciate your interest in our organization. In order to process your 
application at the earliest, we would like you to serve us more info by filling 
up Ozone screening form.



You can access the form at:

www.motiveme.com



Regards

HR.

Ozone IT



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33589] New: - stop a context without interrupting its running threads

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33589

   Summary: stop a context without interrupting its running threads
   Product: Tomcat 4
   Version: 4.1.31
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: major
  Priority: P2
 Component: Webapps:Manager
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


I don't think it is a bug but I'd want to suggest you a new feature.

Actually, when I stop a context, its running threads are interrupted, 
so, 
- If my servlet had already send datas on the response outputstream, I can have
a 200 HTTP response with a truncated response,
- If my servlet had not send datas before, I can have a 500 HTTP response with
NullPointerException, XML11Configuration not found, ...

So I can't stop my Context without a service interruption (from a client point
of view), even if I have load balancing/failover with mod_jk.

So, is it possible to add a configuration parameter in Tomcat Context to not
interrupt running threads ?

This request for new feature is also available for Tomcat 5.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33564] - Servlet Init Params for a jsp cannot be obtained

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33564





--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 18:13 ---
Created an attachment (id=14289)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=14289&action=view)
New webapp with new behavior.

Hello again,

We are getting closer.  Bruce discovered that the 'fork' and 'xpoweredBy' init
params are coming from the JSP invoker servlet defined in conf/web.xml.  So...
it seems clear that Tomcat is using this servlet definition rather than our
servlet definition.

So, I concluded that I needed a servlet mapping (to override the primary JSP
invoker mapping).  So in this WAR file I have added a servlet-mapping element
for the /index.jsp servlet.  Now... I am seeing both sets of init params in my
JSP page.  Is that really how it should work?  Should every JSP page include
the init params for the JSP invoker?  This seems odd, but easily worked-around.


-Bryan


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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33505] - mod_jk does not build on OS/400

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33505


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |




--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 17:56 ---
Sorry, Mladen, but that semicolon is still missing in jk_ajp12_worker.c. I'm
looking at revision 1.22.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33564] - Servlet Init Params for a jsp cannot be obtained

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33564





--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 17:41 ---
(From update of attachment 14288)
I have now tested this webapp on two stable versions: 5.0.28 and 5.5.7.


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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33564] - Servlet Init Params for a jsp cannot be obtained

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33564





--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 17:27 ---
Created an attachment (id=14288)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=14288&action=view)
This webapp demonstrates the bug.

The web.xml file has been fixed to include the  declaration. 
This did not fix the bug that we are seeing.  PLEASE: let's concentrate on the
bug at hand: a servlet definition with a jsp-file element does not seem to
assign the declared init. params. to the JSP instance at init-time nor at
request-time.
-Bryan


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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_status.c

2005-02-15 Thread mturk

mturk   2005/02/15 08:23:59

  Modified:jk/native/common jk_status.c
  Log:
  Seem I forgot C :). Fix the typo.
  
  Revision  ChangesPath
  1.11  +2 -2  jakarta-tomcat-connectors/jk/native/common/jk_status.c
  
  Index: jk_status.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_status.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- jk_status.c   15 Feb 2005 16:20:27 -  1.10
  +++ jk_status.c   15 Feb 2005 16:23:59 -  1.11
  @@ -185,7 +185,7 @@
   
   static const char *status_worker_type(int t)
   {
  -if (t < 0 || t < 6)
  +if (t < 0 || t > 6)
   t = 0;
   return worker_type[t];
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33572] - webapp not reload after META-INF/context.xml change

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33572


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 17:22 ---
I tweaked handling of the context.xml files, which are now no longer regular
watched resources, but will trigger a full redeployment (but without deleting
everything, obviously). My changes seem to work, but there are quite a number of
different cases, so it is tricky. Please test it.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_status.c

2005-02-15 Thread mturk

mturk   2005/02/15 08:20:27

  Modified:jk/native/common jk_status.c
  Log:
  Fix determinig worker type string.
  
  Revision  ChangesPath
  1.10  +2 -2  jakarta-tomcat-connectors/jk/native/common/jk_status.c
  
  Index: jk_status.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_status.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- jk_status.c   15 Feb 2005 11:42:20 -  1.9
  +++ jk_status.c   15 Feb 2005 16:20:27 -  1.10
  @@ -185,7 +185,7 @@
   
   static const char *status_worker_type(int t)
   {
  -if (t > 0 && t < 7)
  +if (t < 0 || t < 6)
   t = 0;
   return worker_type[t];
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup HostConfig.java

2005-02-15 Thread remm

remm2005/02/15 08:19:21

  Modified:catalina/src/share/org/apache/catalina/startup
HostConfig.java
  Log:
  - Handle similar cases for compressed WAR deployment and descriptor 
deployments.
  
  Revision  ChangesPath
  1.56  +12 -8 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java
  
  Index: HostConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- HostConfig.java   15 Feb 2005 15:42:58 -  1.55
  +++ HostConfig.java   15 Feb 2005 16:19:21 -  1.56
  @@ -608,6 +608,8 @@
   // Add the eventual unpacked WAR and all the resources which 
will be
   // watched inside it
   if (isWar && unpackWARs) {
  +deployedApp.redeployResources.put
  +(contextXml.getAbsolutePath(), new 
Long(contextXml.lastModified()));
   
deployedApp.redeployResources.put(expandedDocBase.getAbsolutePath(),
   new Long(expandedDocBase.lastModified()));
   addWatchedResources(deployedApp, 
expandedDocBase.getAbsolutePath(), context);
  @@ -636,15 +638,15 @@
   
deployedApp.redeployResources.put(warDocBase.getAbsolutePath(),
   new Long(warDocBase.lastModified()));
   }
  +// Add the context XML to the list of files which 
should trigger a redeployment
  +deployedApp.redeployResources.put
  +(contextXml.getAbsolutePath(), new 
Long(contextXml.lastModified()));
   if (expandedDocBase.exists()) {
   
deployedApp.redeployResources.put(expandedDocBase.getAbsolutePath(),
   new 
Long(expandedDocBase.lastModified()));
   addWatchedResources(deployedApp, 
   expandedDocBase.getAbsolutePath(), 
context);
   }
  -// Add the context XML to the list of files which 
should trigger a redeployment
  -deployedApp.redeployResources.put
  -(contextXml.getAbsolutePath(), new 
Long(contextXml.lastModified()));
   }
   } else {
   // Add the context XML to the list of files which should 
trigger a redeployment
  @@ -787,6 +789,11 @@
   // Deploy the application in this WAR file
   if(log.isInfoEnabled()) 
   log.info(sm.getString("hostConfig.deployJar", file));
  +
  +// Populate redeploy resources with the WAR file
  +deployedApp.redeployResources.put
  +(dir.getAbsolutePath(), new Long(dir.lastModified()));
  +
   try {
   Context context = (Context) 
Class.forName(contextClass).newInstance();
   if (context instanceof Lifecycle) {
  @@ -799,7 +806,7 @@
   context.setDocBase(file);
   if (xml.exists()) {
   context.setConfigFile(xml.getAbsolutePath());
  -deployedApp.reloadResources.put
  +deployedApp.redeployResources.put
   (xml.getAbsolutePath(), new Long(xml.lastModified()));
   }
   host.addChild(context);
  @@ -831,9 +838,6 @@
   log.error(sm.getString("hostConfig.deployJar.error", file), t);
   }
   
  -// Populate redeploy resources with the WAR file
  -deployedApp.redeployResources.put
  -(dir.getAbsolutePath(), new Long(dir.lastModified()));
   deployed.put(contextPath, deployedApp);
   }
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/conf context.xml

2005-02-15 Thread remm

remm2005/02/15 07:42:58

  Modified:catalina/src/share/org/apache/catalina/startup
HostConfig.java LocalStrings.properties
   catalina/src/conf context.xml
  Log:
  - Tentative fix for 33572: context.xml should be a redeploy resource. This is 
done by prioritizing the redeploy resources.
  - I need to test this better. The basic cases seem to be working (editing 
manager.xml, as well as an expanded folder as per the bug report).
  - Remove context.xml from the list of watched resources.
  
  Revision  ChangesPath
  1.55  +36 -23
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java
  
  Index: HostConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- HostConfig.java   29 Jan 2005 19:45:55 -  1.54
  +++ HostConfig.java   15 Feb 2005 15:42:58 -  1.55
  @@ -25,6 +25,7 @@
   import java.io.InputStream;
   import java.util.ArrayList;
   import java.util.HashMap;
  +import java.util.LinkedHashMap;
   import java.util.jar.JarEntry;
   import java.util.jar.JarFile;
   
  @@ -572,9 +573,6 @@
   }
   context.setConfigFile(contextXml.getAbsolutePath());
   context.setPath(contextPath);
  -// Add the context XML to the list of watched files
  -deployedApp.reloadResources.put
  -(contextXml.getAbsolutePath(), new 
Long(contextXml.lastModified()));
   // Add the associated docBase to the redeployed list if it's a 
WAR
   boolean isWar = false;
   if (context.getDocBase() != null) {
  @@ -628,7 +626,6 @@
   external = true;
   deployedApp.redeployResources.put
   (contextXml.getAbsolutePath(), new 
Long(contextXml.lastModified()));
  -
deployedApp.reloadResources.remove(contextXml.getAbsolutePath());
   }
   } catch (IOException e) {
   // Ignore
  @@ -645,8 +642,14 @@
   addWatchedResources(deployedApp, 
   expandedDocBase.getAbsolutePath(), 
context);
   }
  +// Add the context XML to the list of files which 
should trigger a redeployment
  +deployedApp.redeployResources.put
  +(contextXml.getAbsolutePath(), new 
Long(contextXml.lastModified()));
   }
   } else {
  +// Add the context XML to the list of files which should 
trigger a redeployment
  +deployedApp.redeployResources.put
  +(contextXml.getAbsolutePath(), new 
Long(contextXml.lastModified()));
   addWatchedResources(deployedApp, null, context);
   }
   }
  @@ -904,13 +907,17 @@
   }
   context.setPath(contextPath);
   context.setDocBase(file);
  +File configFile = new File(dir, Constants.ApplicationContextXml);
   if (deployXML) {
  -context.setConfigFile
  -((new File(dir, 
Constants.ApplicationContextXml)).getAbsolutePath());
  +context.setConfigFile(configFile.getAbsolutePath());
   }
   host.addChild(context);
   deployedApp.redeployResources.put(dir.getAbsolutePath(),
   new Long(dir.lastModified()));
  +if (deployXML) {
  +
deployedApp.redeployResources.put(configFile.getAbsolutePath(),
  +new Long(configFile.lastModified()));
  +}
   addWatchedResources(deployedApp, dir.getAbsolutePath(), context);
   } catch (Throwable t) {
   log.error(sm.getString("hostConfig.deployDir.error", file), t);
  @@ -974,7 +981,9 @@
   if (resource.exists()) {
   long lastModified = ((Long) 
app.redeployResources.get(resources[i])).longValue();
   if ((!resource.isDirectory()) && resource.lastModified() > 
lastModified) {
  -// Redeploy application
  +// Undeploy application
  +if (log.isInfoEnabled())
  +log.info(sm.getString("hostConfig.undeploy", 
app.name));
   ContainerBase context = (ContainerBase) 
host.findChild(app.name);
   host.removeChild(context);
   try {
  @@ -984,28 +993,32 @@
("hostConfig.context.destroy", app.name), 
e);
   }

DO NOT REPLY [Bug 33489] - typo in uninstaller

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33489


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 16:32 ---
Fixed in HEAD.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml

2005-02-15 Thread yoavs

yoavs   2005/02/15 07:32:32

  Modified:.tomcat.nsi
   webapps/docs changelog.xml
  Log:
  Bugzilla 33489.
  
  Revision  ChangesPath
  1.69  +2 -2  jakarta-tomcat-5/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- tomcat.nsi2 Feb 2005 12:01:43 -   1.68
  +++ tomcat.nsi15 Feb 2005 15:32:32 -  1.69
  @@ -631,7 +631,7 @@
 ; if $INSTDIR was removed, skip these next ones
 IfFileExists "$INSTDIR" 0 Removed 
   MessageBox MB_YESNO|MB_ICONQUESTION \
  -  "Remove all files in your Tomcat 5.5 directory? (If you have anything \
  +  "Remove all files in your Tomcat 5.5 directory? (If you have anything  
\
you created that you want to keep, click No)" IDNO Removed
   RMDir /r "$INSTDIR\webapps\ROOT" ; this would be skipped if the user 
hits no
   RMDir "$INSTDIR\webapps"
  
  
  
  1.236 +3 -0  jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.235
  retrieving revision 1.236
  diff -u -r1.235 -r1.236
  --- changelog.xml 15 Feb 2005 09:58:06 -  1.235
  +++ changelog.xml 15 Feb 2005 15:32:32 -  1.236
  @@ -35,6 +35,9 @@
 
   33351: Fix silent uninstallation. (remm)
 
  +  
  +33489: Missing space in uninstaller message. (yoavs)
  +  
   
 
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

tomcat-dev@jakarta.apache.org

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33535


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WONTFIX
Summary|invalid XML in directory|invalid XML in directory
   |listing with names  |listing with names
   |containing "&"  |containing "&"




--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 16:27 ---
I'm not big on making a change to DefaultServlet just for this unusual use-
case.  This is why the relevant methods are protected: subclass DefaultServlet 
yourself for your use-case as needed.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33370] - On Tomcat 4.1.24, this works fine but with Tomcat 5, I experience the following

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33370


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID




--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 16:25 ---
http://jakarta.apache.org/site/mail2.html#Tomcat

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33586] - Session already invalidated

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33586


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID




--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 16:23 ---
Bugzilla is not a discussion forum: use the tomcat-user mailing list for this 
purpose.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33586] New: - Session already invalidated

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33586

   Summary: Session already invalidated
   Product: Tomcat 5
   Version: 5.5.4
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Unknown
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


When i login to my application i get this error. pls advice.

java.lang.IllegalStateException: getAttribute: Session already invalidated
at org.apache.catalina.session.StandardSession.getAttribute
(StandardSession.java:984)
at org.apache.catalina.session.StandardSessionFacade.getAttribute
(StandardSessionFacade.java:109)
at gnu.beanfactory.SessionScope.get(Unknown Source)
at gnu.beanfactory.BeanFactory.findInstance(Unknown Source)
at gnu.beanfactory.BeanFactory.getObjectInstance(Unknown Source)
at gnu.beanfactory.BeanFactory.getObjectInstance(Unknown Source)
at gnu.beanfactory.BeanContext.lookup(Unknown Source)
at gnu.beanfactory.BeanContext.lookup(Unknown Source)
at org.apache.jsp.include.nav_jsp.checkAccess
(org.apache.jsp.include.nav_jsp:62)
at org.apache.jsp.include.nav_jsp._jspService
(org.apache.jsp.include.nav_jsp:1601)
at org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:99)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:802)
at org.apache.jasper.servlet.JspServletWrapper.service
(JspServletWrapper.java:325)
at org.apache.jasper.servlet.JspServlet.serviceJspFile
(JspServlet.java:295)
at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:245)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:802)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter
(ApplicationFilterChain.java:237)
at org.apache.catalina.core.ApplicationFilterChain.doFilter
(ApplicationFilterChain.java:157)
at org.apache.catalina.core.StandardWrapperValve.invoke
(StandardWrapperValve.java:214)
at org.apache.catalina.core.StandardContextValve.invoke
(StandardContextValve.java:178)
at org.apache.catalina.core.StandardHostValve.invoke
(StandardHostValve.java:126)
at org.apache.catalina.valves.ErrorReportValve.invoke
(ErrorReportValve.java:105)
at org.apache.catalina.valves.AccessLogValve.invoke
(AccessLogValve.java:526)
at org.apache.catalina.core.StandardEngineValve.invoke
(StandardEngineValve.java:107)
at org.apache.catalina.connector.CoyoteAdapter.service
(CoyoteAdapter.java:148)
at org.apache.jk.server.JkCoyoteHandler.invoke
(JkCoyoteHandler.java:300)
at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:383)
at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:743)
at org.apache.jk.common.ChannelSocket.processConnection
(ChannelSocket.java:675)
at org.apache.jk.common.SocketConnection.runIt(ChannelSocket.java:866)
at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run
(ThreadPool.java:684)
at java.lang.Thread.run(Thread.java:595)

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: JK Removing local_worker and local_worker_only directives

2005-02-15 Thread Henri Gomez

+1, I was unconfortable to explain these.

Simpler the better


On Tue, 15 Feb 2005 08:58:11 +0100, Mladen Turk <[EMAIL PROTECTED]> wrote:
> Hi,
> 
> I would like to deprecate the local_worker and local_worker_only
> directives.
> 
> The reason is that we have now shared memory, and thus more powerful
> ways to accomplish it's use.
> 
> Now, we two new directives 'redirect' and 'domain' that are more
> powerful then exiting ones.
> 
> Here is how it works:
> 
> 1. If there is a session the request is routed to the worker.
> 2. If there is no session and the worker is disabled, meaning not
> accepting new connections then the request is redirected to
> the 'redirect' router if present or 'domain' if not.
> 3. If there is a session and the worker is in error state and
> the 'sticky_session_force' is not set then the 'redirect'
> and 'domain' are checked.
> 4. If there is a session and the worker is in error state and
> the 'sticky_session_force' is set the 500 is returned.
> 
> Here is the simple state table:
> ('x' means don't care, '-' means not set)
>   
> | worker | session | route | domain | force | err | dis | result |
>   
> | w1 | w1  |   x   |   x| x | 0   |  x  | w1 |
>   
> | w1 | w1  |   x   |   x| 1 | 1   |  x  | 500|
>   
> | w1 | w1  |   w2  |   x| 0 | 1   |  x  | w2 |
>   
> | w1 | w1  |   -   |   grp  | 0 | 1   |  x  | grp|
>   
> | w1 | -   |   -   |   -| x | 0   |  0  | any|
>   
> | w1 | -   |   -   |   grp  | x | 0   |  0  | grp|
>   
> | w1 | -   |   -   |   -| x | 0   |  1  | !w1|
>   
> 
> So, basically the local_worker_only will become 'sticky_session_force',
> that is more descriptive meaning of the actual usage.
> 
> Regards,
> Mladen.
> 
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
> 
>

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

First look at new mod_jk status page

2005-02-15 Thread Peter Rossbach

Hello Mladen,
new status page work fine. Really cool ;-)
Only the type of a workers was currently not correct displayed. 
I got "unknown" as value. opps! Is it planned that we can save the worker configuration as seperate workers.properties? How we can transfer the information to an Tomcat MBeanServer? Can I help to fix the old Java AJP jk2 handler or start with a new implementaion? Can we get the status information as XML document? Not really important but easier to integrate in some monitoring products.

What are your next steps?
Here my working configuration:
workers.properties

worker.list=lb,status
worker.node1.port=9012
worker.node1.host=localhost
worker.node1.type=ajp13
worker.node2.port=9022
worker.node2.host=localhost
worker.node2.type=ajp13
worker.node3.port=9032
worker.node3.host=localhost
worker.node3.type=ajp13
worker.lb.balanced_workers=node1,node2,node3
worker.lb.type=lb
worker.status.type=status
And at httpd.conf
JkMount /status/* status
Many Thanx
Peter

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Fwd: Bug and Possible Fix in JK 1.2.8 (I am not sure where/how to post this)

2005-02-15 Thread Mladen Turk

Pier Fumagalli wrote:

From: "Ivo Conde" <[EMAIL PROTECTED]>
Here is the buggy part of the method:
 case 4:
 switch (method[0])
 {
 case 'H':
 return (method[1] == 'E'
 && method[2] == 'A'
 && method[3] == 'D'
 ? SC_M_GET : UNKNOWN_METHOD);
Standard copy/paste error :).
Commited. Thanks for spotting that.
Regards,
Mladen.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp_common.c

2005-02-15 Thread mturk

mturk   2005/02/15 04:11:20

  Modified:jk/native/common jk_ajp_common.c
  Log:
  Fix request method processing for HEAD. Thanks to Ivo for finding
  the solution, and Pier to forward it.
  
  Revision  ChangesPath
  1.78  +2 -2  
jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
  
  Index: jk_ajp_common.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- jk_ajp_common.c   14 Feb 2005 18:07:00 -  1.77
  +++ jk_ajp_common.c   15 Feb 2005 12:11:20 -  1.78
  @@ -119,7 +119,7 @@
   return (method[1] == 'E'
   && method[2] == 'A'
   && method[3] == 'D'
  -? SC_M_GET : UNKNOWN_METHOD);
  +? SC_M_HEAD : UNKNOWN_METHOD);
   case 'P':
   return (method[1] == 'O'
   && method[2] == 'S'
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native/netscape jk_nsapi_plugin.c

2005-02-15 Thread mturk

mturk   2005/02/15 04:03:31

  Modified:jk/native/netscape jk_nsapi_plugin.c
  Log:
  Include nsapi.h as first include.
  
  Revision  ChangesPath
  1.20  +3 -4  
jakarta-tomcat-connectors/jk/native/netscape/jk_nsapi_plugin.c
  
  Index: jk_nsapi_plugin.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/netscape/jk_nsapi_plugin.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- jk_nsapi_plugin.c 13 Feb 2005 12:30:59 -  1.19
  +++ jk_nsapi_plugin.c 15 Feb 2005 12:03:31 -  1.20
  @@ -20,7 +20,8 @@
* Version: $Revision$   *
***/
   
  -
  +

  +#include "nsapi.h"
   #include "jk_global.h"
   #include "jk_util.h"
   #include "jk_map.h"
  @@ -29,8 +30,6 @@
   #include "jk_worker.h"
   #include "jk_shm.h"

   
  -#include "nsapi.h"
  -
   #define URI_PATTERN "path"
   #define DEFAULT_WORKER_NAME ("ajp13")
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Fwd: Bug and Possible Fix in JK 1.2.8 (I am not sure where/how to post this)

2005-02-15 Thread Pier Fumagalli

Begin forwarded message:
From: "Ivo Conde" <[EMAIL PROTECTED]>
Date: 15 February 2005 01:43:39 GMT
To: <[EMAIL PROTECTED]>
Subject: Bug and Possible Fix in JK 1.2.8 (I am not sure where/how to 
post this)

Hi,

I have found a bug and possible fix in the latest version (1.2.8) of 
the JK Connector for Apache+Tomcat.

The bug:
JK “converts” user http HEAD requests made to Apache into http GET 
calls to Tomcat

The fix:
There seems to be in a error in jk_ajp_common.c , inside the method 
static int sc_for_req_method(const char *method, size_t len).

The switch statement is incorrectly returning the GET method for the 
HEAD case.

Here is the buggy part of the method:
 case 4:
 switch (method[0])
 {
 case 'H':
 return (method[1] == 'E'
 && method[2] == 'A'
 && method[3] == 'D'
 ? SC_M_GET : UNKNOWN_METHOD);
………
The fix:

 case 4:
 switch (method[0])
 {
 case 'H':
 return (method[1] == 'E'
 && method[2] == 'A'
 && method[3] == 'D'
 ? SC_M_HEAD : UNKNOWN_METHOD);  // REPLACE GET BY 
HEAD

The fix worked, at least for me.

The bug occurred in a Linux Red Hat Entreprise, Kernel 2.4.21-27.EL , 
EMT64 Processor (x86_64 GNU/Linux)

Can you please forward this email to the right place? Sorry if I’m not 
following the proper rules to report this, but I don’t have much time 
to learn about bug/patch submission methods on jakarta. I did search 
your bug database but did not find this bug anywhere. I hope this can 
be of some help anyway. This is my first contribution to the open 
source community since years, and  I wouldn’t sleep at night if I 
missed this opportunity to give something back, after having received 
so much from it.

Thanks and best regards,
 Ivo

smime.p7s
Description: S/MIME cryptographic signature

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_global.h

2005-02-15 Thread mturk

mturk   2005/02/15 03:43:15

  Modified:jk/native/common jk_global.h
  Log:
  The saga continues. Remove CRLFs, again :).
  
  Revision  ChangesPath
  1.43  +28 -28jakarta-tomcat-connectors/jk/native/common/jk_global.h
  
  Index: jk_global.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_global.h,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- jk_global.h   15 Feb 2005 11:40:00 -  1.42
  +++ jk_global.h   15 Feb 2005 11:43:15 -  1.43
  @@ -61,33 +61,33 @@
   #include 
   
   #ifdef WIN32
  -#ifndef _WINDOWS_

  -#ifndef WIN32_LEAN_AND_MEAN

  -#define WIN32_LEAN_AND_MEAN

  -#endif

  -#ifndef _WIN32_WINNT

  -

  -/* Restrict the server to a subset of Windows NT 4.0 header files by default

  - */

  -#define _WIN32_WINNT 0x0400

  -#endif

  -#ifndef NOUSER

  -#define NOUSER

  -#endif

  -#ifndef NOMCX

  -#define NOMCX

  -#endif

  -#ifndef NOIME

  -#define NOIME

  -#endif

  -#include 

  -/* 

  - * Add a _very_few_ declarations missing from the restricted set of headers

  - * (If this list becomes extensive, re-enable the required headers above!)

  - * winsock headers were excluded by WIN32_LEAN_AND_MEAN, so include them now

  - */

  -#include 

  -#include 

  +#ifndef _WINDOWS_
  +#ifndef WIN32_LEAN_AND_MEAN
  +#define WIN32_LEAN_AND_MEAN
  +#endif
  +#ifndef _WIN32_WINNT
  +
  +/* Restrict the server to a subset of Windows NT 4.0 header files by default
  + */
  +#define _WIN32_WINNT 0x0400
  +#endif
  +#ifndef NOUSER
  +#define NOUSER
  +#endif
  +#ifndef NOMCX
  +#define NOMCX
  +#endif
  +#ifndef NOIME
  +#define NOIME
  +#endif
  +#include 
  +/* 
  + * Add a _very_few_ declarations missing from the restricted set of headers
  + * (If this list becomes extensive, re-enable the required headers above!)
  + * winsock headers were excluded by WIN32_LEAN_AND_MEAN, so include them now
  + */
  +#include 
  +#include 
   #include 
   #endif
   #include 
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_status.c

2005-02-15 Thread mturk

mturk   2005/02/15 03:42:20

  Modified:jk/native/common jk_status.c
  Log:
  Added load balancer parameters editor.
  
  Revision  ChangesPath
  1.9   +49 -9 jakarta-tomcat-connectors/jk/native/common/jk_status.c
  
  Index: jk_status.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_status.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- jk_status.c   15 Feb 2005 09:00:43 -  1.8
  +++ jk_status.c   15 Feb 2005 11:42:20 -  1.9
  @@ -273,8 +273,13 @@
   continue;
   }
   jk_puts(s, "\nWorker Status for ");
  -jk_putv(s, "req_uri, "?cmd=show&w=",
  -sw->we->worker_list[i], "\">", NULL); 
  +if (dworker && strcmp(dworker, sw->we->worker_list[i]) == 0) {
  +/* Next click will colapse the editor */
  +jk_putv(s, "req_uri, "?cmd=show\">", NULL); 
  +}
  +else
  +jk_putv(s, "req_uri, "?cmd=show&w=",
  +sw->we->worker_list[i], "\">", NULL); 
   jk_putv(s, sw->we->worker_list[i], "\n", NULL);
   if (lb != NULL) {
   unsigned int j;
  @@ -338,17 +343,19 @@
   jk_puts(s, "\n\n");
   jk_puts(s, "s->name, "\">\n\n", NULL);
  +jk_putv(s, "value=\"", wr->s->name, "\">\n", NULL);
  +jk_puts(s, "\n\n", selected);
   
  -jk_puts(s, "\nLoad factor:\nLoad factor:\n", wr->s->lb_factor);  
  
  -jk_puts(s, "Route Redirect:Route Redirect:s->redirect, NULL); 
   jk_puts(s, "\">\n");
  -jk_puts(s, "Cluster Domain:Cluster Domain:s->domain, NULL); 
  -jk_puts(s, "\">\n");
  -jk_puts(s, "Disabled:\n");
  +jk_puts(s, "Disabled:s->is_disabled)
   jk_puts(s, " checked");
   jk_puts(s, ">\n");
  @@ -358,6 +365,38 @@
   jk_puts(s, "\n\n\n");
   
   }
  +else if (dworker && strcmp(dworker, sw->we->worker_list[i]) == 
0) {
  +/* Edit Load balancer settings */
  +jk_putv(s, "Edit Load balancer settings for ",
  +dworker, "\n", NULL);
  +jk_putv(s, "req_uri, "\">\n", NULL);
  +jk_puts(s, "\n\n");
  +jk_puts(s, "\n", NULL);
  +jk_puts(s, "\n\n", i);
  +
  +jk_puts(s, "\nRetries :\n", lb->s->retries);

  +jk_puts(s, "Recover time :\n", 
lb->s->recover_wait_time);
  +jk_puts(s, "Sticky session:s->sticky_session)
  +jk_puts(s, " checked");
  +jk_puts(s, ">\n");
  +jk_puts(s, "Force Sticky session:s->sticky_session_force)
  +jk_puts(s, " checked");
  +jk_puts(s, ">\n");
  +
  +/* TODO: display uri mappings with checkbox for disable */
  +
  +jk_puts(s, " \n");
  +jk_puts(s, "");
  +jk_puts(s, "\n\n\n");
  +}
   }
   else {
   jk_puts(s, "\n\n"
  @@ -369,6 +408,7 @@
   jk_putv(s, "", jk_dump_hinfo(&aw->worker_inet_addr, buf),
   "\n\n", NULL);
   jk_puts(s, "\n");
  +
   }
   }
   /* Display legend */
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_shm.c

2005-02-15 Thread mturk

mturk   2005/02/15 03:41:26

  Modified:jk/native/common jk_shm.c
  Log:
  Log memory mapped base address.
  
  Revision  ChangesPath
  1.13  +11 -9 jakarta-tomcat-connectors/jk/native/common/jk_shm.c
  
  Index: jk_shm.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_shm.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- jk_shm.c  14 Feb 2005 09:44:36 -  1.12
  +++ jk_shm.c  15 Feb 2005 11:41:26 -  1.13
  @@ -88,8 +88,8 @@
   JK_INIT_CS(&(jk_shmem.cs), rc);
   if (JK_IS_DEBUG_LEVEL(l))
   jk_log(l, JK_LOG_DEBUG,
  -   "Initialized shared memory size=%u free=%u",
  -   jk_shmem.size, jk_shmem.hdr->size);
  +   "Initialized shared memory size=%u free=%u addr=%#lx",
  +   jk_shmem.size, jk_shmem.hdr->size, jk_shmem.hdr);
   JK_TRACE_EXIT(l);
   return 0;
   }
  @@ -102,9 +102,10 @@
   jk_shmem.hdr->childs++;
   if (JK_IS_DEBUG_LEVEL(l))
   jk_log(l, JK_LOG_DEBUG,
  -   "Attached shared memory [%d] size=%u free=%u",
  +   "Attached shared memory [%d] size=%u free=%u addr=%#lx",
  jk_shmem.hdr->childs, jk_shmem.hdr->size,
  -   jk_shmem.hdr->size - jk_shmem.hdr->pos);
  +   jk_shmem.hdr->size - jk_shmem.hdr->pos,
  +   jk_shmem.hdr);
   JK_TRACE_EXIT(l);
   return 0;
   }
  @@ -267,16 +268,17 @@
   jk_shmem.hdr->size = JK_SHM_SIZE;
   if (JK_IS_DEBUG_LEVEL(l))
   jk_log(l, JK_LOG_DEBUG,
  -   "Initialized shared memory size=%u free=%u",
  -   jk_shmem.size, jk_shmem.hdr->size);
  +   "Initialized shared memory size=%u free=%u addr=%#lx",
  +   jk_shmem.size, jk_shmem.hdr->size, jk_shmem.hdr);
   }
   else {
   jk_shmem.hdr->childs++;
   if (JK_IS_DEBUG_LEVEL(l))
   jk_log(l, JK_LOG_INFO,
  -   "Attached shared memory [%d] size=%u free=%u",
  +   "Attached shared memory [%d] size=%u free=%u addr=%#lx",
  jk_shmem.hdr->childs, jk_shmem.hdr->size,
  -   jk_shmem.hdr->size - jk_shmem.hdr->pos);
  +   jk_shmem.hdr->size - jk_shmem.hdr->pos,
  +   jk_shmem.hdr);
   /* TODO: check header magic */
   }
   JK_INIT_CS(&(jk_shmem.cs), rc);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_global.h

2005-02-15 Thread mturk

mturk   2005/02/15 03:40:00

  Modified:jk/native/common jk_global.h
  Log:
  Use more accurate windows headers. No need to include GUI, thus
  use WIN32_LEAN_AND_MEAN.
  
  Revision  ChangesPath
  1.42  +34 -7 jakarta-tomcat-connectors/jk/native/common/jk_global.h
  
  Index: jk_global.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_global.h,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- jk_global.h   15 Feb 2005 09:21:42 -  1.41
  +++ jk_global.h   15 Feb 2005 11:40:00 -  1.42
  @@ -35,6 +35,11 @@
   
   #include "jk_version.h"
   
  +#ifdef HAVE_APR
  +#include "apr_lib.h"
  +#include "apr_strings.h"
  +#endif
  +
   #include 
   #include 
   #include 
  @@ -47,11 +52,6 @@
   #include "ap_config.h"
   #endif
   
  -#ifdef HAVE_APR
  -#include "apr_lib.h"
  -#include "apr_strings.h"
  -#endif
  -
   #ifdef AS400
   #include "ap_config.h"
   extern char *strdup(const char *str);
  @@ -61,8 +61,35 @@
   #include 
   
   #ifdef WIN32
  -#include 
  -#include 
  +#ifndef _WINDOWS_

  +#ifndef WIN32_LEAN_AND_MEAN

  +#define WIN32_LEAN_AND_MEAN

  +#endif

  +#ifndef _WIN32_WINNT

  +

  +/* Restrict the server to a subset of Windows NT 4.0 header files by default

  + */

  +#define _WIN32_WINNT 0x0400

  +#endif

  +#ifndef NOUSER

  +#define NOUSER

  +#endif

  +#ifndef NOMCX

  +#define NOMCX

  +#endif

  +#ifndef NOIME

  +#define NOIME

  +#endif

  +#include 

  +/* 

  + * Add a _very_few_ declarations missing from the restricted set of headers

  + * (If this list becomes extensive, re-enable the required headers above!)

  + * winsock headers were excluded by WIN32_LEAN_AND_MEAN, so include them now

  + */

  +#include 

  +#include 

  +#include 
  +#endif
   #include 
   #include 
   #else
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33494] - jscv configure script fails on x86_64

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33494





--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 12:37 ---
*** Bug 33584 has been marked as a duplicate of this bug. ***

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33584] - jscv configure script fails on x86_64

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33584


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||DUPLICATE




--- Additional Comments From [EMAIL PROTECTED]  2005-02-15 12:37 ---


*** This bug has been marked as a duplicate of 33494 ***

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 32480] - "Unterminated tag" if opening taglib tag is from an include file

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=32480


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||INVALID




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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Some Compiler Error with mod_jk Windows

2005-02-15 Thread Mladen Turk

Peter Rossbach wrote:
Hello Mladen,
now I have update to Apache 5.0.53, but the failure changed a little bit :
What Platform SDK are you using?
Apache 2.0.53 requires PSDK from February 2003.
Think that even VC6 SP6 resolves that
Those message are related to old winsock headers.
Mladen.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33584] New: - jscv configure script fails on x86_64

2005-02-15 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33584

   Summary: jscv configure script fails on x86_64
   Product: Tomcat 5
   Version: 5.5.7
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Unknown
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


I have dual AMD Opteron server with Fedora Core 3.

configure script fails with: "configure: error: Unsupported CPU architecture
"x86_64".

I maneged to pass this by inserting:
 x86_64)
CFLAGS="$CFLAGS -DCPU=\\\"k8\\\"" ;;

at line 2636 in configure script.

It is obvious that this solution works only for AMD 64 bit. So please add
support for 64 bit processors.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Some Compiler Error with mod_jk Windows

2005-02-15 Thread Peter Rossbach

Hello Mladen,
now I have update to Apache 5.0.53, but the failure changed a little bit :
D:\tomcat\jakarta-tomcat-connectors\jk\native\apache-2.0>MSDE
V mod_jk.dsp /MAKE ALL
Konfiguration: apache - Win32 Debug
Kompilierung läuft...
jk_ajp12_worker.c
jk_ajp13.c
jk_ajp13_worker.c
jk_ajp14.c
jk_ajp14_worker.c
jk_ajp_common.c
D:\tomcat\akarta-tomcat-connectors\jk\native\common\jk_ajp_c
ommon.c(756) : warning C4018: '==' : Konflikt zwischen signed und unsigned
D:\tomcat\jakarta-tomcat-connectors\jk\native\common\jk_ajp_c
ommon.c(757) : warning C4018: '==' : Konflikt zwischen signed und unsigned
jk_connect.c
jk_context.c
jk_jni_worker.c
jk_lb_worker.c
jk_map.c
jk_md5.c
jk_msg_buff.c
jk_pool.c
jk_shm.c
jk_sockbuf.c
jk_status.c
jk_uri_worker_map.c
jk_util.c
jk_worker.c
Generieren von Code...
Kompilieren...
mod_jk.c
Generieren von Code...
Linker-Vorgang läuft...
  Bibliothek Debug/mod_jk.lib und Objekt Debug/mod_jk.exp wird erstellt
Regards
Peter
Mladen Turk schrieb:
Peter Rossbach wrote:
Morning Mladen,
I checkout the news Tomcat 5.5 head and can't compile mod_jk today.
Yesterday morning it works great
Use Windows XP
MSDEV 6.0
Apache 2.0.49
Fixed, thanks.
Also I would suggest that you use more recent apaches for Windows.
Pre 2.0.52 have bugs with transmitfile if you have third party
winsock, like firewalls etc.
Regards,
Mladen
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml

2005-02-15 Thread pero

pero2005/02/15 01:58:06

  Modified:webapps/docs changelog.xml
  Log:
  Fix my tabs and replace with spaces :-(
  
  Revision  ChangesPath
  1.235 +8 -8  jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.234
  retrieving revision 1.235
  diff -u -r1.234 -r1.235
  --- changelog.xml 15 Feb 2005 09:42:34 -  1.234
  +++ changelog.xml 15 Feb 2005 09:58:06 -  1.235
  @@ -155,18 +155,18 @@
  
  
 Support optional primaryIndicator at ReplicationValve to mark that 
  -   request processing to existing session is at primary cluster 
node. 
  -   Easy failover detection, when mark is not at 
  -   configurable primaryIndicator attribute, submitted by Rainer 
Jung (pero)
  +  request processing to existing session is at primary cluster node. 
  +  Easy failover detection, when mark is not at 
  +  configurable primaryIndicator attribute, submitted by Rainer Jung 
(pero)
  
  
 Refactor all implementation from interface IDataSenders (pero)
  -
  -
  -   Add some usefull attributes and operations to the all sender 
MBeans. (pero)
  +   
  +  
  +  Add some usefull attributes and operations to the all sender 
MBeans. (pero)
  
  -
  -   Add keepAlive and waitForAck handling to AsyncSocketSender 
and factor out a DataSender base class.(pero)
  +  
  +  Add keepAlive and waitForAck handling to AsyncSocketSender and 
factor out a DataSender base class.(pero)
  
  
 ReplicationTransmitter: Enable and Disable autoreconnect sender 
and waitForAck. (pero)
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml

2005-02-15 Thread pero

pero2005/02/15 01:42:35

  Modified:webapps/docs changelog.xml
  Log:
  Refactor all IDataSender and factor out a base class
  Add more MBeans attributes and operation
  Add some statistics attributes
  i18n support to senders
  Add KeepAlive and Ack Handling to AsyncSocketSender
  Add dynamic property handling to replicationtransmitter to transfer 
attributes to senders
  Fix some StoreConfig bugs
  Add ReplicationTransmitter dynamic property handling to StoreConfig.
  
  Revision  ChangesPath
  1.234 +25 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.233
  retrieving revision 1.234
  diff -u -r1.233 -r1.234
  --- changelog.xml 11 Feb 2005 19:47:45 -  1.233
  +++ changelog.xml 15 Feb 2005 09:42:34 -  1.234
  @@ -102,6 +102,15 @@
33368: Fix memory leak in swallowOutput feature which 
occurred when the thread pool size is
reduced, submitted by Rainer Jung. (remm)
 
  +   
  +  StoreConfig: can't save cluster Membership element (pero)
  +   
  +   
  +  StoreConfig: suppress default jkHome attribute at connector  (pero)
  +  
  +   
  +  StoreConfig: Save new dymanic properties from 
ReplicationTransmitter  (pero)
  +  
   
 
 
  @@ -142,7 +151,7 @@
 Add instance based ReplicationValve statistics to Mbean descriptor 
(pero)
  
  
  -  Better I18N support to Cluster Session classes (pero)
  +  Better I18N support to cluster session and tcp classes (pero)
  
  
 Support optional primaryIndicator at ReplicationValve to mark that 
  @@ -150,6 +159,21 @@
  Easy failover detection, when mark is not at 
  configurable primaryIndicator attribute, submitted by Rainer 
Jung (pero)
  
  +   
  +  Refactor all implementation from interface IDataSenders (pero)
  +
  +
  +   Add some usefull attributes and operations to the all sender 
MBeans. (pero)
  +   
  +
  +   Add keepAlive and waitForAck handling to AsyncSocketSender 
and factor out a DataSender base class.(pero)
  +   
  +   
  +  ReplicationTransmitter: Enable and Disable autoreconnect sender 
and waitForAck. (pero)
  +   
  +   
  +  ReplicationTransmitter: transfer all properties to socket sender 
from server.xml configuration. (pero)
  +   
   
 
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: ..and on a positive note, NetWare builds fine... on 2.x

2005-02-15 Thread Mladen Turk

NormW wrote:
Greetings All..
The 'target' keeps moving, but as of three minutes ago NetWare was 
building fine for Mod_Jk for AP 2.0.53 and 2.1. Still to resolve 1.3 AFAIK.

Cool ;)
I'm finishing the dynamic status and configuration,
and since this require some internal API changes, please
give me couple of days to finish (by the end of this week).
Then, we'll resolve all those compile warnings/errors.
It's a work in progress, thus do not expect even to build
in the mean time :).
Regards,
Mladen.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/modules/storeconfig/test/src/share/org/apache/catalina/storeconfig StoreAppenderTest.java StoreLoaderTest.java

2005-02-15 Thread pero

pero2005/02/15 01:36:58

  Modified:
modules/storeconfig/test/src/share/org/apache/catalina/storeconfig
StoreAppenderTest.java StoreLoaderTest.java
  Log:
  Add ReplicationTransmitter test
  
  Revision  ChangesPath
  1.2   +17 -2 
jakarta-tomcat-catalina/modules/storeconfig/test/src/share/org/apache/catalina/storeconfig/StoreAppenderTest.java
  
  Index: StoreAppenderTest.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/storeconfig/test/src/share/org/apache/catalina/storeconfig/StoreAppenderTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StoreAppenderTest.java8 Jan 2005 11:14:08 -   1.1
  +++ StoreAppenderTest.java15 Feb 2005 09:36:58 -  1.2
  @@ -22,11 +22,10 @@
   
   import junit.framework.TestCase;
   
  +import org.apache.catalina.cluster.tcp.ReplicationTransmitter;
   import org.apache.catalina.core.StandardServer;
   import org.apache.catalina.deploy.ContextResource;
   import org.apache.catalina.startup.SetAllPropertiesRule;
  -import org.apache.catalina.storeconfig.StoreAppender;
  -import org.apache.catalina.storeconfig.StoreDescription;
   import org.apache.tomcat.util.digester.Digester;
   import org.xml.sax.SAXException;
   
  @@ -73,4 +72,20 @@
   new StoreAppender().printAttributes(writer, 0, true, bean, desc);
   }
   
  +public void testStoreReplicationTransmitter() throws Exception {
  +StoreDescription desc = new StoreDescription();
  +desc.setStandard(true);
  +StringWriter swriter = new StringWriter();
  +PrintWriter writer = new PrintWriter(swriter);
  +ReplicationTransmitter bean = new ReplicationTransmitter();
  +bean.setReplicationMode("asynchronous");
  +bean.setProperty("keepAliveTimeout","8");
  +new ReplicationTransmitterStoreAppender().printAttributes(writer, 0, 
true, bean, desc);
  +String aspectedResult =LF.LINE_SEPARATOR   
  +   + "replicationMode=\"asynchronous\"" + LF.LINE_SEPARATOR 
  +   + "keepAliveTimeout=\"8\"" ;
  +assertEquals(aspectedResult, swriter.getBuffer().toString());
  +
  +}
  +
   }
  \ No newline at end of file
  
  
  
  1.2   +9 -0  
jakarta-tomcat-catalina/modules/storeconfig/test/src/share/org/apache/catalina/storeconfig/StoreLoaderTest.java
  
  Index: StoreLoaderTest.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/storeconfig/test/src/share/org/apache/catalina/storeconfig/StoreLoaderTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StoreLoaderTest.java  8 Jan 2005 11:14:08 -   1.1
  +++ StoreLoaderTest.java  15 Feb 2005 09:36:58 -  1.2
  @@ -20,6 +20,7 @@
   
   import junit.framework.TestCase;
   
  +import org.apache.catalina.cluster.tcp.ReplicationTransmitter;
   import org.apache.catalina.core.StandardContext;
   import org.apache.catalina.core.StandardServer;
   import org.apache.catalina.mbeans.ServerLifecycleListener;
  @@ -75,5 +76,13 @@
   
.findDescription("org.apache.catalina.core.StandardServer.[ServerLifecycleListener]");
   assertEquals(ServerLifecycleListener.class.getName(), desc
   .getTagClass());
  +desc = registry.findDescription(ReplicationTransmitter.class);
  +assertNotNull(desc);
  +assertEquals(ReplicationTransmitter.class.getName(), desc
  +.getTagClass());
  +assertNotNull(desc.getStoreFactory());
  +assertEquals(ReplicationTransmitterStoreAppender.class, 
desc.getStoreFactory().getStoreAppender().getClass()
  +);
  +
   }
   }
  \ No newline at end of file
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/modules/storeconfig/src/share/org/apache/catalina/storeconfig server-registry.xml

2005-02-15 Thread pero

pero2005/02/15 01:36:13

  Modified:modules/storeconfig/src/share/org/apache/catalina/storeconfig
server-registry.xml
  Log:
  Add spezial case ReplicationTransmitter StoreAppender
  Fix some typos
  Fix MembershipService bug
  
  Revision  ChangesPath
  1.3   +11 -3 
jakarta-tomcat-catalina/modules/storeconfig/src/share/org/apache/catalina/storeconfig/server-registry.xml
  
  Index: server-registry.xml
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/storeconfig/src/share/org/apache/catalina/storeconfig/server-registry.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- server-registry.xml   11 Jan 2005 20:02:13 -  1.2
  +++ server-registry.xml   15 Feb 2005 09:36:12 -  1.3
  @@ -78,7 +78,7 @@
   tagClass="org.apache.catalina.connector.Connector"
   childs="true"
   storeFactoryClass="org.apache.catalina.storeconfig.ConnectorSF"
  -
storeWriterClass="org.apache.catalina.storeconfig.ConnectorStoreAppender">
  +
storeAppenderClass="org.apache.catalina.storeconfig.ConnectorStoreAppender">
maxProcessor
minProcessor

  @@ -295,6 +295,14 @@
tag="Sender"
standard="false"
default="false" 
  + 
tagClass="org.apache.catalina.cluster.tcp.ReplicationTransmitter"
  +storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase"
  +
storeAppenderClass="org.apache.catalina.storeconfig.ReplicationTransmitterStoreAppender">
  + 
  + 

  @@ -308,8 +316,8 @@

cvs commit: jakarta-tomcat-catalina/modules/storeconfig/src/share/org/apache/catalina/storeconfig ConnectorStoreAppender.java

2005-02-15 Thread pero

pero2005/02/15 01:35:22

  Modified:modules/storeconfig/src/share/org/apache/catalina/storeconfig
ConnectorStoreAppender.java
  Log:
  add remove default jkHome handing
  
  Revision  ChangesPath
  1.2   +55 -0 
jakarta-tomcat-catalina/modules/storeconfig/src/share/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
  
  Index: ConnectorStoreAppender.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/storeconfig/src/share/org/apache/catalina/storeconfig/ConnectorStoreAppender.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConnectorStoreAppender.java   8 Jan 2005 11:14:07 -   1.1
  +++ ConnectorStoreAppender.java   15 Feb 2005 09:35:22 -  1.2
  @@ -19,13 +19,18 @@
   import java.beans.IntrospectionException;
   import java.beans.Introspector;
   import java.beans.PropertyDescriptor;
  +import java.io.File;
  +import java.io.IOException;
   import java.io.PrintWriter;
   import java.util.ArrayList;
   import java.util.HashMap;
   import java.util.Iterator;
   import java.util.List;
   
  +import org.apache.catalina.Container;
   import org.apache.catalina.connector.Connector;
  +import org.apache.catalina.core.StandardContext;
  +import org.apache.catalina.core.StandardHost;
   import org.apache.coyote.ProtocolHandler;
   import org.apache.tomcat.util.IntrospectionUtils;
   
  @@ -223,5 +228,55 @@
   }
   super.printValue(writer, indent, repl, value);
   }
  +
  +/*
  + * Print Context Values.  Spezial handling to default workDir.
  + *  Don't save path at external context.xml  Don't
  + * generate docBase for host.appBase webapps 
  + * 
  + * @see 
org.apache.catalina.config.StoreAppender#isPrintValue(java.lang.Object,
  + *  java.lang.Object, java.lang.String,
  + *  org.apache.catalina.config.StoreDescription)
  + */
  +public boolean isPrintValue(Object bean, Object bean2, String attrName,
  +StoreDescription desc) {
  +boolean isPrint = super.isPrintValue(bean, bean2, attrName, desc);
  +if (isPrint) {
  +if ("jkHome".equals(attrName)) {
  +Connector connector = ((Connector) bean);
  +File catalinaBase = getCatalinaBase();
  +File jkHomeBase = getJkHomeBase((String) connector
  +.getProperty("jkHome"), catalinaBase);
  +isPrint = !catalinaBase.equals(jkHomeBase);
  +
  +}
  +}
  +return isPrint;
  +}
  +
  +protected File getCatalinaBase() {
  +
  +File appBase;
  +File file = new File(System.getProperty("catalina.base"));
  +try {
  +file = file.getCanonicalFile();
  +} catch (IOException e) {
  +}
  +return (file);
  +}
  +
  +protected File getJkHomeBase(String jkHome, File appBase) {
  +
  +File jkHomeBase;
  +File file = new File(jkHome);
  +if (!file.isAbsolute())
  +file = new File(appBase, jkHome);
  +try {
  +jkHomeBase = file.getCanonicalFile();
  +} catch (IOException e) {
  +jkHomeBase = file;
  +}
  +return (jkHomeBase);
  +}
   
   }
  \ No newline at end of file
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/modules/storeconfig/src/share/org/apache/catalina/storeconfig ReplicationTransmitterStoreAppender.java

2005-02-15 Thread pero

pero2005/02/15 01:34:48

  Added:   modules/storeconfig/src/share/org/apache/catalina/storeconfig
ReplicationTransmitterStoreAppender.java
  Log:
  add for ReplicationTransmitter dynamic porperty handing
  
  Revision  ChangesPath
  1.1  
jakarta-tomcat-catalina/modules/storeconfig/src/share/org/apache/catalina/storeconfig/ReplicationTransmitterStoreAppender.java
  
  Index: ReplicationTransmitterStoreAppender.java
  ===
  /**
   * Copyright 1999-2001,2004 The Apache Software Foundation.
   * 
   * Licensed 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 org.apache.catalina.storeconfig;
  
  import java.beans.IndexedPropertyDescriptor;
  import java.beans.IntrospectionException;
  import java.beans.Introspector;
  import java.beans.PropertyDescriptor;
  import java.io.PrintWriter;
  import java.util.ArrayList;
  import java.util.Iterator;
  import java.util.List;
  
  import org.apache.catalina.cluster.tcp.ReplicationTransmitter;
  import org.apache.tomcat.util.IntrospectionUtils;
  
  /**
   * Store the ReplicationTransmitter attributes. 
   * 
   * @author Peter Rossbach
   *  
   */
  public class ReplicationTransmitterStoreAppender extends StoreAppender {
  
  /**
   * Store the relevant attributes of the specified JavaBean.
   * 
   * @param writer
   *PrintWriter to which we are storing
   * @param include
   *Should we include a className attribute?
   * @param bean
   *Bean whose properties are to be rendered as attributes,
   * @param desc
   *RegistryDescrpitor from this bean
   * 
   * @exception Exception
   *if an exception occurs while storing
   */
  public void printAttributes(PrintWriter writer, int indent,
  boolean include, Object bean, StoreDescription desc)
  throws Exception {
  
  // Render the relevant properties of this bean
  String className = bean.getClass().getName();
  
  // Render a className attribute if requested
  if (include && desc != null && !desc.isStandard()) {
  writer.print(" className=\"");
  writer.print(bean.getClass().getName());
  writer.print("\"");
  }
  
  List propertyKeys = getPropertyKeys((ReplicationTransmitter) bean);
  // Create blank instance
  Object bean2 = defaultInstance(bean);
  for (Iterator propertyIterator = propertyKeys.iterator(); 
propertyIterator
  .hasNext();) {
  String key = (String) propertyIterator.next();
  Object value = (Object) IntrospectionUtils.getProperty(bean, key);
  
  if (desc.isTransientAttribute(key)) {
  continue; // Skip the specified exceptions
  }
  if (value == null) {
  continue; // Null values are not persisted
  }
  if (!isPersistable(value.getClass())) {
  continue;
  }
  Object value2 = IntrospectionUtils.getProperty(bean2, key);
  if (value.equals(value2)) {
  // The property has its default value
  continue;
  }
  if (isPrintValue(bean, bean2, key, desc))
  printValue(writer, indent, key, value);
  }
  }
  
  /**
   * Get all properties from ReplicationTransmitter (also dynamic 
properties)
   * 
   * @param bean
   * @return List of Connector Properties
   * @throws IntrospectionException
   */
  protected List getPropertyKeys(ReplicationTransmitter bean)
  throws IntrospectionException {
  ArrayList propertyKeys = new ArrayList();
  // Acquire the list of properties for this bean
  PropertyDescriptor descriptors[] = Introspector.getBeanInfo(
  bean.getClass()).getPropertyDescriptors();
  if (descriptors == null) {
  descriptors = new PropertyDescriptor[0];
  }
  for (int i = 0; i < descriptors.length; i++) {
  if (descriptors[i] instanceof IndexedPropertyDescriptor) {
  continue; // Indexed properties are not persisted
  }
  if (!isPersistable(descriptors[i].getPropertyType())

cvs commit: jakarta-tomcat-catalina/modules/cluster build.xml

2005-02-15 Thread pero

pero2005/02/15 01:33:29

  Modified:modules/cluster build.xml
  Log:
  i18n support
  
  Revision  ChangesPath
  1.13  +2 -0  jakarta-tomcat-catalina/modules/cluster/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/build.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.xml 11 Feb 2005 19:45:44 -  1.12
  +++ build.xml 15 Feb 2005 09:33:29 -  1.13
  @@ -88,6 +88,8 @@
  
tofile="${catalina.build}/classes/org/apache/catalina/cluster/LocalStrings.properties"/>
   
  +

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp mbeans-descriptors.xml

2005-02-15 Thread pero

pero2005/02/15 01:33:05

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/tcp
mbeans-descriptors.xml
  Log:
  Add more MBeans attributes and operation
  Add some statistics attributes
  
  Revision  ChangesPath
  1.3   +178 -16   
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml
  
  Index: mbeans-descriptors.xml
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mbeans-descriptors.xml11 Feb 2005 19:45:18 -  1.2
  +++ mbeans-descriptors.xml15 Feb 2005 09:33:05 -  1.3
  @@ -74,6 +74,15 @@
   
  +
  +
   
  -
  +
   
  -
  -
  +
   
   
  + 
  + 
 
   
 
  -
  +
   
  +
   
  @@ -120,6 +144,24 @@
writeable="false"
 description="queue size"
type="int"/>
  +
  +
  +
  +
  +
   
  +
  +
  +  
  +
  +
  +
  +
  +
  + 
  +
  + 
  +
  + 
  +
  + 
  +
  +  
 
   
 
  -
  -
   
  +
   
  @@ -165,14 +263,6 @@
   
  -
  -
   
  +
  +
  + 
  +
  + 
  +
  + 
  +
  +  
 
   
 
  -
  -
   
  +
   
  @@ -239,6 +356,51 @@
 description="number of bytes transfered"
type="long"
writeable="false"/>
  +
  +
  +
  +  
  +
  +
  + 
  +
  + 
  +
  + 
  +
  + 
  +
  +

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp ReplicationTransmitter.java

2005-02-15 Thread pero

pero2005/02/15 01:32:39

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/tcp
ReplicationTransmitter.java
  Log:
  Add dynamic property handling to replicationtransmitter to transfer 
attributes to senders
  Add autoReconnect and WaitForAck handling
  
  Revision  ChangesPath
  1.21  +157 -6
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java
  
  Index: ReplicationTransmitter.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- ReplicationTransmitter.java   27 Dec 2004 09:30:36 -  1.20
  +++ ReplicationTransmitter.java   15 Feb 2005 09:32:39 -  1.21
  @@ -16,7 +16,9 @@
   
   package org.apache.catalina.cluster.tcp;
   
  +import java.util.HashMap;
   import java.util.Iterator;
  +import java.util.Map;
   
   import javax.management.MBeanServer;
   import javax.management.ObjectName;
  @@ -26,12 +28,25 @@
   import org.apache.catalina.cluster.Member;
   import org.apache.catalina.cluster.io.XByteBuffer;
   import org.apache.catalina.util.StringManager;
  +import org.apache.tomcat.util.IntrospectionUtils;
   
  +
  +/**
  + * @author Peter Rossbach
  + * @author Filip Hanik
  + * @version 1.2
  + * 
  + */
   public class ReplicationTransmitter implements ClusterSender {
   private static org.apache.commons.logging.Log log = 
org.apache.commons.logging.LogFactory
   .getLog(ReplicationTransmitter.class);
   
   /**
  + * The descriptive information about this implementation.
  + */
  +private static final String info = "ReplicationTransmitter/1.2";
  +
  +/**
* The string manager for this package.
*/
   protected StringManager sm = StringManager.getManager(Constants.Package);
  @@ -49,10 +64,31 @@
   
   private long ackTimeout = 15000; //15 seconds by default
   
  +private boolean waitForAck = true ;
  +
   private SimpleTcpCluster cluster;
   
   private ObjectName objectName;
   
  +private boolean autoConnect = true ;
  +
  +private Map properties = new HashMap();
  +
  +private long failureCounter = 0 ;
  +
  +// - 
Properties
  +
  +/**
  + * Return descriptive information about this implementation and the
  + * corresponding version number, in the format
  + * /.
  + */
  +public String getInfo() {
  +
  +return (info);
  +
  +}
  +
   private synchronized void addStats(int length) {
   nrOfRequests++;
   totalBytes += length;
  @@ -64,6 +100,16 @@
   }
   
   }
  +
  +/*
  + * Reset sender statistics
  + */
  +public synchronized void resetStatistics() {
  +nrOfRequests = 0;
  +totalBytes = 0;
  +failureCounter = 0;
  +}
  +
   /**
* @return Returns the nrOfRequests.
*/
  @@ -88,13 +134,14 @@
   throw new IllegalArgumentException(msg);
   
   }
  -
  +
   public synchronized void add(Member member) {
   try {
   String key = getKey(member);
   if (!map.containsKey(key)) {
   IDataSender sender = IDataSenderFactory.getIDataSender(
   replicationMode, member);
  +transferSenderProperty(sender);
   map.put(key, sender);
   registerSenderMBean(member, sender);
   }
  @@ -103,7 +150,19 @@
   }
   }//add
   
  -private String getKey(Member member) {
  +/**
  + * Transfer all properties from transmitter to concrete sender
  + * @param sender
  + */
  +protected void transferSenderProperty(IDataSender sender) {
  +for (Iterator iter = getPropertyNames(); iter.hasNext();) {
  +String pkey = (String) iter.next();
  +Object value = getProperty(pkey);
  +IntrospectionUtils.setProperty(sender, pkey, value.toString());  
  
  +}
  +}
  +
  +protected String getKey(Member member) {
   return member.getHost() + ":" + member.getPort();
   }
   
  @@ -234,16 +293,28 @@
   return result;
   }
   
  +/**
  + * Send message to concrete sender. If autoConnect is true, check is 
connection broken 
  + * and the reconnect the complete sender.
  + * 
  + * failure the suspect flag is set true. After successfully
  + * sending the suspect flag is set to false.
  + * Stats is only update after sussesfull sending
  + * 
  + * 
  + * @param sessionId Unique Message Id
  + * @param data message Data
  + * @par

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp DataSender.java AsyncSocketSender.java IDataSender.java PooledSocketSender.java ReplicationListener.java SimpleTcpCluster.java SocketSender.java TcpReplicationThread.java

2005-02-15 Thread pero

pero2005/02/15 01:31:46

  Modified:modules/cluster/src/share/org/apache/catalina/cluster
ClusterReceiver.java ClusterSender.java
   modules/cluster/src/share/org/apache/catalina/cluster/tcp
AsyncSocketSender.java IDataSender.java
PooledSocketSender.java ReplicationListener.java
SimpleTcpCluster.java SocketSender.java
TcpReplicationThread.java
  Added:   modules/cluster/src/share/org/apache/catalina/cluster/tcp
DataSender.java
  Log:
  Refactor all IDataSender and factor out a base class
  Add some statistics attributes
  i18n support to senders
  Add KeepAlive and Ack Handling to AsyncSocketSender
  
  Revision  ChangesPath
  1.3   +9 -2  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/ClusterReceiver.java
  
  Index: ClusterReceiver.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/ClusterReceiver.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ClusterReceiver.java  27 Feb 2004 14:58:55 -  1.2
  +++ ClusterReceiver.java  15 Feb 2005 09:31:45 -  1.3
  @@ -17,7 +17,13 @@
   package org.apache.catalina.cluster;
   
   
  -
  +/**
  + * 
  + * @author Filip Hanik
  + * @author Peter Rossbach
  + * @version 1.1
  + *
  + */
   public interface ClusterReceiver
   {
   
  @@ -27,7 +33,8 @@
   
   public void setCatalinaCluster(CatalinaCluster cluster);
   
  -public void setIsSenderSynchronized(boolean isSenderSynchronized);
  +public boolean isWaitForAck();
  +public void setWaitForAck(boolean isWaitForAck);
   
   public String getHost();
   
  
  
  
  1.4   +9 -2  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/ClusterSender.java
  
  Index: ClusterSender.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/ClusterSender.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ClusterSender.java27 Dec 2004 09:30:36 -  1.3
  +++ ClusterSender.java15 Feb 2005 09:31:45 -  1.4
  @@ -19,7 +19,13 @@
   import org.apache.catalina.cluster.tcp.SimpleTcpCluster;
   
   
  -
  +/**
  + * 
  + * @author Filip Hanik
  + * @author Peter Rossbach
  + * @version 1.1
  + *
  + */
   public interface ClusterSender
   {
   
  @@ -35,7 +41,8 @@
   
   public void sendMessage(String messageId, byte[] indata) throws 
java.io.IOException;
   
  -public boolean getIsSenderSynchronized();
  +public boolean isWaitForAck();
  +public void setWaitForAck(boolean isWaitForAck);
   
   /**
* @param cluster
  
  
  
  1.10  +157 -105  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/AsyncSocketSender.java
  
  Index: AsyncSocketSender.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/AsyncSocketSender.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AsyncSocketSender.java27 Dec 2004 09:30:36 -  1.9
  +++ AsyncSocketSender.java15 Feb 2005 09:31:45 -  1.10
  @@ -17,173 +17,215 @@
   package org.apache.catalina.cluster.tcp;
   
   import java.net.InetAddress;
  -import java.net.Socket;
  +
   import org.apache.catalina.cluster.util.SmartQueue;
   
   /**
  - * Send cluster messages from a Message queue with only one socket.
  + * Send cluster messages from a Message queue with only one socket. Ack and 
keep
  + * Alive Handling is supported.
  + * 
  + * With autoConnect=false at ReplicationTransmitter, you can disconnect 
the
  + * sender and all messages are queued. Only use this for small maintaince
  + * isuses!
  + * waitForAck=true, means that receiver ack the transfer
  + * after one minute idle time, or number of request (100) the connection 
is
  + * reconnected with next request. Change this for production use!
  + * default ackTimeout is 15 sec: this is very low for big all session 
replication messages after restart a node
  + * disable keepAlive: keepAliveTimeout="-1" and 
keepAliveMaxRequestCount="-1"
  + * 
* 
* @author Filip Hanik
* @author Peter Rossbach
  - * @version 1.1
  + * @version 1.2
*/
  -public class AsyncSocketSender implements IDataSender {
  +public class AsyncSocketSender extends DataSender {
  +
   private static int threadCounter = 1;
   
   private static org.apache.commons.logging.Log log = 
org.apache.commons.logging.LogFactory
   .getLog(AsyncSocketSender.clas

..and on a positive note, NetWare builds fine... on 2.x

2005-02-15 Thread NormW

Greetings All..
The 'target' keeps moving, but as of three minutes ago NetWare was 
building fine for Mod_Jk for AP 2.0.53 and 2.1. Still to resolve 1.3 AFAIK.

Regards,
Norm
PS. Are some docs any time soon in the 'development' phase?
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp Constants.java LocalStrings.properties

2005-02-15 Thread pero

pero2005/02/15 01:26:19

  Added:   modules/cluster/src/share/org/apache/catalina/cluster/tcp
Constants.java LocalStrings.properties
  Log:
  Start i18n support for o.a.c.cluster.tcp package
  
  Revision  ChangesPath
  1.1  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/Constants.java
  
  Index: Constants.java
  ===
  /*
   * Copyright 1999,2004 The Apache Software Foundation.
   * 
   * Licensed 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 org.apache.catalina.cluster.tcp;
  
  /**
   * Manifest constants for the org.apache.catalina.cluster.tcp
   * package.
   *
   * @author Peter Rossbach
   */
  
  public class Constants {
  
  public static final String Package = "org.apache.catalina.cluster.tcp";
  
  }
  
  
  
  1.1  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===
  AsyncSocketSender.create.thread=Create sender [{0}:{1,number,integer}] queue 
thread to tcp background replication
  AsyncSocketSender.queue.message=Queue message to [{0}:{1,number,integer}] 
id=[{2}] size={3}
  AsyncSocketSender.send.error=Unable to asynchronously send session w/ 
id=[{0}] message will be ignored.
  IDataSender.connect=Sender connect to [{0}:{1,number,integer}]
  IDataSender.create=Create sender [{0}:{1,number,integer}]
  IDataSender.disconnect=Sender disconnect from [{0}:{1,number,integer}]
  IDataSender.socketclose=Sender close socket to [{0}:{1,number,integer}]
  IDataSender.missing.ack=Wasn't able to read acknowledgement from 
server[{0}:{1,number,integer}] in {2,number,integer} ms. Disconnecting socket, 
and trying again.
  IDataSender.send.again=Send data again to [{0}:{1,number,integer}]
  IDataSender.send.message=Send message to [{0}:{1,number,integer}] id=[{2}] 
size={3,number,integer}
  IDataSender.stats=Send stats from [{0}:{1,number,integer}] Nr of bytes 
sent={2,number,integer} over {3} == {4,number,integer} bytes/request
  PoolSocketSender.senderQueue.sender.failed=PoolSocketSender create new sender 
to [{0}:{1,number,integer}] failed
  PoolSocketSender.noMoreSender=No socket sender available for client 
[{0}:{1,number,integer}] did it disappear?
  ReplicationTransmitter.getProperty=get property {0}
  ReplicationTransmitter.setProperty=set property {0}: {1}
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java

2005-02-15 Thread pero

pero2005/02/15 01:25:04

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java
  Log:
  Fix typ correct i18n message
  
  Revision  ChangesPath
  1.40  +2 -2  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- DeltaManager.java 11 Feb 2005 19:43:51 -  1.39
  +++ DeltaManager.java 15 Feb 2005 09:25:04 -  1.40
  @@ -750,7 +750,7 @@
   session.resetDeltaRequest();
   if (log.isDebugEnabled()) {
   log.debug(sm.getString(
  -"deltaManager.createMessage.deltaRequest",
  +"deltaManager.createMessage.delta",
   getName(), sessionId));
   }
   } else if (!session.isPrimarySession()) {
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Some Compiler Error with mod_jk Windows

2005-02-15 Thread Mladen Turk

Peter Rossbach wrote:
Morning Mladen,
I checkout the news Tomcat 5.5 head and can't compile mod_jk today.
Yesterday morning it works great
Use Windows XP
MSDEV 6.0
Apache 2.0.49
Fixed, thanks.
Also I would suggest that you use more recent apaches for Windows.
Pre 2.0.52 have bugs with transmitfile if you have third party
winsock, like firewalls etc.
Regards,
Mladen
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_global.h

2005-02-15 Thread mturk

mturk   2005/02/15 01:21:42

  Modified:jk/native/common jk_global.h
  Log:
  Include apr_string and apr_lib if HAVE_APR is defined.
  Although APR is not needed, we can use pool independent functions
  if present, like apr_snprintf, etc.
  
  Revision  ChangesPath
  1.41  +6 -3  jakarta-tomcat-connectors/jk/native/common/jk_global.h
  
  Index: jk_global.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_global.h,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- jk_global.h   12 Feb 2005 11:33:00 -  1.40
  +++ jk_global.h   15 Feb 2005 09:21:42 -  1.41
  @@ -47,10 +47,13 @@
   #include "ap_config.h"
   #endif
   
  +#ifdef HAVE_APR
  +#include "apr_lib.h"
  +#include "apr_strings.h"
  +#endif
  +
   #ifdef AS400
   #include "ap_config.h"
  -#include "apr_strings.h"
  -#include "apr_lib.h"
   extern char *strdup(const char *str);
   #endif
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Some Compiler Error with mod_jk Windows

2005-02-15 Thread Peter Rossbach

Morning Mladen,
I checkout the news Tomcat 5.5 head and can't compile mod_jk today.
Yesterday morning it works great
Use Windows XP
MSDEV 6.0
Apache 2.0.49
regards
Peter
D:\tomcat\jakarta-tomcat-connectors\jk\native\apache-2.0>MSDE
V mod_jk.dsp /MAKE ALL
Konfiguration: apache - Win32 Debug
Kompilierung läuft...
jk_ajp12_worker.c
jk_ajp13_worker.c
jk_ajp14_worker.c
D:\tomcat\jakarta-tomcat-connectors\jk\native\common\jk_ajp14
_worker.c(105) : warning C4013: 'apr_snprintf' undefiniert; Annahme: 
extern mit
Rueckgabetyp int
jk_jni_worker.c
jk_lb_worker.c
jk_status.c
D:\tomcat\jakarta-tomcat-connectors\jk\native\common\jk_statu
s.c(138) : warning C4013: 'apr_vsnprintf' undefiniert; Annahme: extern 
mit Rueck
gabetyp int
jk_worker.c
Generieren von Code...
Linker-Vorgang läuft...
  Bibliothek Debug/mod_jk.lib und Objekt Debug/mod_jk.exp wird erstellt
jk_status.obj : error LNK2001: Nichtaufgeloestes externes Symbol 
_apr_vsnprintf
jk_util.obj : error LNK2001: Nichtaufgeloestes externes Symbol 
_apr_vsnprintf
Debug/mod_jk.so : fatal error LNK1120: 1 unaufgeloeste externe Verweise
Fehler beim Ausführen von link.exe.

mod_jk.so - 3 Fehler, 2 Warnung(en)
Konfiguration: apache - Win32 
Release
Kompilierung läuft...
jk_ajp12_worker.c
jk_ajp13_worker.c
jk_ajp14_worker.c
D:\tomcat\jakarta-tomcat-connectors\jk\native\common\jk_ajp14
_worker.c(105) : warning C4013: 'apr_snprintf' undefiniert; Annahme: 
extern mit
Rueckgabetyp int
jk_jni_worker.c
jk_lb_worker.c
jk_status.c
D:\tomcat\\jakarta-tomcat-connectors\jk\native\common\jk_statu
s.c(138) : warning C4013: 'apr_vsnprintf' undefiniert; Annahme: extern 
mit Rueck
gabetyp int
jk_worker.c
Generieren von Code...
Linker-Vorgang läuft...
  Bibliothek Release/mod_jk.lib und Objekt Release/mod_jk.exp wird erstellt
jk_status.obj : error LNK2001: Nichtaufgeloestes externes Symbol 
_apr_vsnprintf
jk_util.obj : error LNK2001: Nichtaufgeloestes externes Symbol 
_apr_vsnprintf
Release/mod_jk.so : fatal error LNK1120: 1 unaufgeloeste externe Verweise
Fehler beim Ausführen von link.exe.

mod_jk.so - 3 Fehler, 2 Warnung(en)
D:\tomcat\jakarta-tomcat-connectors\jk\native\apache-2.0>

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_status.c

2005-02-15 Thread mturk

mturk   2005/02/15 01:00:43

  Modified:jk/native/common jk_status.c
  Log:
  Remove CRLF's. I simply hate that.
  
  Revision  ChangesPath
  1.8   +138 -138  jakarta-tomcat-connectors/jk/native/common/jk_status.c
  
  Index: jk_status.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_status.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- jk_status.c   15 Feb 2005 08:52:53 -  1.7
  +++ jk_status.c   15 Feb 2005 09:00:43 -  1.8
  @@ -146,42 +146,42 @@
   return rc;
   }
   
  -/* Actually APR's apr_strfsize */

  -char *status_strfsize(size_t size, char *buf)

  -{

  -const char ord[] = "KMGTPE";

  -const char *o = ord;

  -int remain;

  -

  -if (size < 0) {

  -return strcpy(buf, "  - ");

  -}

  -if (size < 973) {

  -if (sprintf(buf, "%3d ", (int) size) < 0)

  -return strcpy(buf, "");

  -return buf;

  -}

  -do {

  -remain = (int)(size & 1023);

  -size >>= 10;

  -if (size >= 973) {

  -++o;

  -continue;

  -}

  -if (size < 9 || (size == 9 && remain < 973)) {

  -if ((remain = ((remain * 5) + 256) / 512) >= 10)

  -++size, remain = 0;

  -if (sprintf(buf, "%d.%d%c", (int) size, remain, *o) < 0)

  -return strcpy(buf, "");

  -return buf;

  -}

  -if (remain >= 512)

  -++size;

  -if (sprintf(buf, "%3d%c", (int) size, *o) < 0)

  -return strcpy(buf, "");

  -return buf;

  -} while (1);

  -}

  +/* Actually APR's apr_strfsize */
  +char *status_strfsize(size_t size, char *buf)
  +{
  +const char ord[] = "KMGTPE";
  +const char *o = ord;
  +int remain;
  +
  +if (size < 0) {
  +return strcpy(buf, "  - ");
  +}
  +if (size < 973) {
  +if (sprintf(buf, "%3d ", (int) size) < 0)
  +return strcpy(buf, "");
  +return buf;
  +}
  +do {
  +remain = (int)(size & 1023);
  +size >>= 10;
  +if (size >= 973) {
  +++o;
  +continue;
  +}
  +if (size < 9 || (size == 9 && remain < 973)) {
  +if ((remain = ((remain * 5) + 256) / 512) >= 10)
  +++size, remain = 0;
  +if (sprintf(buf, "%d.%d%c", (int) size, remain, *o) < 0)
  +return strcpy(buf, "");
  +return buf;
  +}
  +if (remain >= 512)
  +++size;
  +if (sprintf(buf, "%3d%c", (int) size, *o) < 0)
  +return strcpy(buf, "");
  +return buf;
  +} while (1);
  +}
   
   static const char *status_worker_type(int t)
   {
  @@ -219,21 +219,21 @@
   s->write(s, "(null)", 6);
   }
   
  -static void jk_putv(jk_ws_service_t *s, ...)

  -{

  -va_list va;

  -const char *str;

  -

  -va_start(va, s);

  -while (1) {

  -str = va_arg(va, const char *);

  -if (str == NULL)

  -break;

  -s->write(s, str, strlen(str));

  -}

  -va_end(va);

  -}

  -

  +static void jk_putv(jk_ws_service_t *s, ...)
  +{
  +va_list va;
  +const char *str;
  +
  +va_start(va, s);
  +while (1) {
  +str = va_arg(va, const char *);
  +if (str == NULL)
  +break;
  +s->write(s, str, strlen(str));
  +}
  +va_end(va);
  +}
  +
   
   /**
* Command line reference:
  @@ -272,17 +272,17 @@
   /* Skip status, jni and ajp12 worker */
   continue;
   }
  -jk_puts(s, "\nWorker Status for ");

  -jk_putv(s, "req_uri, "?cmd=show&w=",

  -sw->we->worker_list[i], "\">", NULL); 

  -jk_putv(s, sw->we->worker_list[i], "\n", NULL);

  -if (lb != NULL) {

  -unsigned int j;

  -int selected = -1;

  -jk_puts(s, ""

  -"TypeSticky session"

  -"Local worker only"

  -"Retries"

  +jk_puts(s, "\nWorker Status for ");
  +jk_putv(s, "req_uri, "?cmd=show&w=",
  +sw->we->worker_list[i], "\">", NULL); 
  +jk_putv(s, sw->we->worker_list[i], "\n", NULL);
  +if (lb != NULL) {
  +unsigned int j;
  +int selected = -1;
  +jk_puts(s, ""
  +"TypeSticky session"
  +"Local worker only"
  +"Retries"
   "\n");
   jk_putv(s, "", status_worker_type(w->type), "", NULL);
   jk_putv(s, "", status_val_bool(lb->s->sticky_session),
  @@ -291,100 +291,100 @@
   "", NULL);
   jk_printf(s, "%d", lb->s->retries);

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp12_worker.c jk_ajp12_worker.h jk_ajp13_worker.c jk_ajp13_worker.h jk_ajp14_worker.c jk_ajp14_worker.h jk_jni_worker.c jk_jni_worker.h jk_lb_worker.c jk_lb_worker.h jk_service.h jk_status.c jk_status.h jk_worker.c jk_worker_list.h

2005-02-15 Thread mturk

mturk   2005/02/15 00:52:54

  Modified:jk/native/common jk_ajp12_worker.c jk_ajp12_worker.h
jk_ajp13_worker.c jk_ajp13_worker.h
jk_ajp14_worker.c jk_ajp14_worker.h jk_jni_worker.c
jk_jni_worker.h jk_lb_worker.c jk_lb_worker.h
jk_service.h jk_status.c jk_status.h jk_worker.c
jk_worker_list.h
  Log:
  Make worker factory to return the numeric type of the worker,
  and use that type instead of string.
  
  Revision  ChangesPath
  1.22  +3 -3  
jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c
  
  Index: jk_ajp12_worker.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- jk_ajp12_worker.c 15 Feb 2005 07:17:17 -  1.21
  +++ jk_ajp12_worker.c 15 Feb 2005 08:52:53 -  1.22
  @@ -260,7 +260,7 @@
   private_data->worker.retries = JK_RETRIES;
   
   *w = &private_data->worker;
  -return JK_TRUE;
  +return JK_AJP12_WORKER_TYPE;
   }
   
   free(private_data);
  @@ -271,7 +271,7 @@
   jk_log(l, JK_LOG_ERROR, "In ajp12_worker_factory, NULL parameters");
   }
   
  -return JK_FALSE;
  +return 0;
   }
   
   static int ajpv12_sendnbytes(ajp12_endpoint_t * p,
  
  
  
  1.9   +2 -1  
jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.h
  
  Index: jk_ajp12_worker.h
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- jk_ajp12_worker.h 8 Nov 2004 13:23:25 -   1.8
  +++ jk_ajp12_worker.h 15 Feb 2005 08:52:53 -  1.9
  @@ -32,6 +32,7 @@
   #endif  /* __cplusplus */
   
   #define JK_AJP12_WORKER_NAME ("ajp12")
  +#define JK_AJP12_WORKER_TYPE (1)
   
   int JK_METHOD ajp12_worker_factory(jk_worker_t **w,
  const char *name, jk_logger_t *l);
  
  
  
  1.24  +4 -4  
jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c
  
  Index: jk_ajp13_worker.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- jk_ajp13_worker.c 6 Feb 2005 13:45:11 -   1.23
  +++ jk_ajp13_worker.c 15 Feb 2005 08:52:53 -  1.24
  @@ -84,7 +84,7 @@
   if (name == NULL || w == NULL) {
   JK_LOG_NULL_PARAMS(l);
   JK_TRACE_EXIT(l);
  -return JK_FALSE;
  +return 0;
   }
   
   aw = (ajp_worker_t *) calloc(1, sizeof(ajp_worker_t));
  @@ -92,7 +92,7 @@
   jk_log(l, JK_LOG_ERROR,
  "malloc of private_data failed");
   JK_TRACE_EXIT(l);
  -return JK_FALSE;
  +return 0;
   }
   
   aw->name = name;
  @@ -114,5 +114,5 @@
   
   *w = &aw->worker;
   JK_TRACE_EXIT(l);
  -return JK_TRUE;
  +return JK_AJP13_WORKER_TYPE;
   }
  
  
  
  1.11  +2 -1  
jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.h
  
  Index: jk_ajp13_worker.h
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- jk_ajp13_worker.h 8 Nov 2004 13:24:46 -   1.10
  +++ jk_ajp13_worker.h 15 Feb 2005 08:52:53 -  1.11
  @@ -37,6 +37,7 @@
   #endif  /* __cplusplus */
   
   #define JK_AJP13_WORKER_NAME ("ajp13")
  +#define JK_AJP13_WORKER_TYPE (2)
   
   int JK_METHOD ajp13_worker_factory(jk_worker_t **w,
  const char *name, jk_logger_t *l);
  
  
  
  1.28  +6 -6  
jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.c
  
  Index: jk_ajp14_worker.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- jk_ajp14_worker.c 6 Feb 2005 13:45:11 -   1.27
  +++ jk_ajp14_worker.c 15 Feb 2005 08:52:53 -  1.28
  @@ -376,7 +376,7 @@
   if (name == NULL || w == NULL) {
   JK_LOG_NULL_PARAMS(l);
   JK_TRACE_EXIT(l);
  -return JK_FALSE;
  +return 0;
   }
   
   aw = (ajp_worker_t *) calloc(1, sizeof(ajp_worker_t));
  @@ -384,7 +384,7 @@
   jk_log(l, JK_LOG_ERROR,
  "malloc of private data failed");
  JK_T

Re: HR Ozone IT

2005-02-15 Thread hr

Dear Applicant,



We appreciate your interest in our organization. In order to process your 
application at the earliest, we would like you to serve us more info by filling 
up Ozone screening form.



You can access the form at:

www.motiveme.com



Regards

HR.

Ozone IT



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_shm.h

2005-02-15 Thread mturk

mturk   2005/02/15 00:51:43

  Modified:jk/native/common jk_shm.h
  Log:
  Add sticky_session_force element.
  
  Revision  ChangesPath
  1.10  +13 -8 jakarta-tomcat-connectors/jk/native/common/jk_shm.h
  
  Index: jk_shm.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_shm.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- jk_shm.h  15 Feb 2005 07:26:11 -  1.9
  +++ jk_shm.h  15 Feb 2005 08:51:43 -  1.10
  @@ -71,25 +71,30 @@
   /* Current lb factor */
   int lb_factor;
   /* Current lb value  */
  -int lb_value;
  +int lb_value;
  +
  +/* Those are going to be deprecated */
   int is_local_worker;
   int is_local_domain;
  -int in_error_state;
  -int in_recovering;
   int in_local_worker_mode;
   int local_worker_only;
  +
  +int in_error_state;
  +int in_recovering;
   int sticky_session;
  +int sticky_session_force;
   int recover_wait_time;
   int retries;
  +/* Statistical data */
   time_t  error_time;
   /* Number of bytes read from remote */
  -size_t   readed;
  +size_t  readed;
   /* Number of bytes transferred to remote */
  -size_t   transferred;
  +size_t  transferred;
   /* Number of times the worker was elected */
  -size_t   elected;
  +size_t  elected;
   /* Number of non 200 responses */
  -size_t   errors;
  +size_t  errors;
   };
   typedef struct jk_shm_worker jk_shm_worker_t;
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

86 matches

Mail list logo