Re: [PROPOSAL] New version numbering scheme
Remy Maucherat wrote: On Wed, 24 Apr 2002, Ignacio J. Ortega wrote: De: Remy Maucherat [mailto:[EMAIL PROTECTED]] Enviado el: miércoles 24 de abril de 2002 23:41 Which will be the rules to advance the build numbers? Probably every time the release manager feels the code is stable and better than the previous build. I'm +1 on the proposal, with the mention that the 'label' should be attached _after_ one week or so - i.e. after the milestone is tested. Each milestone should work and pass some basic tests. +1. Very good policy IMO, as it avoids the need for the release manager to try to estimate the stability of the milestone. If accepted, I'll document the new policy in the release plan. Do not forget to mention that the dev list MUST be informed in advance of the release (2 or 3 days and better not on Friday). So let's see if we reach a GA before 4.1.35 ;-) Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: [PROPOSAL] New version numbering scheme
For the uninitiated, the numbering is: major.minor.build build_stability So for example, the first 4.1.x release would probably be numbered: Apache Tomcat 4.1.0 Alpha ballot [ ] Yes [ ] No /ballot (feel free to provide comments to justify your choice) +1, we have choosen that numbering for mod_jk in jtc ;) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Bad build process for mod_webapp for Apache 2
Jeffrey Bonevich wrote:
(sorry if this has come through already, but I did not see the post on
the mail archive, so I done went and subscribed to the list to resend it)
For those of you who do not regularly cruise the tomcat-user postings
(you all do that regularly, right? ;-), a number of us in the user
community have been struggling with getting Tomcat 4 integrated with
Apach 2 using mod_webapp. I and a number of other users found a number
of problems in the build process for mod_webapp - biggest of which is
that the Makefile does not actually produce a DSO module (i.e.
mod_webapp.so) for Apache 2. We figured out that the following will do
so (after running configure and make):
cd ${LOCATION_OF_CONNECTOR_SRC}/webapp/lib
gcc -shared -o libwebapp.so *.lo
You build a libwebapp.so
cd ../apache-2.0
${APACHE_HOME}/build/libtool --silent --mode=link \
gcc -shared -o mod_webapp.so -rpath ${APACHE_HOME}/modules \
-module -avoid-version -I../include -L../lib \
-dlopen ../lib/libwebapp.la mod_webapp.lo
And you use libwebapp.la ... Are you sure that it does what you except?
Could you send me the libwebapp.la and the the result of libtool --version?
cp mod_webapp.so ${APACHE_HOME}/modules/
I have included a brief HOWTO that I compiled during the process of
figuring this all out. If more information is needed, please let me
know directly to my email (I am not presently on the dev mailing list
distribution).
Thanx!
jeff
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0 RELEASE-PLAN-4.1.txt
remm02/04/25 01:59:51 Modified:.RELEASE-PLAN-4.1.txt Log: - Update status. - Update with new build numbering scheme. Revision ChangesPath 1.5 +9 -9 jakarta-tomcat-4.0/RELEASE-PLAN-4.1.txt Index: RELEASE-PLAN-4.1.txt === RCS file: /home/cvs/jakarta-tomcat-4.0/RELEASE-PLAN-4.1.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- RELEASE-PLAN-4.1.txt 24 Apr 2002 11:59:03 - 1.4 +++ RELEASE-PLAN-4.1.txt 25 Apr 2002 08:59:51 - 1.5 @@ -1,4 +1,4 @@ -$Id: RELEASE-PLAN-4.1.txt,v 1.4 2002/04/24 11:59:03 remm Exp $ +$Id: RELEASE-PLAN-4.1.txt,v 1.5 2002/04/25 08:59:51 remm Exp $ Release Plan for Apache Tomcat 4.1 == @@ -28,18 +28,19 @@ from build.xml scripts. * Many other miscanellous improvements -This Release Plan proposes the following schedule: - - Friday, April 26, 2002 Apache Tomcat 4.1 Beta 1 +Apache Tomcat 4.1 will use the build numbering and release process first used +in the Apache HTTPd 2.0.x project. +Milestone builds, numbered 4.1.x, will be released as needed and will +recieve a stability rating after a one week testing period. The rating can be +either: Alpha, Beta, or Stable. - Friday, May 10, 2002Apache Tomcat 4.1 Beta 2 +This Release Plan proposes the following schedule: - Friday, May 17, 2002Apache Tomcat 4.1 Release Candidate + Friday, April 26, 2002 Apache Tomcat 4.1.0 In order to complete final release, all outstanding Bugzilla bug reports against Tomcat 4.1 above NORMAL severity need to be fixed or deferred for -later releases. After the first 4.1 Release Candidate, other RC releases may -be made as needed until one is promoted as Final by the Tomcat committers. +later releases. This Release Plan proposes the following classification of current outstanding bug reports in the bug tracking system, sorted by component and their ID @@ -78,7 +79,6 @@ 5585 Error page not displayed 5666 Implicit object _value on jsp pages 5793 variable element in tld with TagExtraInfo class -5903 version attribute in jsp:root 6196 jsp:forward should trigger IllegalStateException when buffer flushed 6908 JavaCompiler interface setOutputDir always called with null parameter 7007 Invalid names in web.xml generated by JspC for top-level JSP pages -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [PROPOSAL] New version numbering scheme
Do not forget to mention that the dev list MUST be informed in advance of the release (2 or 3 days and better not on Friday). Ok. So, according to the old release plan, a first milestone (4.1.0, instead of being called 4.1 Beta 1) will be released (tagged) this friday. Since it can be difficult to build binaries, I'll upload one in: http://jakarta.apache.org/builds/jakarta-tomcat-4.0/test/v4.1.0 I'm fixing the release plan, and I have some trouble explaining how the Apache 2 build numbering scheme an release process works. Feel free to fix it in the document. So let's see if we reach a GA before 4.1.35 ;-) Lol. Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [PROPOSAL] jasper2 detection of compile time page include changes
I also like the idea, however I would like to see some modifications which would allow this idea to work for application development, not only in deployment environments. When developing applications, the requirement is to see the changes immediately, not after a period of time. So there should be an option to run the check on each request (the option can be implemented as an init parameter of JSPServlet). This option would be used in a development case, and the background thread solution would be used in the live deployment scenario. Note that in the former case, not all files in the application need to be checked, only the ones included in the currently requested page. Petr Jiricka software engineer NetBeans / Forte for Java Sun Microsystems Kin-Man Chung wrote: +1 on the idea. With minor changes, we can also implement a compiler server that compiles out-of-date pages in the background thread. This would greatly improve the response time for accessing the pages, when recompilations are needed. Date: Wed, 24 Apr 2002 10:52:51 -0500 From: Glenn Nielsen [EMAIL PROTECTED] Subject: [PROPOSAL] jasper2 detection of compile time page include changes To: [EMAIL PROTECTED] MIME-version: 1.0 Content-transfer-encoding: 7bit X-Accept-Language: en Delivered-to: mailing list [EMAIL PROTECTED] Mailing-List: contact [EMAIL PROTECTED]; run by ezmlm X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N List-Post: mailto:[EMAIL PROTECTED] List-Subscribe: mailto:[EMAIL PROTECTED] List-Unsubscribe: mailto:[EMAIL PROTECTED] List-Help: mailto:[EMAIL PROTECTED] List-Id: Tomcat Developers List tomcat-dev.jakarta.apache.org A common problem Tomcat users have is that Jasper does not detect when a compile time included file %@include file=...% changes so that it can recompile dependent JSP pages. This propsoal maps out a possible solution for this. Create a new class (JspDependency) which is used to store mapping of JSP pages to dependent compile time included files. This class will be created for each web application context and the data it depends upon serialized to a special file in the work directory on context stop, and read from that file on context startup. Proposed filename is JSP_DEPENDENCY.ser. Here is how this integrates into Jasper: On context start instantiate a JspDependency object and read in the dependencies from JSP_DEPENDENCY.ser. If there are dependencies, start a background thread which checks for changes in compile time included files once each 5-15 minutes. Perhaps make this configurable. If changes are detected, set flags for dependent JSP pages which are affected. Using a thread to accomplish this rather than having JSP Load do the dependency checks should reduce the request latency overhead for detecting these changes. The JSP Load method will call a method in JspDependency to determine whether the current page needs to be recompiled due to dependency changes. This will just be a quick test of a boolean, actual dependency checks are done by the background thread. The JSP page compiler will call a method in JspDependency to remove all dependencies for the current JSP page on compile start, then call an add method for each compile time include dependency found. After a JSP page compile has completed any changes to dependencies are written back out to the JSP_DEPENDENCY.ser file. Comments or suggestions? Regards, Glenn -- Glenn Nielsen [EMAIL PROTECTED] | /* Spelin donut madder| MOREnet System Programming | * if iz ina coment. | Missouri Research and Education Network | */ | -- -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [VOTE] Release Plan for Apache Tomcat 4.1
Remy Maucherat wrote: Remy Maucherat wrote: The goal of the Apache Tomcat 4.1 final release is to provide a stable container that supports 100% of the mandatory requirements of the Servlet 2.3 and JSP 1.2 specifications, as well as to improve and add many useful additional features on top of the existing Apache Tomcat 4.0 releases. And what do we do with 4.0? I still have problems with resources and lifecycles there and no enough time to fix them. I plan to propose releasing a 4.0.4 Beta 3 after a few bugfixes are merged (the one for bug 8092, mainly; probably also a few others, like 7575 and 6662 Hi Remy, this is good to hear, do you have any more specific plans and suggested dates for 4.0.4 Final ? Thanks Petr Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Bad build process for mod_webapp for Apache 2
Jean-Frederic -
Attached is my libwebapp.la. I think I tried it with libwebapp.so and
it did not produce a usable module. However, I am not too experienced a
C/C++ programmer and have never used libtool before, so I was winging it.
Here is the result of libtool --version:
[root@strider webapp]# /usr/local/apache2/build/libtool --version
ltmain.sh (GNU libtool) 1.3.4-freebsd-ports (1.385.2.196 1999/12/07
21:47:57)
Thanx for the response!
jeff
jean-frederic clere wrote:
Jeffrey Bonevich wrote:
(sorry if this has come through already, but I did not see the post on
the mail archive, so I done went and subscribed to the list to resend it)
For those of you who do not regularly cruise the tomcat-user postings
(you all do that regularly, right? ;-), a number of us in the user
community have been struggling with getting Tomcat 4 integrated with
Apach 2 using mod_webapp. I and a number of other users found a number
of problems in the build process for mod_webapp - biggest of which is
that the Makefile does not actually produce a DSO module (i.e.
mod_webapp.so) for Apache 2. We figured out that the following will do
so (after running configure and make):
cd ${LOCATION_OF_CONNECTOR_SRC}/webapp/lib
gcc -shared -o libwebapp.so *.lo
You build a libwebapp.so
cd ../apache-2.0
${APACHE_HOME}/build/libtool --silent --mode=link \
gcc -shared -o mod_webapp.so -rpath ${APACHE_HOME}/modules \
-module -avoid-version -I../include -L../lib \
-dlopen ../lib/libwebapp.la mod_webapp.lo
And you use libwebapp.la ... Are you sure that it does what you except?
Could you send me the libwebapp.la and the the result of libtool --version?
cp mod_webapp.so ${APACHE_HOME}/modules/
I have included a brief HOWTO that I compiled during the process of
figuring this all out. If more information is needed, please let me
know directly to my email (I am not presently on the dev mailing list
distribution).
Thanx!
jeff
--
To unsubscribe, e-mail:
mailto:[EMAIL PROTECTED]
For additional commands, e-mail:
mailto:[EMAIL PROTECTED]
--
To unsubscribe, e-mail:
mailto:[EMAIL PROTECTED]
For additional commands, e-mail:
mailto:[EMAIL PROTECTED]
--
Jeffrey Bonevich
Ann Arbor, Michigan
[EMAIL PROTECTED]
http://www.bonevich.com
Hwæt! Wë Gär-Dena in geär-dagum,
peod-cyninga, prym gefrünon,
hü ða aepelingas ellen fremedon!
# libwebapp.la - a libtool library file
# Generated by ltmain.sh - GNU libtool 1.3.4-freebsd-ports (1.385.2.196 1999/12/07
21:47:57)
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
# The name that we can dlopen(3).
dlname=''
# Names of this library.
library_names=''
# The name of the static archive.
old_library='libwebapp.a'
# Libraries that this one depends upon.
dependency_libs=''
# Version information for libwebapp.
current=0
age=0
revision=0
# Is this an already installed library?
installed=yes
# Directory that this library needs to be installed in:
libdir='/disk/0/src/java/jakarta-tomcat-connectors-4.0.2-01-src/webapp/lib'
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 8436] - Apache httpd 2.0 unable to load Connector : mod_webapp.so
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8436. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8436 Apache httpd 2.0 unable to load Connector : mod_webapp.so [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2002-04-25 13:37 --- The files in http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v4.0.3/bin/linux/i386/ are for httpd 1.3 not 2.0 For httpd 2.0 you have to build mod_webapp.so using the sources or wait for the next TC release. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [VOTE] Release Plan for Apache Tomcat 4.1
Remy Maucherat wrote: Here is what Craig stated regarding context start/stop events: - - reload Reloads Context if it is a directory, does not reload if it is running from a war file. A reload does not reload the web applications web.xml. So if you make configuration changes to the web.xml file you need to do a stop/start. I'm not sure that stop/start actually does the right thing currently (haven't ever looked at that scenario), because it doesn't remove anything that was configured by the old web.xml file. - Thanks, I had forgotten about it :-( The start/stop order is cleaned up, but stop should probably clean more than it currently does. Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina build.xml
remm02/04/25 07:12:07
Modified:catalina build.xml
Log:
- Automatically fill the version number (defined in the version property).
Revision ChangesPath
1.114 +2 -1 jakarta-tomcat-4.0/catalina/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- build.xml 23 Apr 2002 16:52:43 - 1.113
+++ build.xml 25 Apr 2002 14:12:07 - 1.114
@@ -827,7 +827,8 @@
/javac
!-- Copy static resource files --
-copy todir=${catalina.build}/server/classes
+filter token=VERSION value=${version}/
+copy todir=${catalina.build}/server/classes filtering=true
fileset dir=src/share
exclude name=**/*.java/
/fileset
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util ServerInfo.properties
remm02/04/25 07:11:55 Modified:catalina/src/share/org/apache/catalina/util ServerInfo.properties Log: - Automatically fill the version number (defined in the version property). Revision ChangesPath 1.2 +1 -1 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/ServerInfo.properties Index: ServerInfo.properties === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/ServerInfo.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ServerInfo.properties 21 Dec 2001 21:15:45 - 1.1 +++ ServerInfo.properties 25 Apr 2002 14:11:55 - 1.2 @@ -1 +1 @@ -server.info=Apache Tomcat/4.1-dev +server.info=Apache Tomcat/@VERSION@ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/ROOT index.jsp
remm02/04/25 07:14:29
Modified:webapps/ROOT index.jsp
Log:
- Automatically fill the version number (defined in the version property).
Revision ChangesPath
1.2 +1 -1 jakarta-tomcat-4.0/webapps/ROOT/index.jsp
Index: index.jsp
===
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/ROOT/index.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.jsp 21 Dec 2001 21:15:45 - 1.1
+++ index.jsp 25 Apr 2002 14:14:29 - 1.2
@@ -2,7 +2,7 @@
html
head
meta http-equiv=Content-Type content=text/html; charset=iso-8859-1
-titleJakarta Project - Tomcat (v4.1-dev)/title
+title%= application.getServerInfo() %/title
style type=text/css
!--
body {
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0 build.xml
remm02/04/25 07:50:10
Modified:.build.xml
Log:
- Copy the right version of the Jasper source in the source distribution.
Revision ChangesPath
1.66 +5 -0 jakarta-tomcat-4.0/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- build.xml 16 Apr 2002 00:06:10 - 1.65
+++ build.xml 25 Apr 2002 14:50:10 - 1.66
@@ -221,8 +221,13 @@
fileset dir=${basedir}
exclude name=**/build/**/
exclude name=**/dist/**/
+exclude name=jasper/**/
exclude name=build.properties/
/fileset
+/copy
+mkdir dir=${tomcat.dist}/src/jasper/
+copy todir=${tomcat.dist}/src/jasper
+ fileset dir=${jasper.home}/
/copy
mkdir dir=${tomcat.dist}/jtc-src/
copy todir=${tomcat.dist}/jtc-src
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/xdocs/stylesheets project.xml
remm02/04/25 08:00:40 Modified:docs bugreport.html index.html irc.html news.html resources.html xdocs/stylesheets project.xml Log: - Tomcat website update (mentions 4.1). Revision ChangesPath 1.4 +1 -1 jakarta-tomcat-site/docs/bugreport.html Index: bugreport.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/bugreport.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bugreport.html16 Apr 2002 12:21:06 - 1.3 +++ bugreport.html25 Apr 2002 15:00:40 - 1.4 @@ -60,7 +60,7 @@ /li lia href=./tomcat-4.0-doc/index.htmlTomcat 4.0/a /li -lia href=./tomcat-4.1-doc/index.htmlTomcat 4.next/a +lia href=./tomcat-4.1-doc/index.htmlTomcat 4.1/a /li /ul pstrongDownload/strong/p 1.24 +1 -1 jakarta-tomcat-site/docs/index.html Index: index.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/index.html,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- index.html16 Apr 2002 12:21:06 - 1.23 +++ index.html25 Apr 2002 15:00:40 - 1.24 @@ -60,7 +60,7 @@ /li lia href=./tomcat-4.0-doc/index.htmlTomcat 4.0/a /li -lia href=./tomcat-4.1-doc/index.htmlTomcat 4.next/a +lia href=./tomcat-4.1-doc/index.htmlTomcat 4.1/a /li /ul pstrongDownload/strong/p 1.5 +1 -1 jakarta-tomcat-site/docs/irc.html Index: irc.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/irc.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- irc.html 16 Apr 2002 12:21:06 - 1.4 +++ irc.html 25 Apr 2002 15:00:40 - 1.5 @@ -60,7 +60,7 @@ /li lia href=./tomcat-4.0-doc/index.htmlTomcat 4.0/a /li -lia href=./tomcat-4.1-doc/index.htmlTomcat 4.next/a +lia href=./tomcat-4.1-doc/index.htmlTomcat 4.1/a /li /ul pstrongDownload/strong/p 1.27 +1 -1 jakarta-tomcat-site/docs/news.html Index: news.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/news.html,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- news.html 16 Apr 2002 12:21:06 - 1.26 +++ news.html 25 Apr 2002 15:00:40 - 1.27 @@ -60,7 +60,7 @@ /li lia href=./tomcat-4.0-doc/index.htmlTomcat 4.0/a /li -lia href=./tomcat-4.1-doc/index.htmlTomcat 4.next/a +lia href=./tomcat-4.1-doc/index.htmlTomcat 4.1/a /li /ul pstrongDownload/strong/p 1.3 +10 -3 jakarta-tomcat-site/docs/resources.html Index: resources.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/resources.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- resources.html16 Apr 2002 12:21:06 - 1.2 +++ resources.html25 Apr 2002 15:00:40 - 1.3 @@ -60,7 +60,7 @@ /li lia href=./tomcat-4.0-doc/index.htmlTomcat 4.0/a /li -lia href=./tomcat-4.1-doc/index.htmlTomcat 4.next/a +lia href=./tomcat-4.1-doc/index.htmlTomcat 4.1/a /li /ul pstrongDownload/strong/p @@ -132,8 +132,12 @@ trtd blockquote ul -libApache Jakarta-Tomcat/b, by James Goodwillbr / -iAPress/i +li + bApache Jakarta-Tomcat/b, by James Goodwillbr / + iAPress/i +/li +li + ba href=http://tomcatbook.sourceforge.net/;Tomcat Book Project/a/b /li /ul /blockquote @@ -152,6 +156,9 @@ ul li ba href=http://www.ubeans.com/tomcat/index.html;Apache 1.3.23 + Tomcat 4.0.2 + Load Balancing/a/b, by Pascal Forget +/li +li + ba href=http://www.theserverside.com/resources/article.jsp?l=Tomcat;Clustering Technologies - In Memory Session Replication in Tomcat 4/a/b, by Filip Hanik /li /ul /blockquote 1.7 +2 -2 jakarta-tomcat-site/xdocs/stylesheets/project.xml Index: project.xml
Request for more events to the LifeCycle Re: [VOTE] Release Plan for Apache Tomcat 4.1
I've not accessed the latest Catalina source since 4.0.1, and I can't access this from where I'm working now. I've written a small server that makes use of catalina parts, and as I wrote this server, I wished that LifeCycle had 4 events instead of 2 (Starting, started, stopping, stopped). This lets one keep better track of what's going on. I'd wanted to post this request to Bugzilla today, but there's some problem with accessing that site. Thanks, Sriram Sriram __ Do You Yahoo!? Yahoo! Games - play chess, backgammon, pool and more http://games.yahoo.com/ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 8519] New: - Port inserted in redirect
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8519. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8519 Port inserted in redirect Summary: Port inserted in redirect Product: Tomcat 4 Version: Unknown Platform: All OS/Version: All Status: NEW Severity: Blocker Priority: Other Component: Catalina AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Tomcat 4.x is unusable with TUX web server on Linux when used as the slave server (i.e. not on port 80). Also, when Tomcat 4.x is using a port other than 80, and a content switch is used to map port 80 to the port Tomcat is on, the port Tomcat listens for is sent to the browser in redirects, thus failing to connect. For instance, say Tomcat is on a machine called WEB1 listening on port 4001 (port 80 is used for another web server). An URL exists to go to a virtual entry in a content switch (or something like a Cisco Local Director), that maps the IP to the IP for MACH1 and translates port 80 to port 4001. Thus a request for http://foo.domain.com/ actually requests a file from http://MACH1:4001/. What happens, is that Tomcat sends a redirect in this case for the index.html file (or whatever the index is set to in server.xml) and the browser receives: http://foo.domain.com:4001/index.html as the redirect. I had to alter the file /catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java in the function private String toAbsolute(String location) so that it would parse out any port that was getting sent back in order to make it functional. I realize that in many situations it would be necessary to send back the port, however, I feel this needs to be an INI setting, or perhaps a compile time flag. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 8519] - Port inserted in redirect
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8519. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8519 Port inserted in redirect --- Additional Comments From [EMAIL PROTECTED] 2002-04-25 15:36 --- In the description, I wrote Tomcat is on a machine called WEB1 listening when it should have been Tomcat is on a machine called MACH1 listening. Note also, the TUX problem is due to this same issue I believe. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6668] - HttpProcessor takes incorrect defaults for proxy port according to HTTP/1.1 Spec
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6668. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6668 HttpProcessor takes incorrect defaults for proxy port according to HTTP/1.1 Spec [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2002-04-25 15:57 --- *** Bug 8519 has been marked as a duplicate of this bug. *** -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Problems with tomcat downloads for OS X (via Webmaster)
Problem on his (Gunnar) side... _DO_NOT_ use StuffIt EVER on OS/X, it
corrupts data...
P{ier}
Paulo Gaspar [EMAIL PROTECTED] wrote:
Via webmaster, please check the Original Message that follows.
Have fun,
Paulo Gaspar
-Original Message-
From: Gunnar Schomaker [mailto:[EMAIL PROTECTED]]
Sent: Wednesday, April 24, 2002 12:04 PM
To: [EMAIL PROTECTED]
Subject: starting problems with tomcat packages on os x
Dear frinds,
I hope you will forward my message to the matching place ;-) THX.:!
I have downloaded the tomcat binaries for OS X and I was very confused
during the installation process. I was guided by the following
instruction link.
http://developer.apple.com/internet/macosx/tomcat1.html
and
http://developer.apple.com/internet/macosx/tomcat2.html
(very usefull links for servlet beginners like me ;-)
now I know that the instructions are right, but something goes wrong
during unpacking the binaries. At the download section I found the hint
that there are problems with the current tar version on OS X Clients, so
i used the stuffit expander. My installation result was that the
webserver worked fine, but the JSP and Servlet Example part did not. It
was hard for me to find out the the problem was a missing 's' in some
file ending names. So I did'nt know if the problem was caused by StuffIt
or by the archive on your webserver. I tried the version 4.0.1 and
4.0.3. They both have the same problem. Some class files have after
unpacking a wrong ending (.clas and not .class). So it may be usfull to
fix it, if it's caused by the archive, otherwise it may be usefull to
give an other hint for OS X user. It's a new System and I can imagine
that I'm not the only newbe-one ...
I' hope the Information is usefull for you ...
best regards from germany
dipl. Inf. Gunnar Schomaker
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 8519] - Port inserted in redirect
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8519. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8519 Port inserted in redirect --- Additional Comments From [EMAIL PROTECTED] 2002-04-25 16:08 --- I'm running 4.0.3, is the fix for the proxy problem in it? If so, it fails to resolve my issue... -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Fwd: Request for more events to the LifeCycle Re: [VOTE] Release Plan for Apache Tomcat 4.1
Sorry, I hit the Send button accidently... Here's what I wanted to say: I've not accessed the Tomcat source since 4.0.1, and can't access it from where I'm working right now. I've used Tomcat 4 parts within a small server that I've written. I've also written a UI in Swing that listens to LifeCycle Events. I have the following questions : 1. Is it possible to have events such as starting, started, stopping, and stopped instead of the current two : starting and stopping ? 2. Are there any plans to include these events in future ? 3. Was there ever such an idea and was it voted against for some reason ? I was unable to access bugzilla, and therefore resorted to posting this request to the DEV list. Thanks, Sriram --- Sriram N [EMAIL PROTECTED] wrote: Reply-to: Tomcat Developers List [EMAIL PROTECTED] Date: Thu, 25 Apr 2002 08:02:46 -0700 (PDT) From: Sriram N [EMAIL PROTECTED] Subject: Request for more events to the LifeCycle Re: [VOTE] Release Plan for Apache Tomcat 4.1 To: Tomcat Developers List [EMAIL PROTECTED] I've not accessed the latest Catalina source since 4.0.1, and I can't access this from where I'm working now. I've written a small server that makes use of catalina parts, and as I wrote this server, I wished that LifeCycle had 4 events instead of 2 (Starting, started, stopping, stopped). This lets one keep better track of what's going on. I'd wanted to post this request to Bugzilla today, but there's some problem with accessing that site. Thanks, Sriram Sriram __ Do You Yahoo!? Yahoo! Games - play chess, backgammon, pool and more http://games.yahoo.com/ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] __ Do You Yahoo!? Yahoo! Games - play chess, backgammon, pool and more http://games.yahoo.com/ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 8438] - Unable to start Apache service when using mod_jk
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8438. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8438 Unable to start Apache service when using mod_jk [EMAIL PROTECTED] changed: What|Removed |Added Priority|Other |Medium -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 8524] New: - Jasper fails to parse RT expression with single quotes embedded.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8524. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8524 Jasper fails to parse RT expression with single quotes embedded. Summary: Jasper fails to parse RT expression with single quotes embedded. Product: Tomcat 4 Version: Nightly Build Platform: All OS/Version: All Status: NEW Severity: Minor Priority: Other Component: Jasper AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Given: c_rt:out value='%= new String(this shouldn't fail) %'/ Result: Attribute t has no value [java] at org.apache.jasper.compiler.JspReader.parseAttributeValue(JspReader.java:563) [java] at org.apache.jasper.compiler.JspReader.parseTagAttributes(JspReader.java:681) [java] at org.apache.jasper.compiler.Parser$Tag.accept(Parser.java:838) [java] at org.apache.jasper.compiler.Parser.parse(Parser.java:1145) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 8519] - Port inserted in redirect
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8519. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8519 Port inserted in redirect --- Additional Comments From [EMAIL PROTECTED] 2002-04-25 17:10 --- No, it's in 4.0.4 b1. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 8524] - Jasper fails to parse RT expression with single quotes embedded.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8524. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8524 Jasper fails to parse RT expression with single quotes embedded. [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2002-04-25 17:15 --- There is a ' inside '%= new String(this shouldn't fail) %', try '%= new String(this shouldn\'t fail) %'. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6709] - Images on protected areas have not Last modified header
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6709. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6709 Images on protected areas have not Last modified header --- Additional Comments From [EMAIL PROTECTED] 2002-04-25 17:21 --- This default no-cache on secured resources has significant effects on the .ram files used by RealPlayer. These files must be cached when the browser passes control to RealPlayer, which then uses the cached file. I assume this kind of hand-off is similar with other (all?) external programs called by the browser. Netscape and Opera ignore the no-cache headers for the .ram files, but IE does not and RealPlayer cannot find the .ram file via IE. To work around this, I had to create a servlet filter mapped to *.ram that sets the Cache-Control to private via response.setHeader(Cache-Control,private). This one setting proved sufficient for the .ram file info to pass to RealPlayer via the cached file. Preventing caching and protecting web resources in the container should work together, but I question the assumption that the no-cache headers should be a mandatory part of the container's security responsibility. In other words, this assumes the container's job necessarily includes trying to manage how clients (and proxies) treat its resources once outside the container. I would like to see this no-cache feature be optional. It is an important thing to be able to set, but there needs to be more control over its exact settings, and to what resources the settings should be applied. It could be great if this were fully configurable in Tomcat and the no-cache resource mappings could be described in the server.xml (or web.xml if it were added to the web app spec). Otherwise, servlet filters are a good way to implement this. Thanks J F -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
2 problems with Coyote and j-t-c/util
1) First one is: with the latest TC 4 code, JK 2 is throwing a NPE on shutdown (line 185 of ChannelUn); I don't see why it's broken, it was working fine very little ago. 2) Setting soTimeout doesn't do anything, apparently. I added some code in the PoolTcpEndpoint, and setSoTimeout is called on the socket with the right argument (2 ms in the default configuration). However, when trying with a telnet, I was able to keep the connection open for a lot more than 20s. The socket handling in the old connector appears to be very silimar, and yet it worked fine. What's going on ? Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [VOTE] Release Plan for Apache Tomcat 4.1
ballot [ ] +1 I approve this plan, and will help [X] +0 I approve this plan, but can't help [ ] -0 I am not in favor of this plan [ ] -1 I am against this plan, because: /ballot -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime PageContextImpl.java
kinman 02/04/25 11:16:06
Modified:jasper2/src/share/org/apache/jasper/compiler Generator.java
jasper2/src/share/org/apache/jasper/runtime
PageContextImpl.java
Log:
- Fixed 6196. If the buffer was flushed, a forward should cause a
IllegalStateException instead of IOException.
Revision ChangesPath
1.6 +3 -5
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
Index: Generator.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Generator.java19 Apr 2002 20:35:01 - 1.5
+++ Generator.java25 Apr 2002 18:16:06 - 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
1.5 2002/04/19 20:35:01 kinman Exp $
- * $Revision: 1.5 $
- * $Date: 2002/04/19 20:35:01 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
1.6 2002/04/25 18:16:06 kinman Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/04/25 18:16:06 $
*
*
*
@@ -361,8 +361,6 @@
out.printil(if (true) {); // So that javac won't complain about
out.pushIndent(); // codes after return
-
- out.printil(out.clear(););
out.printin(pageContext.forward();
out.print (attributeValue(n.getPage(), false));
printParams(n);
1.3 +11 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java
Index: PageContextImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PageContextImpl.java 31 Mar 2002 09:02:52 - 1.2
+++ PageContextImpl.java 25 Apr 2002 18:16:06 - 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
1.2 2002/03/31 09:02:52 remm Exp $
- * $Revision: 1.2 $
- * $Date: 2002/03/31 09:02:52 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
1.3 2002/04/25 18:16:06 kinman Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/04/25 18:16:06 $
*
*
*
@@ -401,6 +401,14 @@
public void forward(String relativeUrlPath)
throws ServletException, IOException
{
+ // JSP.4.5 If the buffer was flushed, throw IllegalStateException
+ try {
+ out.clear();
+ } catch (IOException ex) {
+ throw new IllegalStateException(Constants.getString(
+ jsp.error.attempt_to_clear_flushed_buffer));
+ }
+
// Make sure that the response object is not the wrapper for include
while (response instanceof HttpServletResponseWrapper)
response = ((HttpServletResponseWrapper)response).getResponse();
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6196] - jsp:forward should trigger IllegalStateException when buffer flushed
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6196. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6196 jsp:forward should trigger IllegalStateException when buffer flushed [EMAIL PROTECTED] changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2002-04-25 18:16 --- Fixed in jasper 2 -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/apr AprImpl.java
costin 02/04/25 11:17:24
Modified:jk/java/org/apache/jk/apr AprImpl.java
Log:
Added a couple of methods to expose the jk objects.
Instead of duplicating the code to work with the shm and unix channel ( in
a jk 'component' and in the jni wrapper/java code ) we just use the
same code.
This also greatly simplifies the native code - and makes use of the optimizations
used in the jni channel ( to avoid expensive string conversions and object
creation ). It also minimizes the ammount of jni 'crossings' ( each JNI invocation
has a significang performance hit ).
In addition the same code can be used for in-process and out-of process,
and for ajp14
Revision ChangesPath
1.12 +27 -6 jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java
Index: AprImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AprImpl.java 18 Apr 2002 22:59:20 - 1.11
+++ AprImpl.java 25 Apr 2002 18:17:24 - 1.12
@@ -123,16 +123,37 @@
public native long mutexDestroy( long pool, long mutexP );
-// java to C
+// Interface to jk components
+//
+
+/* Return a jk_env_t, used to keep the execution context ( temp pool, etc )
+ */
+public native long getJkEnv();
+
+/** Clean the temp pool, put back the env in the pool
+ */
+public native void releaseJkEnv(long xEnv);
+
+public native void jkRecycle(long xEnv, long endpointP);
+
+/** Get a native component
+ * @return 0 if the component is not found.
+ */
+public native long getJkHandler(long xEnv, String compName );
+
+public native long createJkHandler(long xEnv, String compName );
+
+/** Get the id of a method.
+ * @return -1 if the method is not found.
+ */
+public native int jkGetId(long xEnv, String ns, String name );
-// Temp - interface will evolve
-
/** Send the packet to the C side. On return it contains the response
* or indication there is no response. Asymetrical because we can't
* do things like continuations.
*/
-public static native int sendPacket(long xEnv, long endpointP,
-byte data[], int len);
+public static native int jkInvoke(long xEnv, long componentP, long endpointP,
+ int code, byte data[], int len);
// Called from C
@@ -177,7 +198,7 @@
public void init() throws IOException {
try {
loadNative();
-
+
initialize();
} catch( Throwable t ) {
throw new IOException( t.getMessage() );
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common JniHandler.java
costin 02/04/25 11:20:33
Added: jk/java/org/apache/jk/common JniHandler.java
Log:
Add the code that is common the Shm and ChannelJni ( and soon ChannleUn ).
( I won't touch the stable code for socket and ajp13: Remy, relax :-)
Revision ChangesPath
1.1
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JniHandler.java
Index: JniHandler.java
===
/*
*
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
*any, must include the following acknowlegement:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowlegement may appear in the software itself,
*if and wherever such third-party acknowlegements normally appear.
*
* 4. The names The Jakarta Project, Tomcat, and Apache Software
*Foundation must not be used to endorse or promote products derived
*from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache
*nor may Apache appear in their names without prior written
*permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*
* [Additional notices, if required by prior licensing conditions]
*
*/
package org.apache.jk.common;
import java.io.*;
import java.net.*;
import java.util.*;
import org.apache.tomcat.util.buf.*;
import org.apache.tomcat.util.http.*;
import org.apache.tomcat.util.threads.*;
import org.apache.jk.core.*;
import org.apache.jk.apr.*;
/**
* Proxy for the Jk native component.
*
* @author Costin Manolache
*/
public class JniHandler extends JkHandler {
protected AprImpl apr;
// The native side handler
protected long nativeJkHandlerP;
protected String jkHome;
// Dispatch table codes. Hardcoded for now, will change when we have more
handlers.
public static final int JK_HANDLE_JNI_DISPATCH=0x15;
public static final int JK_HANDLE_SHM_DISPATCH=0x16;
public static final int MSG_NOTE=0;
public static final int C2B_NOTE=1;
public static final int MB_NOTE=2;
public JniHandler() {
}
/**
*/
public void setJkHome( String s ) {
jkHome=s;
}
/** You must call initNative() inside the component init()
*/
public void init() throws IOException {
// static field init, temp
}
protected void initNative(String nativeComponentName) {
apr=(AprImpl)wEnv.getHandler(apr);
if( apr==null || ! apr.isLoaded() ) {
log.error(No apr, disabling jni proxy );
return;
}
long xEnv=apr.getJkEnv();
nativeJkHandlerP=apr.getJkHandler(xEnv, nativeComponentName );
if( nativeJkHandlerP==0 ) {
log.info(Component not found,
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common ChannelJni.java
costin 02/04/25 11:22:54
Modified:jk/java/org/apache/jk/common ChannelJni.java
Log:
Remove the duplicated code ( that moved to the parent class, JniHandler ).
Use the new unified dispatch mechanism that will be used by all components
to communicate with the C code.
Revision ChangesPath
1.8 +15 -33
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelJni.java
Index: ChannelJni.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelJni.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChannelJni.java 18 Apr 2002 17:44:49 - 1.7
+++ ChannelJni.java 25 Apr 2002 18:22:54 - 1.8
@@ -77,22 +77,20 @@
*
* @author Costin Manolache
*/
-public class ChannelJni extends JkHandler {
+public class ChannelJni extends JniHandler {
int receivedNote=1;
-AprImpl apr;
-
+
public ChannelJni() {
// we use static for now, it's easier on the C side.
// Easy to change after we get everything working
}
public void init() throws IOException {
-// static field init, temp
-apr=(AprImpl)wEnv.getHandler(apr);
-if( apr==null || ! apr.isLoaded() ) {
-log.error(No apr, disabling jni channel );
-return;
-}
+super.initNative(channel.jni:jni);
+
+if( apr==null ) return;
+
+// We'll be called from C. This deals with that.
apr.addJkHandler( channelJni, this );
if( next==null ) {
if( nextName!=null )
@@ -123,32 +121,13 @@
public int send( Msg msg, MsgContext ep )
throws IOException
{
-byte buf[]=msg.getBuffer();
-
-// send and get the response
-if( log.isInfoEnabled() ) log.info( Sending packet );
-msg.end();
-
-// Assert: apr initialized
-// Will process the message in the current thread.
-// No wait needed to receive the response
-//
-int status=apr.sendPacket( ep.getJniEnv(), ep.getJniContext(),
- buf, msg.getLen() );
-
+int rc=super.nativeDispatch( msg, ep, JK_HANDLE_JNI_DISPATCH);
ep.setNote( receivedNote, msg );
-
-if( log.isInfoEnabled() ) log.info( Sending packet - done );
-return 0;
-}
+return rc;
+
-public MsgContext createMsgContext() {
-MsgContext mc=new MsgContext();
-mc.setMsg( 0, new MsgAjp());
-mc.setNext( this );
-return mc;
}
-
+
/** Receive a packet from the C side. This is called from the C
* code using invocation, but only for the first packet - to avoid
* recursivity and thread problems.
@@ -169,7 +148,10 @@
* if anyone asks for it - same lazy behavior as in 3.3 ).
*/
public int invoke(Msg msg, MsgContext ep ) throws IOException {
-System.err.println(ChannelJni.invoke: + ep );
+if( log.isDebugEnabled() ) log.debug(ChannelJni.invoke: + ep );
+
+if( apr==null ) return -1;
+
long xEnv=ep.getJniEnv();
long cEndpointP=ep.getJniContext();
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common ChannelUn.java
costin 02/04/25 11:24:18
Modified:jk/java/org/apache/jk/common ChannelUn.java
Log:
Add checks - if jni/apr is not available, nothing will happen at shutdown
( since nothing happened at startup )
Revision ChangesPath
1.15 +5 -3
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java
Index: ChannelUn.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChannelUn.java18 Apr 2002 19:12:36 - 1.14
+++ ChannelUn.java25 Apr 2002 18:24:18 - 1.15
@@ -182,9 +182,11 @@
public void destroy() throws IOException {
try {
-tp.shutdown();
-
-apr.unSocketClose(gPool, unixListenSocket,3);
+if( tp != null )
+tp.shutdown();
+
+if(apr !=null )
+apr.unSocketClose(gPool, unixListenSocket,3);
} catch(Exception e) {
e.printStackTrace();
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: 2 problems with Coyote and j-t-c/util
On Thu, 25 Apr 2002, Remy Maucherat wrote: 1) First one is: with the latest TC 4 code, JK 2 is throwing a NPE on shutdown (line 185 of ChannelUn); I don't see why it's broken, it was working fine very little ago. I'll commit a fix - if APR is not available ChannelUn should be inactive. The shutdown was missing the check of if(apr==null). We can disable ChannelUn and ChannelJni ( i.e. not even try to load them unless explicitely configured ), but I hope it won't be necesary. Thanks. I missed the change which triggered that, somehow. 2) Setting soTimeout doesn't do anything, apparently. I added some code in the PoolTcpEndpoint, and setSoTimeout is called on the socket with the right argument (2 ms in the default configuration). However, when trying with a telnet, I was able to keep the connection open for a lot more than 20s. The socket handling in the old connector appears to be very silimar, and yet it worked fine. What's going on ? I'll check that. I suppose you are talking about the HTTP connector or both ? In jk it seems to be a problem, as jk is setting SoTimeout directly. From what I know, after the socket is accepted setSocketOptions() is called and that should set everything. And setSocketOptions() does call the setSoTimeout with the right value (I added a sys.out there), and yet it doesn't appear to be doing anything. Strange. Indeed ;-) I ran out of ideas, so I called for help :) Thanks ! Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common Shm.java
costin 02/04/25 11:25:49
Modified:jk/java/org/apache/jk/common Shm.java
Log:
Update to use the new jni communication.
Started to add the main() and execute() to allow Shm to be called from
CLI and ant - to register remote tomcats.
Revision ChangesPath
1.4 +102 -55 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/Shm.java
Index: Shm.java
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/Shm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Shm.java 18 Apr 2002 22:59:20 - 1.3
+++ Shm.java 25 Apr 2002 18:25:49 - 1.4
@@ -72,21 +72,22 @@
import org.apache.jk.core.*;
import org.apache.jk.apr.*;
+import org.apache.tomcat.util.IntrospectionUtils;
+
/** Handle the shared memory objects.
*
* @author Costin Manolache
*/
-public class Shm extends JkHandler {
-
-String jkHome;
-String file;
-
-// Apr data.
-private long memP;
-private long aprShmPoolP;
-private long aprShmP;
-private AprImpl apr;
+public class Shm extends JniHandler {
+String file=/tmp/shm.file;
+int size;
+
+// Will be dynamic ( getMethodId() ) after things are stable
+static final int SHM_SET_ATTRIBUTE=0;
+static final int SHM_REGISTER_TOMCAT=2;
+static final int SHM_ATTACH=3;
+static final int SHM_DETACH=4;
public Shm() {
}
@@ -95,73 +96,119 @@
file=f;
}
-/**
- */
-public void setJkHome( String s ) {
-jkHome=s;
+public void setSize( int size ) {
+this.size=size;
}
public void init() throws IOException {
+super.initNative( shm );
if( file==null ) {
log.error(No shm file, disabling shared memory);
+apr=null;
return;
}
-try {
-apr=(AprImpl)wEnv.getHandler(apr);
-if( apr==null || ! apr.isLoaded() ) {
-log.error( Apr unavailable, disabling shared memory );
-apr=null;
-return;
-}
-aprShmPoolP=apr.poolCreate( 0 );
+// Set properties and call init.
+setNativeAttribute( file, file );
+if( size 0 )
+setNativeAttribute( size, Integer.toString( size ) );
+attach();
+}
-aprShmP= apr.shmAttach( aprShmPoolP, file );
+public void attach() throws IOException {
+MsgContext mCtx=createMsgContext();
+Msg msg=(Msg)mCtx.getMsg(0);
+msg.reset();
-if( aprShmP== 0 ) {
-// no shared mem. This is normal result, but create should throw
-log.info(Can't attach, try to create + file );
-aprShmP= apr.shmCreate( aprShmPoolP, 8196, file );
-
-}
-if( aprShmP== 0 ) {
-// no shared mem. This is normal result, but create should throw
-log.info(Can't create + file );
-return;
-}
+msg.appendByte( SHM_ATTACH );
+
+this.invoke( msg, mCtx );
+}
-long base=apr.shmBaseaddrGet( aprShmPoolP, aprShmP );
-long size=apr.shmSizeGet( aprShmPoolP, aprShmP );
+public void setNativeAttribute(String name, String val) throws IOException {
+MsgContext mCtx=createMsgContext();
+Msg msg=(Msg)mCtx.getMsg(0);
+C2BConverter c2b=(C2BConverter)mCtx.getNote(C2B_NOTE);
+msg.reset();
-log.info(Got shared memory at + base + + size );
+msg.appendByte( SHM_SET_ATTRIBUTE );
-byte b1[]=new byte[16];
-
-apr.shmRead( aprShmPoolP, base, b1, 0, b1.length );
-
-System.out.println(Read: + new String( b1 ));
-
-byte helloW[]=hello World.getBytes();
-
-apr.shmWrite( aprShmPoolP, base, helloW, 0, helloW.length );
-
-} catch( Throwable ex ) {
-log.error( Can't initialize shared memory + ex.toString() );
-apr=null;
-}
+appendString( msg, name, c2b);
+
+appendString(msg, val, c2b );
+
+this.invoke( msg, mCtx );
+}
+
+public void registerTomcat(String host, int port)
+throws IOException
+{
+MsgContext mCtx=createMsgContext();
+Msg msg=(Msg)mCtx.getMsg(0);
+msg.reset();
+C2BConverter c2b=(C2BConverter)mCtx.getNote(C2B_NOTE);
+
+String slotName=TOMCAT: + host + : + port;
+
+msg.appendByte( SHM_REGISTER_TOMCAT );
+appendString(
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/server JkCoyoteHandler.java
costin 02/04/25 11:27:18
Modified:jk/java/org/apache/jk/server JkCoyoteHandler.java
Log:
Call sendHeaders() in response ( that will set commited ) instead of directly
calling the action chain.
Also ( I couldn't resist ) moved the code that serializes the headers in a separate
( and more readable ) method.
Revision ChangesPath
1.17 +44 -39
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java
Index: JkCoyoteHandler.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- JkCoyoteHandler.java 24 Apr 2002 23:20:38 - 1.16
+++ JkCoyoteHandler.java 25 Apr 2002 18:27:18 - 1.17
@@ -171,10 +171,9 @@
// Send the connector a request for commit. The connector should
// then validate the headers, send them (using sendHeader) and
// set the filters accordingly.
-res.action(ActionCode.ACTION_COMMIT, null);
+res.sendHeaders();
}
-if( log.isInfoEnabled() )
-log.info(doWrite );
+if( log.isInfoEnabled() ) log.info(doWrite );
MsgContext ep=(MsgContext)res.getNote( epNote );
MsgAjp msg=(MsgAjp)ep.getNote( headersMsgNote );
@@ -232,6 +231,47 @@
return OK;
}
+private void appendHead(org.apache.coyote.Response res)
+throws IOException
+{
+if( log.isInfoEnabled() )
+log.info(COMMIT sending headers + res + + res.getMimeHeaders() );
+
+C2BConverter c2b=(C2BConverter)res.getNote( utfC2bNote );
+if( c2b==null ) {
+c2b=new C2BConverter( UTF8 );
+res.setNote( utfC2bNote, c2b );
+}
+
+MsgContext ep=(MsgContext)res.getNote( epNote );
+MsgAjp msg=(MsgAjp)ep.getNote( headersMsgNote );
+msg.reset();
+msg.appendByte(HandlerRequest.JK_AJP13_SEND_HEADERS);
+msg.appendInt( res.getStatus() );
+
+// s-b conversion, message
+msg.appendBytes( null );
+
+// XXX add headers
+
+MimeHeaders headers=res.getMimeHeaders();
+int numHeaders = headers.size();
+msg.appendInt(numHeaders);
+for( int i=0; inumHeaders; i++ ) {
+MessageBytes hN=headers.getName(i);
+// no header to sc conversion - there's little benefit
+// on this direction
+c2b.convert ( hN );
+msg.appendBytes( hN );
+
+MessageBytes hV=headers.getValue(i);
+c2b.convert( hV );
+msg.appendBytes( hV );
+}
+ep.setType( JkHandler.HANDLE_SEND_PACKET );
+ep.getSource().invoke( msg, ep );
+}
+
// Coyote Action implementation
public void action(ActionCode actionCode, Object param) {
@@ -243,42 +283,7 @@
if( log.isInfoEnabled() )
log.info(Response already commited );
} else {
-if( log.isInfoEnabled() )
-log.info(COMMIT sending headers + res + +
res.getMimeHeaders() );
-
-C2BConverter c2b=(C2BConverter)res.getNote( utfC2bNote );
-if( c2b==null ) {
-c2b=new C2BConverter( UTF8 );
-res.setNote( utfC2bNote, c2b );
-}
-
-MsgContext ep=(MsgContext)res.getNote( epNote );
-MsgAjp msg=(MsgAjp)ep.getNote( headersMsgNote );
-msg.reset();
-msg.appendByte(HandlerRequest.JK_AJP13_SEND_HEADERS);
-msg.appendInt( res.getStatus() );
-
-// s-b conversion, message
-msg.appendBytes( null );
-
-// XXX add headers
-
-MimeHeaders headers=res.getMimeHeaders();
-int numHeaders = headers.size();
-msg.appendInt(numHeaders);
-for( int i=0; inumHeaders; i++ ) {
-MessageBytes hN=headers.getName(i);
-// no header to sc conversion - there's little benefit
-// on this direction
-c2b.convert ( hN );
-msg.appendBytes( hN );
-
-MessageBytes
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_env.h
costin 02/04/25 11:37:44 Modified:jk/native2/include jk_env.h Log: Added a 'recycle' method. Obviously malloc is cheap in C ( but it does have some syncs ! ), but we need to preserve the jni 'global references' and maybe in future pin the jbyteArrays. Revision ChangesPath 1.13 +4 -5 jakarta-tomcat-connectors/jk/native2/include/jk_env.h Index: jk_env.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_env.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- jk_env.h 12 Apr 2002 21:49:03 - 1.12 +++ jk_env.h 25 Apr 2002 18:37:44 - 1.13 @@ -91,6 +91,7 @@ typedef struct jk_bean jk_bean_t; typedef struct jk_env jk_env_t; +extern struct jk_env *jk_env_globalEnv; /** * Factory used to create all jk objects. Factories are registered with @@ -184,13 +185,9 @@ * XXX Implement run-time change in the status/ctl workers. */ int ( JK_METHOD *setAttribute)(struct jk_env *env, struct jk_bean *bean, - char *name, void *value ); +char *name, void *value ); void * ( JK_METHOD *getAttribute)(struct jk_env *env, struct jk_bean *bean, char *name ); - -/* getBeanInfo() */ - -/* invoke() */ }; /** @@ -223,6 +220,8 @@ /** Release the env instance. The tmpPool will be recycled. */ int (JK_METHOD *releaseEnv)(struct jk_env *parent, struct jk_env *chld); + +int (JK_METHOD *recycleEnv)(struct jk_env *env); /* Exceptions */ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: JSP no reload
It is currently not an option to turn off checking out-of-date jsp pages that triggers recompilations. There has been some efforts recently at speeding up this area in jasper2 (Remy'work, Duncan's patch for timestamp cache, and my recent mods), so you may want to try jasper2 to see if performans better. I think a more useful options is to enable deployment of jsp pages without sources. I sure that'll break the spec though, so I don't know if that idea should be persued. Date: Wed, 24 Apr 2002 22:39:59 -0400 From: Samuel Gabriel [EMAIL PROTECTED] Subject: JSP no reload To: Tomcat Developers List [EMAIL PROTECTED] MIME-version: 1.0 X-MIMEOLE: Produced By Microsoft MimeOLE V6.00.2600. Importance: Normal X-Priority: 3 (Normal) X-MSMail-priority: Normal Delivered-to: mailing list [EMAIL PROTECTED] Mailing-List: contact [EMAIL PROTECTED]; run by ezmlm X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N List-Post: mailto:[EMAIL PROTECTED] List-Subscribe: mailto:[EMAIL PROTECTED] List-Unsubscribe: mailto:[EMAIL PROTECTED] List-Help: mailto:[EMAIL PROTECTED] List-Id: Tomcat Developers List tomcat-dev.jakarta.apache.org Hi All, Is there is a setting in Jasper to disable Tomcat from checking the timestamp on the page everytime there is a request? It seems important as the more include files are there in the JSP page the more checking that could happen, additionaly due to the nature of Java creating a File object and check the file system each time could be an expensive process. Regards Sam -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_global.h
costin 02/04/25 11:39:44
Modified:jk/native2/include jk_global.h
Log:
Make JK_OK consistent with APR_SUCCESS. Use similar error code.
I've also changed most of jk to use JK_OK/JK_ERR consistently. For a next
release it should use jkThrow() maybe, but for now the JK_TRUE was too
confusing.
Revision ChangesPath
1.8 +35 -5 jakarta-tomcat-connectors/jk/native2/include/jk_global.h
Index: jk_global.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_global.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_global.h 18 Apr 2002 22:55:36 - 1.7
+++ jk_global.h 25 Apr 2002 18:39:44 - 1.8
@@ -59,7 +59,7 @@
* Description: Global definitions and include files that should exist *
* anywhere *
* Author: Gal Shachor [EMAIL PROTECTED] *
- * Version: $Revision: 1.7 $ *
+ * Version: $Revision: 1.8 $ *
***/
#ifndef JK_GLOBAL_H
@@ -142,6 +142,39 @@
extern C {
#endif /* __cplusplus */
+/* We'll use APR whenever it's possible. However for a transition period and
+ for essential components we can build a minimal mod_jk without APR.
+*/
+
+#ifdef HAS_APR
+
+#include apr.h
+#include apr_errno.h
+
+#else
+
+/* No APR - define for forward/backward compatibility
+ */
+
+/* cutpaste from apr_errno.h */
+typedef int apr_status_t;
+#define APR_SUCCESS (0)
+#define APR_OS_START_USEERR 21000
+
+typedef unsigned char apr_byte_t;
+typedef short apr_int16_t;
+typedef unsigned short apr_uint16_t;
+typedef int apr_int32_t;
+typedef unsigned intapr_uint32_t;
+
+#endif
+
+#define JK_OK APR_SUCCESS
+#define JK_ERR APR_OS_START_USEERR
+/* Individual jk errors */
+
+#define JK_
+
/* Some compileers support 'inline'. How to guess ?
#define INLINE inline
*/
@@ -156,9 +189,6 @@
#define JK_WORKER_FILE_DEF (workers.properties)
#define JK_LOG_LEVEL_DEF(emerg)
-#define JK_OK (0)
-#define JK_ERR (1)
-
#define JK_TRUE (1)
#define JK_FALSE (0)
@@ -215,7 +245,7 @@
#define PATH_SEPARATOR_STR (:)
#define FILE_SEPARATOR_STR (/)
#define PATH_ENV_VARIABLE (LD_LIBRARY_PATH)
- #define HAVE_UNIXSOCKETS
+#define HAVE_UNIXSOCKETS
#endif
/*
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_handler.h
costin 02/04/25 11:40:37 Modified:jk/native2/include jk_handler.h Log: Make the handle() method work for both 'request' callbacaks and generic calls from java to C. Revision ChangesPath 1.7 +3 -3 jakarta-tomcat-connectors/jk/native2/include/jk_handler.h Index: jk_handler.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_handler.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jk_handler.h 12 Apr 2002 21:49:03 - 1.6 +++ jk_handler.h 25 Apr 2002 18:40:37 - 1.7 @@ -125,9 +125,9 @@ struct jk_env; typedef int (JK_METHOD *jk_handler_callback)(struct jk_env *env, - struct jk_msg *msg, - struct jk_ws_service *r, - struct jk_endpoint *ae); + void *target, + struct jk_endpoint *ae, + struct jk_msg *msg); struct jk_handler; typedef struct jk_handler jk_handler_t; -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_shm.h
costin 02/04/25 11:41:46
Modified:jk/native2/include jk_shm.h
Log:
Few improvements, expose the head, etc. Still far from completion.
Revision ChangesPath
1.3 +51 -6 jakarta-tomcat-connectors/jk/native2/include/jk_shm.h
Index: jk_shm.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_shm.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_shm.h 17 Apr 2002 22:46:35 - 1.2
+++ jk_shm.h 25 Apr 2002 18:41:46 - 1.3
@@ -73,26 +73,56 @@
struct jk_shm;
typedef struct jk_shm jk_shm_t;
+typedef struct jk_shm_slot jk_shm_slot_t;
+typedef struct jk_shm_head jk_shm_head_t;
+
+/* That's the default - should be enough for most cases.
+ 8k is what we use as the default packet size in ajp13, and 256
+ slots should be enough for now ( == 256 workers )
+ XXX implement the setters to override this
+*/
+#define DEFAULT_SLOT_SIZE 1024 * 8
+#define DEFAULT_SLOT_COUNT 256
+
+
+
/** Each shared memory slot has at least the following components.
*/
struct jk_shm_slot {
-/** Size of the segment */
-int size;
-
/** Version of the segment. Whoever writes it must change the
version after writing. Various components will check the version
and refresh if needed
*/
int ver;
-/** Name of the segment.
+/** Size of the segment */
+int size;
+
+/** Full name of the segment. type:localName convention.
*/
-char type[64];
+char name[64];
char data[1];
};
+
+
+struct jk_shm_head {
+struct jk_shm_slot slot;
+
+int slotSize;
+int slotMaxCount;
+
+/* Last used position. Increase ( at least atomically, eventually with mutexes )
+ each time a slot is created */
+int lastSlot;
+
+/* XXX Need a more generic mechanism */
+int lbVer;
+};
+
+
/**
* Shared memory support. This is similar with the scoreboard or jserv's worker
shm, but
* organized a bit more generic to support use of shm as a channel and to support
config
@@ -121,9 +151,14 @@
*/
int (*destroy)(struct jk_env *env, struct jk_shm *shm);
+/**
+ */
+int (*setWorkerEnv)( struct jk_env *env, struct jk_shm *shm,
+ struct jk_workerEnv *wEnv );
+
/** Get a shm slot. Each slot has different rules for synchronization, based on
type.
*/
-struct jk_shm_slot *(*getSlot)(struct jk_env *env, struct jk_shm *shm, char
*name, int size);
+struct jk_shm_slot *(*getSlot)(struct jk_env *env, struct jk_shm *shm, int pos);
/** Create a slot. This typically involves inter-process synchronization.
*/
@@ -132,7 +167,17 @@
/** Get an ID that is unique across processes.
*/
int (*getId)(struct jk_env *env, struct jk_shm *shm);
+
+int size;
+
+int slotSize;
+int slotMaxCount;
+
+void *image;
+
+struct jk_shm_head *head;
+
/* Private data */
void *privateData;
};
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_worker.h
costin 02/04/25 11:43:29 Modified:jk/native2/include jk_worker.h Log: Added a 'version' and a critical section for updates. The workers are updated by lb/shm when a change is detected in the scoreboard. That need only in-process thread synchronization. ( we could use apr - but the CS is working fine for now ) Revision ChangesPath 1.16 +8 -1 jakarta-tomcat-connectors/jk/native2/include/jk_worker.h Index: jk_worker.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_worker.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- jk_worker.h 15 Apr 2002 23:46:01 - 1.15 +++ jk_worker.h 25 Apr 2002 18:43:29 - 1.16 @@ -58,7 +58,7 @@ /*** * Description: Workers controller header file * * Author: Gal Shachor [EMAIL PROTECTED] * - * Version: $Revision: 1.15 $ * + * Version: $Revision: 1.16 $ * ***/ #ifndef JK_WORKER_H @@ -179,6 +179,13 @@ * which this worker is in error state and can't perform. */ struct jk_exception *lastError; + +/* 'Version' or generation. Used to update the workers dynamically + at runtime */ +int ver; +/* Only one thread can update the config + */ +JK_CRIT_SEC cs; /** For load balancing workers */ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_workerEnv.h
costin 02/04/25 11:44:41 Modified:jk/native2/include jk_workerEnv.h Log: Simplified the registration of ajp handlers. Moved the hadnler definition to workerEnv. We'll eventually move to a dynamic mechanism ( instead of hardcoded values ), but later. Revision ChangesPath 1.16 +40 -3 jakarta-tomcat-connectors/jk/native2/include/jk_workerEnv.h Index: jk_workerEnv.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_workerEnv.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- jk_workerEnv.h11 Apr 2002 19:28:01 - 1.15 +++ jk_workerEnv.h25 Apr 2002 18:44:37 - 1.16 @@ -58,7 +58,7 @@ /*** * Description: Workers controller header file * * Author: Gal Shachor [EMAIL PROTECTED] * - * Version: $Revision: 1.15 $ * + * Version: $Revision: 1.16 $ * ***/ #ifndef JK_WORKERENV_H @@ -92,6 +92,39 @@ struct jk_handler; struct jk_ws_service; +/* Temporary hardcoded handler IDs. Will be replaced with a name based dynamic mechanism */ + +/* Write a body chunk from the servlet container to the web server */ +#define JK_HANDLE_AJP13_SEND_BODY_CHUNK3 + +/* Send response headers from the servlet container to the web server. */ +#define JK_HANDLE_AJP13_SEND_HEADERS 4 + +/* Marks the end of response. */ +#define JK_HANDLE_AJP13_GET_BODY_CHUNK 6 + +/* Marks the end of response. */ +#define JK_HANDLE_AJP13_END_RESPONSE 5 + +/* Second Login Phase (servlet engine - web server), md5 seed is received */ +#define JK_HANDLE_LOGON_SEED 0x11 + +/* Login Accepted (servlet engine - web server) */ +#define JK_HANDLE_LOGON_OK 0x13 + +/* Login Rejected (servlet engine - web server) */ +#define JK_HANDLE_LOGON_ERR 0x14 + +/* Dispatcher for jni channel ( JNI - web server ) */ +#define JK_HANDLE_JNI_DISPATCH 0x15 + +/* Dispatcher for shm ( JNI - web server ) */ +#define JK_HANDLE_SHM_DISPATCH 0x16 + +/* Dispatcher for apr channel ( JNI - web server ) */ +#define JK_HANDLE_CHANNELAPR_DISPATCH 0x17 + + /* * Jk configuration and global methods. * @@ -215,9 +248,13 @@ /* Methods */ +/* Register a callback handler, for methods from java to C + */ int (*registerHandler)(struct jk_env *env, struct jk_workerEnv *_this, - struct jk_handler *h); + const char *type, const char *name, int id, + jk_handler_callback callback, + char *signature); int (*addWorker)(struct jk_env *env, @@ -234,7 +271,7 @@ /** Call the handler associated with the message type. */ int (*dispatch)(struct jk_env *env, struct jk_workerEnv *_this, -struct jk_endpoint *e, struct jk_ws_service *r ); +void *target, struct jk_endpoint *ep, int code, struct jk_msg *msg); /** Utility method for stream-based workers. It'll read * messages, dispatch, send the response if any until -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_apr_socket.c
costin 02/04/25 11:46:38
Modified:jk/native2/common jk_channel_apr_socket.c
Log:
Change return types and error handling
Revision ChangesPath
1.9 +35 -27
jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c
Index: jk_channel_apr_socket.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_channel_apr_socket.c 20 Apr 2002 22:53:43 - 1.8
+++ jk_channel_apr_socket.c 25 Apr 2002 18:46:38 - 1.9
@@ -148,9 +148,9 @@
socketInfo-host=value;
socketInfo-type=AF_UNIX;
} else {
-return JK_FALSE;
+return JK_ERR;
}
-return JK_TRUE;
+return JK_OK;
}
/** resolve the host IP ( jk_resolve ) and initialize the channel.
@@ -188,7 +188,7 @@
socketInfo-host=DEFAULT_HOST;
rc=jk2_channel_apr_resolve( env, socketInfo-host, socketInfo-port, socketInfo
);
-if( rc!= JK_TRUE ) {
+if( rc!= JK_OK ) {
env-l-jkLog(env, env-l, JK_LOG_ERROR, jk2_channel_apr_init:
can't resolve %s:%d errno=%d\n, socketInfo-host,
socketInfo-port, errno );
}
@@ -220,15 +220,18 @@
} else
#endif
{
+int err;
+
rc-type = TYPE_NET;
env-l-jkLog(env, env-l, JK_LOG_INFO,
channelApr.resolve(): create AF_NET %s %d\n, host, port );
-if ( apr_sockaddr_info_get(rc-addr, host, APR_UNSPEC, port, 0,
-(apr_pool_t *)env-globalPool-_private)!=APR_SUCCESS) {
-return JK_FALSE;
+err=apr_sockaddr_info_get(rc-addr, host, APR_UNSPEC, port, 0,
+ (apr_pool_t *)env-globalPool-_private);
+if ( err != APR_SUCCESS) {
+return err;
}
}
-return JK_TRUE;
+return JK_OK;
}
@@ -255,6 +258,9 @@
int unixsock;
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ channelApr.open(): can't create socket \n);
+
/* UNIX socket (to be moved in APR) */
if (socketInfo-type==TYPE_UNIX) {
unixsock = socket(AF_UNIX, SOCK_STREAM, 0);
@@ -262,7 +268,7 @@
env-l-jkLog(env, env-l, JK_LOG_ERROR,
channelApr.open(): can't create socket %d %s\n,
errno, strerror( errno ) );
-return JK_FALSE;
+return JK_ERR;
}
env-l-jkLog(env, env-l, JK_LOG_INFO,
channelApr.open(): create unix socket %s %d\n,
socketInfo-host, unixsock );
@@ -272,7 +278,7 @@
env-l-jkLog(env, env-l, JK_LOG_ERROR,
channelApr.connect() connect failed %d %s\n,
errno, strerror( errno ) );
-return JK_FALSE;
+return JK_ERR;
}
env-l-jkLog(env, env-l, JK_LOG_INFO,
channelApr.open(): connect unix socket %d %s\n, unixsock,
socketInfo-host );
@@ -286,7 +292,7 @@
sd-unixsock = unixsock;
sd-type = socketInfo-type;
-return JK_TRUE;
+return JK_OK;
}
#endif
@@ -297,7 +303,7 @@
env-l-jkLog(env, env-l, JK_LOG_ERROR,
channelApr.open(): can't create socket %d %s\n,
errno, strerror( errno ) );
-return JK_FALSE;
+return JK_ERR;
}
env-l-jkLog(env, env-l, JK_LOG_INFO,
channelApr.open(): create tcp socket %d\n, sock );
@@ -306,7 +312,7 @@
env-l-jkLog(env, env-l, JK_LOG_ERROR,
channelApr.open(): can't set timeout %d %s\n,
errno, strerror( errno ) );
-return JK_FALSE;
+return JK_ERR;
}
/* Tries to connect to JServ (continues trying while error is EINTR) */
@@ -326,7 +332,7 @@
env-l-jkLog(env, env-l, JK_LOG_ERROR,
channelApr.connect() connect failed %d %s\n,
ret, apr_strerror( ret, msg, sizeof(msg) ) );
-return JK_FALSE;
+return JK_ERR;
}
/* XXX needed?
@@ -349,7 +355,7 @@
sd-sock = sock;
sd-type = socketInfo-type; /* APR should handle it. */
-return JK_TRUE;
+return JK_OK;
}
@@ -359,9 +365,11 @@
jk_endpoint_t *endpoint)
{
apr_socket_t *sd;
+apr_status_t *rc;
+
jk_channel_apr_data_t *chD=endpoint-channelData;
if( chD==NULL )
-return JK_FALSE;
+return JK_ERR;
#ifdef HAVE_UNIXSOCKETS
if (chD-type==TYPE_UNIX) {
@@ -374,10 +382,8 @@
/* nothing else
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_jni.c
costin 02/04/25 11:48:13
Modified:jk/native2/common jk_channel_jni.c
Log:
Fix error handling.
Remove duplicated code ( now all dispatching is done consistently in jni/ ).
Revision ChangesPath
1.10 +48 -160 jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c
Index: jk_channel_jni.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_channel_jni.c 15 Apr 2002 23:52:41 - 1.9
+++ jk_channel_jni.c 25 Apr 2002 18:48:13 - 1.10
@@ -104,14 +104,14 @@
jk_bean_t *mbean,
char *name, void *value)
{
-return JK_TRUE;
+return JK_OK;
}
static int JK_METHOD jk2_channel_jni_init(jk_env_t *env,
jk_channel_t *_this)
{
-return JK_TRUE;
+return JK_OK;
}
/** Assume the jni-worker or someone else started
@@ -133,7 +133,7 @@
if( endpoint-channelData != NULL ) {
env-l-jkLog(env, env-l, JK_LOG_INFO,
channel_jni.open() already open, nothing else to do\n);
-return JK_TRUE;
+return JK_OK;
}
env-l-jkLog(env, env-l, JK_LOG_INFO,channel_jni.init(): \n );
@@ -142,14 +142,14 @@
if( jniCh-vm == NULL ) {
env-l-jkLog(env, env-l, JK_LOG_INFO,
channel_jni.open() no VM found\n );
-return JK_FALSE;
+return JK_ERR;
}
jniEnv = (JNIEnv *)jniCh-vm-attach( env, jniCh-vm );
if( jniEnv == NULL ) {
env-l-jkLog(env, env-l, JK_LOG_INFO,
channel_jni.open() can't attach\n );
-return JK_FALSE;
+return JK_ERR;
}
/* Create the buffers used by the write method. We allocate a
byte[] and jbyte[] - I have no idea what's more expensive,
@@ -174,7 +174,7 @@
if( jniCh-jniBridge == NULL ) {
env-l-jkLog(env, env-l, JK_LOG_INFO,
channel_jni.open() can't find %s\n,jniCh-className );
-return JK_FALSE;
+return JK_ERR;
}
@@ -191,7 +191,7 @@
if( jmethod == NULL ) {
env-l-jkLog(env, env-l, JK_LOG_INFO,
channel_jni.open() can't find createJavaContext\n);
-return JK_FALSE;
+return JK_ERR;
}
jstr=(*jniEnv)-NewStringUTF(jniEnv, channelJni );
@@ -199,13 +199,13 @@
jobj=(*jniEnv)-CallStaticObjectMethod( jniEnv, jniCh-jniBridge,
jmethod,
jstr,
-(jlong)(long)(void *)endpoint );
+(jlong)(long)(void *)endpoint-mbean );
if( jobj == NULL ) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
channel_jni.open() Can't create java context\n );
epData-jniJavaContext=NULL;
-return JK_FALSE;
+return JK_ERR;
}
epData-jniJavaContext=(*jniEnv)-NewGlobalRef( jniEnv, jobj );
@@ -220,7 +220,7 @@
if( jmethod == NULL ) {
env-l-jkLog(env, env-l, JK_LOG_INFO,
channel_jni.open() can't find getBuffer\n);
-return JK_FALSE;
+return JK_ERR;
}
epData-jarray=(*jniEnv)-CallStaticObjectMethod( jniEnv, jniCh-jniBridge,
@@ -244,7 +244,7 @@
if( jniCh-writeMethod == NULL ) {
env-l-jkLog(env, env-l, JK_LOG_EMERG,
channel_jni.open() can't find jniInvoke\n);
-return JK_FALSE;
+return JK_ERR;
}
env-l-jkLog(env, env-l, JK_LOG_INFO,
@@ -255,7 +255,7 @@
* closing in order for this to work )
*/
/* jniCh-vm-detach( env, jniCh-vm ); */
-return JK_TRUE;
+return JK_OK;
}
@@ -271,7 +271,7 @@
/* (*jniEnv)-DeleteGlobalRef( jniEnv, epData-msgJ ); */
/* (*jniEnv)-DeleteGlobalRef( jniEnv, epData-jniJavaContext ); */
-return JK_TRUE;
+return JK_OK;
}
@@ -313,7 +313,7 @@
if( epData-jniJavaContext == NULL ) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,channel_jni.send() no java
context\n );
-return JK_FALSE;
+return JK_ERR;
}
msg-end( env, msg );
@@ -328,7 +328,7 @@
if( jniCh-writeMethod == NULL ) {
env-l-jkLog(env, env-l, JK_LOG_EMERG,
channel_jni.send() no write method\n );
-return JK_FALSE;
+return JK_ERR;
}
if( jniEnv==NULL ) {
/* Try first getEnv, then
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_socket.c jk_config.c
costin 02/04/25 11:49:37
Modified:jk/native2/common jk_channel_socket.c jk_config.c
Log:
Update return codes.
Revision ChangesPath
1.20 +16 -16jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c
Index: jk_channel_socket.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jk_channel_socket.c 12 Apr 2002 21:49:03 - 1.19
+++ jk_channel_socket.c 25 Apr 2002 18:49:37 - 1.20
@@ -131,9 +131,9 @@
} else if( strcmp( port, name ) == 0 ) {
socketInfo-port=atoi( value );
} else {
- return JK_FALSE;
+ return JK_ERR;
}
-return JK_TRUE;
+return JK_OK;
}
/** resolve the host IP ( jk_resolve ) and initialize the channel.
@@ -180,7 +180,7 @@
socketInfo-host=DEFAULT_HOST;
rc=jk2_channel_socket_resolve( env, socketInfo-host, socketInfo-port,
socketInfo-addr );
-if( rc!= JK_TRUE ) {
+if( rc!= JK_OK ) {
env-l-jkLog(env, env-l, JK_LOG_ERROR, jk2_channel_socket_init:
can't resolve %s:%d errno=%d\n, socketInfo-host,
socketInfo-port, errno );
}
@@ -213,7 +213,7 @@
/* If we found also characters we use gethostbyname()*/
struct hostent *hoste = gethostbyname(host);
if(!hoste) {
-return JK_FALSE;
+return JK_ERR;
}
laddr = ((struct in_addr *)hoste-h_addr_list[0])-s_addr;
@@ -223,7 +223,7 @@
}
memcpy((rc-sin_addr), laddr , sizeof(laddr));
-return JK_TRUE;
+return JK_OK;
}
static int jk2_close_socket(jk_env_t *env, int s)
@@ -268,7 +268,7 @@
env-l-jkLog(env, env-l, JK_LOG_ERROR,
channelSocket.open(): can't create socket %d %s\n,
errno, strerror( errno ) );
-return JK_FALSE;
+return JK_ERR;
}
/* Tries to connect to JServ (continues trying while error is EINTR) */
@@ -292,7 +292,7 @@
env-l-jkLog(env, env-l, JK_LOG_ERROR,
channelSocket.connect() connect failed %s:%d %d %s \n,
socketInfo-host, socketInfo-port, errno, strerror( errno )
);
-return JK_FALSE;
+return JK_ERR;
}
if(ndelay) {
@@ -313,7 +313,7 @@
}
sd-sock=sock;
}
-return JK_TRUE;
+return JK_OK;
}
@@ -325,7 +325,7 @@
int sd;
jk_channel_socket_data_t *chD=endpoint-channelData;
if( chD==NULL )
- return JK_FALSE;
+ return JK_ERR;
sd=chD-sock;
chD-sock=-1;
@@ -357,7 +357,7 @@
jk_channel_socket_data_t *chD=endpoint-channelData;
if( chD==NULL )
- return JK_FALSE;
+ return JK_ERR;
msg-end( env, msg );
len=msg-len;
@@ -376,7 +376,7 @@
sent += this_time;
}
/* return sent; */
-return JK_TRUE;
+return JK_OK;
}
@@ -398,7 +398,7 @@
int rdlen;
if( chD==NULL )
- return JK_FALSE;
+ return JK_ERR;
sd=chD-sock;
rdlen = 0;
@@ -451,7 +451,7 @@
if( blen 0 ) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
channelSocket.receive(): Bad header\n );
-return JK_FALSE;
+return JK_ERR;
}
rc= jk2_channel_socket_readN( env, ch, endpoint, msg-buf + hlen, blen);
@@ -460,13 +460,13 @@
env-l-jkLog(env, env-l, JK_LOG_ERROR,
channelSocket.receive(): Error receiving message body %d %d\n,
rc, errno);
-return JK_FALSE;
+return JK_ERR;
}
env-l-jkLog(env, env-l, JK_LOG_INFO,
channelSocket.receive(): Received len=%d type=%d\n,
blen, (int)msg-buf[hlen]);
-return JK_TRUE;
+return JK_OK;
}
@@ -499,5 +499,5 @@
ch-workerEnv=env-getByName( env, workerEnv );
ch-workerEnv-addChannel( env, ch-workerEnv, ch );
-return JK_TRUE;
+return JK_OK;
}
1.12 +31 -31jakarta-tomcat-connectors/jk/native2/common/jk_config.c
Index: jk_config.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_config.c 12 Apr 2002 23:08:45 - 1.11
+++ jk_config.c 25 Apr 2002 18:49:37 - 1.12
@@ -58,7 +58,7 @@
/***
* Description: General purpose config object
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_endpoint.c jk_logger_file.c
costin 02/04/25 11:50:22
Modified:jk/native2/common jk_endpoint.c jk_logger_file.c
Log:
Update return codes.
Revision ChangesPath
1.8 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_endpoint.c
Index: jk_endpoint.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_endpoint.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_endpoint.c 12 Apr 2002 21:49:03 - 1.7
+++ jk_endpoint.c 25 Apr 2002 18:50:22 - 1.8
@@ -97,7 +97,7 @@
if (e==NULL) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
endpoint.factory() OutOfMemoryException\n);
-return JK_FALSE;
+return JK_ERR;
}
e-pool = endpointPool;
@@ -121,5 +121,5 @@
result-object = e;
e-mbean=result;
-return JK_TRUE;
+return JK_OK;
}
1.20 +10 -10jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c
Index: jk_logger_file.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jk_logger_file.c 24 Apr 2002 23:12:50 - 1.19
+++ jk_logger_file.c 25 Apr 2002 18:50:22 - 1.20
@@ -59,7 +59,7 @@
* Description: Utility functions (mainly configuration) *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Author: Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.19 $ *
+ * Version: $Revision: 1.20 $ *
***/
#include jk_env.h
@@ -107,7 +107,7 @@
/* This is usefull to debug what happens before logger is set.
On apache you need -X option ( no detach, single process ) */
printf(%s, what );
-return JK_TRUE;
+return JK_OK;
}
if(l l-level = level l-logger_private what) {
unsigned sz = strlen(what);
@@ -117,10 +117,10 @@
fflush(f);
}
-return JK_TRUE;
+return JK_OK;
}
-return JK_FALSE;
+return JK_ERR;
}
int jk2_logger_file_parseLogLevel(jk_env_t *env, const char *level)
@@ -160,7 +160,7 @@
if(f==NULL) {
_this-jkLog(env, _this,JK_LOG_ERROR,
Can't open log file %s\n, _this-name );
-return JK_FALSE;
+return JK_ERR;
}
_this-jkLog(env, _this,JK_LOG_ERROR,
Initializing log file %s\n, _this-name );
@@ -168,20 +168,20 @@
if( oldF!=NULL ) {
fclose( oldF );
}
-return JK_TRUE;
+return JK_OK;
}
static int jk2_logger_file_close(jk_env_t *env,jk_logger_t *_this)
{
FILE *f = _this-logger_private;
-if( f==NULL ) return JK_TRUE;
+if( f==NULL ) return JK_OK;
fflush(f);
fclose(f);
_this-logger_private=NULL;
/* free(_this); */
-return JK_TRUE;
+return JK_OK;
}
static int JK_METHOD
@@ -307,7 +307,7 @@
jk_logger_t *l = (jk_logger_t *)pool-alloc(env, pool, sizeof(jk_logger_t));
if(l==NULL ) {
-return JK_FALSE;
+return JK_ERR;
}
l-log = jk2_logger_file_log;
@@ -323,6 +323,6 @@
l-mbean=result;
result-setAttribute = jk2_logger_file_setProperty;
-return JK_TRUE;
+return JK_OK;
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_objCache.c jk_pool.c
costin 02/04/25 11:51:15
Modified:jk/native2/common jk_objCache.c jk_pool.c
Log:
Update rc.
Revision ChangesPath
1.6 +9 -9 jakarta-tomcat-connectors/jk/native2/common/jk_objCache.c
Index: jk_objCache.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_objCache.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_objCache.c 21 Feb 2002 11:12:11 - 1.5
+++ jk_objCache.c 25 Apr 2002 18:51:15 - 1.6
@@ -70,7 +70,7 @@
int rc;
if(_this-size = 0 )
-return JK_FALSE;
+return JK_ERR;
JK_ENTER_CS(_this-cs, rc);
@@ -96,14 +96,14 @@
}
JK_LEAVE_CS(_this-cs, rc);
-if(rc) {
+if(rc==JK_TRUE) {
/* l-jkLog(l, JK_LOG_DEBUG, Return endpoint to pool\n); */
-return JK_TRUE;
+return JK_OK;
}
}
/* Can't enter CS */
-return JK_FALSE;
+return JK_ERR;
}
static int
@@ -123,16 +123,16 @@
sizeof(void *) * _this-size);
if( _this-data==NULL )
-return JK_FALSE;
+return JK_ERR;
JK_INIT_CS((_this-cs), i);
if (!i) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
objCache.create(): Can't init CS\n);
-return JK_FALSE;
+return JK_ERR;
}
-return JK_TRUE;
+return JK_OK;
}
static int
@@ -144,7 +144,7 @@
_this-count=0;
/* Nothing to free, we use pools */
-return JK_TRUE;
+return JK_OK;
}
@@ -155,7 +155,7 @@
void *ae=NULL;
JK_ENTER_CS(_this-cs, rc);
-if (rc) {
+if (rc==JK_TRUE) {
if( _this-count 0 ) {
_this-count--;
ae=_this-data[ _this-count ];
1.9 +3 -3 jakarta-tomcat-connectors/jk/native2/common/jk_pool.c
Index: jk_pool.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_pool.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_pool.c 12 Apr 2002 00:01:06 - 1.8
+++ jk_pool.c 25 Apr 2002 18:51:15 - 1.9
@@ -58,7 +58,7 @@
/***
* Description: Simple memory pool *
* Author: Gal Shachor [EMAIL PROTECTED] *
- * Version: $Revision: 1.8 $ *
+ * Version: $Revision: 1.9 $ *
***/
#include jk_pool.h
@@ -143,7 +143,7 @@
*newPool = _this;
-return JK_TRUE;
+return JK_OK;
}
static jk_pool_t *jk2_pool_createChild( jk_env_t *env, jk_pool_t *parent, int size
) {
@@ -328,7 +328,7 @@
*result=_this;
-return JK_TRUE;
+return JK_OK;
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_env.c
costin 02/04/25 12:12:58
Modified:jk/native2/common jk_env.c
Log:
Added the recycle.
jk_env has now some extra printf() debugging to test it's use from
java, will go away soon.
Revision ChangesPath
1.19 +27 -5 jakarta-tomcat-connectors/jk/native2/common/jk_env.c
Index: jk_env.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_env.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_env.c 12 Apr 2002 21:49:03 - 1.18
+++ jk_env.c 25 Apr 2002 19:12:57 - 1.19
@@ -74,9 +74,11 @@
*/
jk_env_t* JK_METHOD jk2_env_getEnv( char *id, jk_pool_t *pool ) {
if( jk_env_globalEnv == NULL ) {
+ if( pool == NULL ) return NULL;
jk_env_globalEnv=(jk_env_t *)pool-calloc( NULL, pool, sizeof( jk_env_t ));
jk_env_globalEnv-globalPool = pool;
jk2_env_initEnv( (jk_env_t *)jk_env_globalEnv, id );
+ fprintf( stderr, env: top level env %p\n, jk_env_globalEnv);
}
return jk_env_globalEnv;
}
@@ -113,17 +115,25 @@
env-globalPool=parentEnv-globalPool;
env-envCache=parentEnv-envCache;
-fprintf( stderr, Create env %d\n, env-id);
+fprintf( stderr, env:Create child env %p %p\n, parentEnv, env);
}
return env;
}
/** Release the env ( clean and recycle )
*/
+static int JK_METHOD jk2_env_recycleEnv( jk_env_t *env )
+{
+env-tmpPool-reset(env, env-tmpPool);
+env-jkClearException(env);
+return JK_OK;
+}
+
+/** Release the env ( clean and recycle )
+ */
static int JK_METHOD jk2_env_put( jk_env_t *parent, jk_env_t *chld )
{
-chld-tmpPool-reset(parent, chld-tmpPool);
-chld-jkClearException(chld);
+jk2_env_recycleEnv( chld );
return parent-envCache-put( parent, parent-envCache, chld);
}
@@ -225,13 +235,19 @@
fac( env, workerPool, result, result-type, result-name );
if( result-object==NULL ) {
-if( env-l )
+if( env-l ) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
env.createBean2(): Factory error creating %s ( %s,
%s)\n, name,
type, localName);
+} else {
+fprintf(stderr, env.createBean2(): Factory error creating %s ( %s,
%s)\n, name,
+type, localName);
+}
return NULL;
}
+fprintf(stderr,env.createBean2(): register %s %p\n, result-name,
result-object);
+
jk_env_globalEnv-_objects-put( env, jk_env_globalEnv-_objects, result-name,
result, NULL );
if( strcmp(localName,)==0 ) {
@@ -259,6 +275,7 @@
return ;
}
+fprintf(stderr,env.alias(): alias %s %s\n, name, alias);
jk_env_globalEnv-_objects-put( env, jk_env_globalEnv-_objects, alias, jkb,
NULL );
}
@@ -268,8 +285,12 @@
{
jk_bean_t *result=env-getBean( env, name );
-if( result==NULL ) return NULL;
+if( result==NULL ) {
+fprintf(stderr,env.alias(): Can't find %p %s\n, env, name);
+return NULL;
+}
+fprintf(stderr,env.alias(): Get by name %s %p\n, name, result-object);
return result-object;
}
@@ -380,6 +401,7 @@
env-createBean= jk2_env_createBean;
env-alias= jk2_env_alias;
env-getEnv= jk2_env_get;
+env-recycleEnv= jk2_env_recycleEnv;
env-releaseEnv= jk2_env_put;
env-jkClearException=jk_env_jkClearException;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_handler_logon.c jk_handler_response.c
costin 02/04/25 12:14:31
Modified:jk/native2/common jk_handler_logon.c jk_handler_response.c
Log:
Update rc, use the simpler registration for handlers and the new signature.
Revision ChangesPath
1.14 +23 -51jakarta-tomcat-connectors/jk/native2/common/jk_handler_logon.c
Index: jk_handler_logon.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_handler_logon.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jk_handler_logon.c12 Apr 2002 21:49:03 - 1.13
+++ jk_handler_logon.c25 Apr 2002 19:14:31 - 1.14
@@ -58,7 +58,7 @@
/**
* Description: AJP14 Login handler
* Author: Henri Gomez [EMAIL PROTECTED]
- * Version: $Revision: 1.13 $
+ * Version: $Revision: 1.14 $
*/
#include jk_global.h
@@ -74,25 +74,10 @@
/* Private definitions */
/*
- * Second Login Phase (servlet engine - web server), md5 seed is received
- */
-#define AJP14_LOGSEED_CMD(unsigned char)0x11
-
-/*
* Third Login Phase (web server - servlet engine), md5 of seed + secret is sent
*/
#define AJP14_LOGCOMP_CMD(unsigned char)0x12
-/*
- * Login Accepted (servlet engine - web server)
- */
-#define AJP14_LOGOK_CMD (unsigned char)0x13
-
-/*
- * Login Rejected (servlet engine - web server), will be logged
- */
-#define AJP14_LOGNOK_CMD (unsigned char)0x14
-
/* web-server want context info after login */
#define AJP14_CONTEXT_INFO_NEG 0x8000
@@ -119,8 +104,8 @@
* String serverName
*
*/
-static int JK_METHOD jk2_handler_login(jk_env_t *env, jk_msg_t *msg,
-jk_ws_service_t *s, jk_endpoint_t *ae)
+static int JK_METHOD jk2_handler_login(jk_env_t *env, void *target,
+ jk_endpoint_t *ae, jk_msg_t *msg )
{
int rc;
char *entropy;
@@ -150,12 +135,12 @@
Into ajp14_marshal_login_comp_into_msgb\n);
rc=msg-appendByte( env, msg, AJP14_LOGCOMP_CMD);
-if (rc!=JK_TRUE )
+if (rc!=JK_OK )
return JK_HANDLER_FATAL;
/* COMPUTED-SEED */
rc= msg-appendString( env, msg, (const unsigned char *)computedKey);
-if( rc!=JK_TRUE ) {
+if( rc!=JK_OK ) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
handler.loginSecret() error serializing computed secret\n);
return JK_HANDLER_FATAL;
@@ -166,7 +151,7 @@
rc=msg-appendString(env, msg, ae-worker-workerEnv-server_name);
-if ( rc != JK_TRUE)
+if ( rc != JK_OK)
return JK_HANDLER_FATAL;
return JK_HANDLER_RESPONSE;
@@ -182,8 +167,8 @@
* +++---
*
*/
-static int JK_METHOD jk2_handler_logok(jk_env_t *env, jk_msg_t *msg,
-jk_ws_service_t *s, jk_endpoint_t *ae )
+static int JK_METHOD jk2_handler_logok(jk_env_t *env, void *target,
+ jk_endpoint_t *ae, jk_msg_t *msg )
{
unsigned long nego;
char *sname;
@@ -229,8 +214,8 @@
* +-+---+
*
*/
-static int JK_METHOD jk2_handler_lognok(jk_env_t *env, jk_msg_t *msg,
- jk_ws_service_t *s, jk_endpoint_t *ae )
+static int JK_METHOD jk2_handler_lognok(jk_env_t *env, void *target,
+jk_endpoint_t *ae, jk_msg_t *msg )
{
unsigned long status;
@@ -245,31 +230,18 @@
int JK_METHOD jk2_handler_logon_init( jk_env_t *env, jk_handler_t *_this,
jk_workerEnv_t *wEnv)
{
-jk_pool_t *pool=wEnv-pool;
-jk_handler_t *h;
-
-h=(jk_handler_t *)pool-calloc( env, pool, sizeof( jk_handler_t));
-h-name=login;
-h-messageId=AJP14_LOGSEED_CMD;
-h-callback=jk2_handler_login;
-h-workerEnv=wEnv;
-wEnv-registerHandler( env, wEnv, h );
-
-h=(jk_handler_t *)pool-calloc( env, pool, sizeof( jk_handler_t));
-h-name=logOk;
-h-messageId=AJP14_LOGOK_CMD;
-h-callback=jk2_handler_logok;
-h-workerEnv=wEnv;
-wEnv-registerHandler( env, wEnv, h );
-
-h=(jk_handler_t *)pool-calloc( env, pool, sizeof( jk_handler_t));
-h-name=logNok;
-h-messageId=AJP14_LOGNOK_CMD;
-h-callback=jk2_handler_lognok;
-h-workerEnv=wEnv;
-wEnv-registerHandler( env, wEnv, h );
-
-return JK_TRUE;
+wEnv-registerHandler( env, wEnv, handler.logon,
+ login, JK_HANDLE_LOGON_SEED,
+ jk2_handler_login, NULL );
+
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_map.h
costin 02/04/25 12:16:14
Modified:jk/native2/common jk_map.c
jk/native2/include jk_map.h
Log:
Update rc. Added 2 debug fields - so we can see the content of the
map in gdb.
Revision ChangesPath
1.18 +24 -22jakarta-tomcat-connectors/jk/native2/common/jk_map.c
Index: jk_map.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_map.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jk_map.c 20 Apr 2002 22:57:16 - 1.17
+++ jk_map.c 25 Apr 2002 19:16:14 - 1.18
@@ -58,7 +58,7 @@
/***
* Description: General purpose map object *
* Author: Gal Shachor [EMAIL PROTECTED] *
- * Version: $Revision: 1.17 $ *
+ * Version: $Revision: 1.18 $ *
***/
#include jk_global.h
@@ -103,12 +103,12 @@
const char *name, void *value,
void **old)
{
-int rc = JK_FALSE;
+int rc = JK_ERR;
int i;
jk_map_private_t *mPriv;
if( name==NULL )
-return JK_FALSE;
+return JK_ERR;
mPriv=(jk_map_private_t *)m-_private;
@@ -123,7 +123,7 @@
if( old!=NULL )
*old = (void *) mPriv-values[i]; /* DIRTY */
mPriv-values[i] = value;
-return JK_TRUE;
+return JK_OK;
}
jk2_map_default_realloc(env, m);
@@ -138,7 +138,7 @@
*/
mPriv-names[mPriv-size] = m-pool-pstrdup(env,m-pool, name);
mPriv-size ++;
-rc = JK_TRUE;
+rc = JK_OK;
}
return rc;
}
@@ -146,11 +146,11 @@
static int jk2_map_default_add(jk_env_t *env, jk_map_t *m,
const char *name, void *value)
{
-int rc = JK_FALSE;
+int rc = JK_ERR;
jk_map_private_t *mPriv;
if( name==NULL )
-return JK_FALSE;
+return JK_ERR;
mPriv=(jk_map_private_t *)m-_private;
@@ -165,7 +165,7 @@
/* mPriv-names[mPriv-size] = m-pool-pstrdup(m-pool, name); */
mPriv-names[mPriv-size] = (char *)name;
mPriv-size ++;
-rc = JK_TRUE;
+rc = JK_OK;
}
return rc;
}
@@ -232,11 +232,11 @@
if( dst-get(env, dst, name ) == NULL) {
int rc= dst-put(env, dst, name, value, NULL );
-if( rc != JK_TRUE )
+if( rc != JK_OK )
return rc;
}
}
-return JK_TRUE;
+return JK_OK;
}
/* */
@@ -249,14 +249,14 @@
jk_map_private_t *mPriv;
if( m== NULL )
-return JK_FALSE;
+return JK_ERR;
-_this=(jk_map_t *)pool-alloc(env, pool, sizeof(jk_map_t));
-mPriv=(jk_map_private_t *)pool-alloc(env, pool, sizeof(jk_map_private_t));
+_this=(jk_map_t *)pool-calloc(env, pool, sizeof(jk_map_t));
+mPriv=(jk_map_private_t *)pool-calloc(env, pool, sizeof(jk_map_private_t));
*m=_this;
if( _this == NULL || mPriv==NULL )
-return JK_FALSE;
+return JK_ERR;
_this-pool = pool;
_this-_private=mPriv;
@@ -276,16 +276,16 @@
_this-clear=jk2_map_default_clear;
-return JK_TRUE;
+return JK_OK;
}
/* int map_free(jk_map_t **m) */
/* { */
-/* int rc = JK_FALSE; */
+/* int rc = JK_ERR; */
/* if(m *m) { */
/* (*m)-pool-close((*m)-pool); */
-/* rc = JK_TRUE; */
+/* rc = JK_OK; */
/* *m = NULL; */
/* } */
/* return rc; */
@@ -301,11 +301,13 @@
void **values;
int capacity = mPriv-capacity + CAPACITY_INC_SIZE;
-names = (char **)m-pool-alloc(env, m-pool,
+names = (char **)m-pool-calloc(env, m-pool,
sizeof(char *) * capacity);
-values = (void **)m-pool-alloc(env, m-pool,
+values = (void **)m-pool-calloc(env, m-pool,
sizeof(void *) * capacity);
-
+
+m-keys=names;
+m-values=values;
if(values names) {
if (mPriv-capacity mPriv-names)
memcpy(names, mPriv-names, sizeof(char *) * mPriv-capacity);
@@ -317,9 +319,9 @@
mPriv-values = ( void **)values;
mPriv-capacity = capacity;
-return JK_TRUE;
+return JK_OK;
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_msg_ajp.c
costin 02/04/25 12:17:22
Modified:jk/native2/common jk_msg_ajp.c
Log:
Update rc. Dump the message on error, clean up the dump.
Revision ChangesPath
1.7 +22 -30jakarta-tomcat-connectors/jk/native2/common/jk_msg_ajp.c
Index: jk_msg_ajp.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_msg_ajp.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_msg_ajp.c 21 Feb 2002 11:11:15 - 1.6
+++ jk_msg_ajp.c 25 Apr 2002 19:17:22 - 1.7
@@ -60,7 +60,7 @@
* Author: Costin Manolache
* Author: Gal Shachor [EMAIL PROTECTED] *
* Author: Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.6 $ *
+ * Version: $Revision: 1.7 $ *
***/
#include jk_pool.h
@@ -82,31 +82,17 @@
{
int i=0;
env-l-jkLog( env, env-l, JK_LOG_INFO,
- %s pos=%d len=%d max=%d ,
+ %s pos=%d len=%d max=%d \n,
err, _this-pos, _this-len, _this-maxlen );
env-l-jkLog( env, env-l, JK_LOG_INFO,
-%2x %2x %2x %2x:%2x %2x %2x %2x:%2x %2x %2x %2x:%2x %2x %2x
%2x\n,
+%2x %2x %2x %2x:%2x %2x %2x %2x:%2x %2x %2x %2x:%2x %2x %2x %2x
\n,
_this-buf[i++],_this-buf[i++],_this-buf[i++],_this-buf[i++],
_this-buf[i++],_this-buf[i++],_this-buf[i++],_this-buf[i++],
_this-buf[i++],_this-buf[i++],_this-buf[i++],_this-buf[i++],
_this-buf[i++],_this-buf[i++],_this-buf[i++],_this-buf[i++]);
-i-=16;
env-l-jkLog( env, env-l, JK_LOG_INFO,
-%c %c %c %c: %c %c %c %c: %c %c %c %c: %c %c %c %c\n,
-_this-buf[i++],_this-buf[i++],_this-buf[i++],_this-buf[i++],
-_this-buf[i++],_this-buf[i++],_this-buf[i++],_this-buf[i++],
-_this-buf[i++],_this-buf[i++],_this-buf[i++],_this-buf[i++],
-_this-buf[i++],_this-buf[i++],_this-buf[i++],_this-buf[i++]);
-env-l-jkLog( env, env-l, JK_LOG_INFO,
-%2x %2x %2x %2x:%2x %2x %2x %2x:%2x %2x %2x %2x:%2x %2x %2x
%2x\n,
-_this-buf[i++],_this-buf[i++],_this-buf[i++],_this-buf[i++],
-_this-buf[i++],_this-buf[i++],_this-buf[i++],_this-buf[i++],
-_this-buf[i++],_this-buf[i++],_this-buf[i++],_this-buf[i++],
-_this-buf[i++],_this-buf[i++],_this-buf[i++],_this-buf[i++]);
-i-=16;
-env-l-jkLog( env, env-l, JK_LOG_INFO,
-%c %c %c %c: %c %c %c %c: %c %c %c %c: %c %c %c %c\n,
+%2x %2x %2x %2x:%2x %2x %2x %2x:%2x %2x %2x %2x:%2x %2x %2x %2x
\n,
_this-buf[i++],_this-buf[i++],_this-buf[i++],_this-buf[i++],
_this-buf[i++],_this-buf[i++],_this-buf[i++],_this-buf[i++],
_this-buf[i++],_this-buf[i++],_this-buf[i++],_this-buf[i++],
@@ -139,7 +125,7 @@
int len=msg-len;
if(len + 4 msg-maxlen) {
-return -1;
+return JK_ERR;
}
msg-buf[len] = (unsigned char)((val 24) 0xFF);
@@ -149,7 +135,7 @@
msg-len += 4;
-return 0;
+return JK_OK;
}
@@ -158,7 +144,7 @@
{
int len=msg-len;
if(len + 2 msg-maxlen) {
-return -1;
+return JK_ERR;
}
msg-buf[len] = (unsigned char)((val 8) 0xFF);
@@ -166,7 +152,7 @@
msg-len += 2;
-return 0;
+return JK_OK;
}
static int jk2_msg_ajp_appendByte(jk_env_t *env, jk_msg_t *msg,
@@ -174,13 +160,13 @@
{
int len=msg-len;
if(len + 1 msg-maxlen) {
- return -1;
+ return JK_ERR;
}
msg-buf[len]= val;
msg-len += 1;
-return 0;
+return JK_OK;
}
static int jk2_msg_ajp_appendString(jk_env_t *env, jk_msg_t *msg,
@@ -190,12 +176,12 @@
if(!param) {
msg-appendInt( env, msg, 0x );
-return 0;
+return JK_OK;
}
len = strlen(param);
if(msg-len + len + 2 msg-maxlen) {
- return -1;
+ return JK_ERR;
}
/* ignore error - we checked once */
@@ -206,7 +192,7 @@
jk_xlate_to_ascii((char *)msg-buf + msg-len, len+1); /* convert from EBCDIC
if needed */
msg-len += len + 1;
-return 0;
+return JK_OK;
}
@@ -215,18 +201,18 @@
int len)
{
if (! len) {
-return 0;
+return JK_OK;
}
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_shm.c
costin 02/04/25 12:18:40
Modified:jk/native2/common jk_shm.c
Log:
Many small fixes and changes to allow it to be used from C and java.
Revision ChangesPath
1.6 +181 -131 jakarta-tomcat-connectors/jk/native2/common/jk_shm.c
Index: jk_shm.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_shm.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_shm.c 18 Apr 2002 22:47:18 - 1.5
+++ jk_shm.c 25 Apr 2002 19:18:39 - 1.6
@@ -88,85 +88,69 @@
#if APR_HAS_SHARED_MEMORY
#include apr_shm.h
+#include apr_atomic.h
/* Inter-process synchronization - to create the slots */
#include apr_proc_mutex.h
-struct jk_shm_buffer {
-/** Incremented after each modification */
-int generation;
-/** 1 if the buffer is in an unstable state.
- * XXX Shouldn't happen
- */
-int busy;
-
-/** Pid of the owning process */
-int owner;
-
-int id;
-char name[64];
-
-char *data;
-};
-
-struct jk_shm_head {
-int size;
-int bufferCount;
-
-int objCount;
-int lastId;
-
-struct jk_shm_buffer buffers[1];
-};
-
-
-typedef struct jk_shm_private {
-apr_size_t size;
-apr_shm_t *aprShm;
+static apr_pool_t *globalShmPool;
-struct jk_shm_head *image;
-} jk_shm_private_t;
+#define SHM_SET_ATTRIBUTE 0
+#define SHM_REGISTER_TOMCAT 2
+#define SHM_ATTACH 3
+#define SHM_DETACH 4
-static apr_pool_t *globalShmPool;
static int jk2_shm_destroy(jk_env_t *env, jk_shm_t *shm)
{
-jk_shm_private_t *shmP=shm-privateData;
-
-return apr_shm_destroy(shmP-aprShm);
+apr_shm_t *aprShm=(apr_shm_t *)shm-privateData;
+
+return apr_shm_destroy(aprShm);
}
static int jk2_shm_detach(jk_env_t *env, jk_shm_t *shm)
{
-jk_shm_private_t *shmP=shm-privateData;
+apr_shm_t *aprShm=(apr_shm_t *)shm-privateData;
-return apr_shm_detach(shmP-aprShm);
+return apr_shm_detach(aprShm);
}
static int jk2_shm_attach(jk_env_t *env, jk_shm_t *shm)
{
-jk_shm_private_t *shmP=shm-privateData;
-
-return apr_shm_attach(shmP-aprShm, shm-fname, globalShmPool );
+return apr_shm_attach((apr_shm_t **)shm-privateData, shm-fname,
globalShmPool );
}
/* Create or reinit an existing scoreboard. The MPM can control whether
* the scoreboard is shared across multiple processes or not
*/
-int jk2_shm_create(jk_env_t *env, jk_shm_t *shm)
-{
-apr_status_t rv;
-jk_shm_private_t *shmP=shm-privateData;
+static int jk2_shm_init(struct jk_env *env, jk_shm_t *shm) {
+apr_status_t rv=APR_SUCCESS;
+jk_shm_head_t *head;
+
+if( shm-fname==NULL ) {
+env-l-jkLog(env, env-l, JK_LOG_ERROR, shm.init(): No file\n);
+return JK_ERR;
+}
-/* The config says to create a name-based shmem */
-if ( shm-fname == NULL ) {
+if( shm-size == 0 ) {
+shm-size = shm-slotSize * shm-slotMaxCount;
+}
+
+/* We don't want to have to recreate the scoreboard after
+ * restarts, so we'll create a global pool and never clean it.
+ */
+rv = apr_pool_create(globalShmPool, NULL);
+
+if (rv != APR_SUCCESS) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
- No name for jk_shm\n);
-return JK_ERR;
+ Unable to create global pool for jk_shm\n);
+return rv;
}
-rv=apr_shm_attach(shmP-aprShm, shm-fname, globalShmPool );
+shm-privateData=NULL;
+
+rv=apr_shm_attach((apr_shm_t **)shm-privateData, shm-fname, globalShmPool );
if( rv ) {
char error[256];
apr_strerror( rv, error, 256 );
@@ -174,8 +158,20 @@
env-l-jkLog(env, env-l, JK_LOG_ERROR,
shm.create(): error attaching shm, will create %s %d %p
%s\n,
shm-fname, rv, globalShmPool, error );
-shmP-aprShm=NULL;
+shm-privateData=NULL;
} else {
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ shm.create(): attaching to existing shm %s\n,
+ shm-fname );
+/* Get the base address, initialize it */
+shm-image = apr_shm_baseaddr_get( (apr_shm_t *)shm-privateData);
+shm-head = (jk_shm_head_t *)shm-image;
+
+if( shm-image==NULL ) {
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ shm.create(): No base memory %s\n, shm-fname);
+return JK_ERR;
+}
return JK_OK;
}
@@ -192,7 +188,7 @@
env-l-jkLog(env, env-l, JK_LOG_ERROR,
shm.create(): error removing
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_workerEnv.c
costin 02/04/25 12:20:46
Modified:jk/native2/common jk_workerEnv.c
Log:
Update the signatures and the dispatch method ( used for both messages from the web
server and jni callbacks )
Update rc.
Revision ChangesPath
1.30 +91 -68jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c
Index: jk_workerEnv.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jk_workerEnv.c12 Apr 2002 23:13:24 - 1.29
+++ jk_workerEnv.c25 Apr 2002 19:20:46 - 1.30
@@ -59,7 +59,7 @@
* Description: Workers controller *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Author: Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.29 $ *
+ * Version: $Revision: 1.30 $ *
***/
#include jk_env.h
@@ -116,10 +116,10 @@
wEnv-options = ~JK_OPT_FWDURIMASK;
wEnv-options |= JK_OPT_FWDURIESCAPED;
} else {
- return JK_FALSE;
+ return JK_ERR;
}
-return JK_TRUE;
+return JK_OK;
}
@@ -180,7 +180,7 @@
if( w-init != NULL ) {
err=w-init(env, w);
-if(err!=JK_TRUE) {
+if(err!=JK_OK) {
if( w-destroy != NULL )
w-destroy(env, w);
env-l-jkLog(env, env-l, JK_LOG_ERROR,
@@ -200,20 +200,20 @@
}
}
}
-return JK_TRUE;
+return JK_OK;
}
static int jk2_workerEnv_initChannel(jk_env_t *env,
jk_workerEnv_t *wEnv, jk_channel_t *ch)
{
-int rc=JK_TRUE;
+int rc=JK_OK;
ch-workerEnv=wEnv;
if( ch-init != NULL ) {
rc=ch-init(env, ch);
-if(rc!=JK_TRUE) {
+if(rc!=JK_OK) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
workerEnv.initChannel() init failed for %s\n,
ch-mbean-name);
@@ -232,7 +232,12 @@
env-l-jkLog(env, env-l, JK_LOG_INFO,
workerEnv.initChannel(): default worker ajp13:%s\n,
ch-mbean-localName );
-jkb=env-createBean2(env, ch-mbean-pool, worker.ajp13,
ch-mbean-localName );
+jkb=env-createBean2(env, ch-mbean-pool, ajp13, ch-mbean-localName );
+if( jkb == NULL ) {
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ workerEnv.initChannel(): Can't find ajp13\n );
+return JK_ERR;
+}
ch-worker=jkb-object;
ch-worker-channelName=ch-mbean-name;
ch-worker-channel=ch;
@@ -253,7 +258,7 @@
jk_channel_t *ch= wEnv-channel_map-valueAt( env, wEnv-channel_map, i );
jk2_workerEnv_initChannel( env, wEnv, ch );
}
-return JK_TRUE;
+return JK_OK;
}
@@ -281,15 +286,27 @@
}
static int jk2_workerEnv_registerHandler(jk_env_t *env, jk_workerEnv_t *wEnv,
- jk_handler_t *handler)
+ const char *type,
+ const char *name, int preferedId,
+ jk_handler_callback callback,
+ char *signature)
{
+
+jk_handler_t *h=(jk_handler_t *)wEnv-pool-calloc( env, wEnv-pool, sizeof(
jk_handler_t));
+h-name=(char *)name;
+h-messageId=preferedId;
+h-callback=callback;
+h-workerEnv=wEnv;
+
jk2_workerEnv_checkSpace( env, wEnv-pool,
(void ***)wEnv-handlerTable,
wEnv-lastMessageId,
- handler-messageId );
-wEnv-handlerTable[ handler-messageId ]=handler;
+ h-messageId );
+wEnv-handlerTable[ h-messageId ]=h;
/*wEnv-l-jkLog( wEnv-l, JK_LOG_INFO, Registered %s %d\n,*/
/* handler-name, handler-messageId); */
+
+return JK_OK;
}
static int jk2_workerEnv_init(jk_env_t *env, jk_workerEnv_t *wEnv)
@@ -325,7 +342,7 @@
if( wEnv-vm != NULL ) {
wEnv-vm-init( env, wEnv-vm );
}
-
+
jk2_workerEnv_initChannels( env, wEnv );
jk2_workerEnv_initWorkers( env, wEnv );
@@ -337,39 +354,37 @@
wEnv-uriMap-init(env, wEnv-uriMap );
-return JK_TRUE;
+return JK_OK;
}
static int
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_lb.c
costin 02/04/25 12:21:58
Modified:jk/native2/common jk_worker_lb.c
Log:
Added some code to check the shm 'version' and update the config.
Not completed.
Revision ChangesPath
1.4 +173 -97 jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c
Index: jk_worker_lb.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_worker_lb.c15 Apr 2002 23:47:57 - 1.3
+++ jk_worker_lb.c25 Apr 2002 19:21:58 - 1.4
@@ -60,7 +60,7 @@
* several workers. *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Based on: *
- * Version: $Revision: 1.3 $ *
+ * Version: $Revision: 1.4 $ *
***/
#include jk_pool.h
@@ -70,6 +70,7 @@
#include jk_config.h
#include jk_env.h
#include jk_requtil.h
+#include jk_mt.h
#define DEFAULT_LB_FACTOR (1.0)
@@ -83,15 +84,15 @@
* This + ADDITIONAL_WAIT_LOAD will be set on all the workers
* that recover after an error.
*/
-static double jk2_get_max_lb(jk_worker_t *p)
+static double jk2_get_max_lb(jk_worker_t *lb)
{
int i;
double rc = 0.0;
-for(i = 0 ; i p-num_of_workers ; i++) {
-if(!p-lb_workers[i]-in_error_state) {
-if(p-lb_workers[i]-lb_value rc) {
-rc = p-lb_workers[i]-lb_value;
+for(i = 0 ; i lb-num_of_workers ; i++) {
+if(!lb-lb_workers[i]-in_error_state) {
+if(lb-lb_workers[i]-lb_value rc) {
+rc = lb-lb_workers[i]-lb_value;
}
}
}
@@ -106,7 +107,7 @@
It'll also adjust the load balancing factors.
*/
-static jk_worker_t *jk2_get_most_suitable_worker(jk_env_t *env, jk_worker_t *p,
+static jk_worker_t *jk2_get_most_suitable_worker(jk_env_t *env, jk_worker_t *lb,
jk_ws_service_t *s, int attempt)
{
jk_worker_t *rc = NULL;
@@ -117,37 +118,37 @@
session_route = jk2_requtil_getSessionRoute(env, s);
if(session_route) {
-for(i = 0 ; i p-num_of_workers ; i++) {
-if(0 == strcmp(session_route, p-lb_workers[i]-mbean-name)) {
-if(attempt 0 p-lb_workers[i]-in_error_state) {
+for(i = 0 ; i lb-num_of_workers ; i++) {
+if(0 == strcmp(session_route, lb-lb_workers[i]-mbean-name)) {
+if(attempt 0 lb-lb_workers[i]-in_error_state) {
break;
} else {
-return p-lb_workers[i];
+return lb-lb_workers[i];
}
}
}
}
/** Get one worker that is ready */
-for(i = 0 ; i p-num_of_workers ; i++) {
-if(p-lb_workers[i]-in_error_state) {
-if(!p-lb_workers[i]-in_recovering) {
+for(i = 0 ; i lb-num_of_workers ; i++) {
+if(lb-lb_workers[i]-in_error_state) {
+if(!lb-lb_workers[i]-in_recovering) {
time_t now = time(0);
-if((now - p-lb_workers[i]-error_time) WAIT_BEFORE_RECOVER) {
+if((now - lb-lb_workers[i]-error_time) WAIT_BEFORE_RECOVER) {
-p-lb_workers[i]-in_recovering = JK_TRUE;
-p-lb_workers[i]-error_time = now;
-p-lb_workers[i]-retry_count++;
-rc = p-lb_workers[i];
+lb-lb_workers[i]-in_recovering = JK_TRUE;
+lb-lb_workers[i]-error_time = now;
+lb-lb_workers[i]-retry_count++;
+rc = lb-lb_workers[i];
break;
}
}
} else {
-if(p-lb_workers[i]-lb_value lb_min || !rc) {
-lb_min = p-lb_workers[i]-lb_value;
-rc = p-lb_workers[i];
+if(lb-lb_workers[i]-lb_value lb_min || !rc) {
+lb_min = lb-lb_workers[i]-lb_value;
+rc = lb-lb_workers[i];
}
}
}
@@ -155,29 +156,29 @@
if ( !rc ) {
/* no workers found (rc is null), now try as hard as possible to get a
worker anyway, pick one with largest error time.. */
-for(i = 0 ; i p-num_of_workers ; i++) {
-if(p-lb_workers[i]-in_error_state) {
-
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_pool_apr.c jk_registry.c jk_requtil.c jk_uriEnv.c jk_uriMap.c jk_vm_default.c jk_worker_ajp13.c jk_worker_jni.c jk_worker_run.c jk_worker_status.c
costin 02/04/25 12:22:19
Modified:jk/native2/common jk_pool_apr.c jk_registry.c jk_requtil.c
jk_uriEnv.c jk_uriMap.c jk_vm_default.c
jk_worker_ajp13.c jk_worker_jni.c jk_worker_run.c
jk_worker_status.c
Log:
Update rc.
Revision ChangesPath
1.2 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_pool_apr.c
Index: jk_pool_apr.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_pool_apr.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_pool_apr.c 8 Apr 2002 18:47:53 - 1.1
+++ jk_pool_apr.c 25 Apr 2002 19:22:19 - 1.2
@@ -179,7 +179,7 @@
_this-_private=aprPool;
jk2_pool_apr_initMethods( env, _this );
-return JK_TRUE;
+return JK_OK;
}
static void jk2_pool_apr_initMethods(jk_env_t *env, jk_pool_t *_this )
@@ -204,7 +204,7 @@
result-object=_this;
-return JK_TRUE;
+return JK_OK;
}
1.19 +2 -3 jakarta-tomcat-connectors/jk/native2/common/jk_registry.c
Index: jk_registry.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_registry.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_registry.c 12 Apr 2002 23:09:19 - 1.18
+++ jk_registry.c 25 Apr 2002 19:22:19 - 1.19
@@ -69,7 +69,7 @@
/***
* Description: Worker list*
- * Version: $Revision: 1.18 $ *
+ * Version: $Revision: 1.19 $ *
***/
/** Static declarations for all 'hardcoded' modules. This is a hack,
@@ -119,9 +119,8 @@
env-registerFactory( env, uri, jk2_uriEnv_factory );
env-registerFactory( env, config, jk2_config_factory );
- env-registerFactory( env, ajp13, jk2_worker_ajp14_factory );
env-registerFactory( env, worker.ajp13, jk2_worker_ajp14_factory );
- env-registerFactory( env, ajp14, jk2_worker_ajp14_factory );
+ env-registerFactory( env, ajp13, jk2_worker_ajp14_factory );
env-registerFactory( env, lb,jk2_worker_lb_factory );
env-registerFactory( env, worker.lb,jk2_worker_lb_factory );
env-registerFactory( env, status, jk2_worker_status_factory );
1.12 +58 -56jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c
Index: jk_requtil.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_requtil.c 19 Apr 2002 02:36:48 - 1.11
+++ jk_requtil.c 25 Apr 2002 19:22:19 - 1.12
@@ -143,7 +143,7 @@
int jk2_requtil_getMethodId(jk_env_t *env, const char *method,
unsigned char *sc)
{
-int rc = JK_TRUE;
+int rc = JK_OK;
if(0 == strcmp(method, GET)) {
*sc = SC_M_GET;
} else if(0 == strcmp(method, POST)) {
@@ -187,7 +187,7 @@
} else if(0 == strcmp(method, SEARCH)) {
*sc = SC_M_SEARCH;
} else {
-rc = JK_FALSE;
+rc = JK_ERR;
}
return rc;
@@ -220,17 +220,17 @@
} else if(!strcasecmp(header_name + 7, language)) {
*sc = SC_ACCEPT_LANGUAGE;
} else {
-return JK_FALSE;
+return JK_ERR;
}
} else if ('\0' == header_name[6]) {
*sc = SC_ACCEPT;
} else {
-return JK_FALSE;
+return JK_ERR;
}
} else if (!strcasecmp(header_name, authorization)) {
*sc = SC_AUTHORIZATION;
} else {
-return JK_FALSE;
+return JK_ERR;
}
break;
@@ -247,7 +247,7 @@
} else if(!strcasecmp(header_name, cookie2)) {
*sc = SC_COOKIE2;
} else {
-return JK_FALSE;
+return JK_ERR;
}
break;
@@ -256,7 +256,7 @@
if(!strcasecmp(header_name, host)) {
*sc = SC_HOST;
} else {
-return JK_FALSE;
+return JK_ERR;
}
break;
@@ -265,7 +265,7 @@
if(!strcasecmp(header_name, pragma)) {
*sc = SC_PRAGMA;
} else {
-
DO NOT REPLY [Bug 7007] - Invalid names in web.xml generated by JspC for top-level JSP pages
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7007. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7007 Invalid names in web.xml generated by JspC for top-level JSP pages [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2002-04-25 19:23 --- I believe this has been fixed, in both the head branch and in jasper2 -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
costin 02/04/25 12:23:40
Modified:jk/native2 build.xml
Log:
Update build.xml for jni.
Don't build other targets - all will build jkant and jni. That will
prevent gump errors.
Revision ChangesPath
1.24 +11 -1 jakarta-tomcat-connectors/jk/native2/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/build.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- build.xml 24 Apr 2002 23:11:11 - 1.23
+++ build.xml 25 Apr 2002 19:23:40 - 1.24
@@ -52,6 +52,9 @@
target name=main depends=init,apache20,apache13,jni
/target
+ target name=all depends=jkant,init,apache20,apache13,jni
+ /target
+
target name=init
echo message=build.properties.${os.arch}.${os.name} /
taskdef resource=META-INF/ant.tasks
@@ -70,7 +73,9 @@
echo message=Apache13 ${apache13.home} ${apache13.detect} /
echo message=IIS ${iis.home} ${iis.detect} /
echo message=Iplanet ${iplanet.home} ${iplanet.detect} /
+ /target
+ target name=jkant
ant dir=${jk.src} target=jkant/
/target
@@ -217,6 +222,9 @@
info=Building for NetWare platform /
def name=XP_NETWARE if=netware
info=Building for NetWare platform /
+ def name=HAS_APR
+info=JNI is no based on APR /
+ def name=HAVE_JNI /
import fileName=${novellndk.dir}/imports/clib.imp if=netware /
import fileName=${novellndk.dir}/imports/lib0.imp if=netware /
@@ -347,16 +355,18 @@
exclude name=common/jk_pool_apr.c/
exclude name=jk_nwmain.c
unless=netware /
+ include name=jni/*.c /
exclude name=jk_apr.c
unless=netware /
include name=common/apr/*.c unless=HAVE_APR /
- !-- include name=jni/*.c /--
/src
includes
include name=${java.home}/../include /
include name=${native.dir}/include /
include name=${java.home}/../include/win32 /
include name=${native.dir}/common /
+include name=${native.dir}/server/isapi /
+include name=${build.compiler.base}/include /
!--include name=quot;${build.compiler.base}/includequot; /--
include name=quot;$(mssdk.include)quot;/
/includes
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/jni jk_jni_aprImpl.c
costin 02/04/25 12:24:17
Modified:jk/native2/jni jk_jni_aprImpl.c
Log:
Implement the jni side for the dispatch.
Revision ChangesPath
1.13 +319 -16 jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c
Index: jk_jni_aprImpl.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_jni_aprImpl.c 18 Apr 2002 22:52:33 - 1.12
+++ jk_jni_aprImpl.c 25 Apr 2002 19:24:17 - 1.13
@@ -72,7 +72,6 @@
#include stdio.h
#include string.h
#include signal.h
-#include sys/socket.h
#include sys/un.h
#include org_apache_jk_apr_AprImpl.h
@@ -80,7 +79,6 @@
#include jk_global.h
#include jk_map.h
#include jk_pool.h
-/* #include jk_scoreboard.h */
#include apr_strings.h
#include apr_portable.h
@@ -96,12 +94,55 @@
#include apr_proc_mutex.h
+static apr_pool_t *jniAprPool;
+static jk_workerEnv_t *workerEnv;
+
+/* Apr initialization and pools */
JNIEXPORT jint JNICALL
Java_org_apache_jk_apr_AprImpl_initialize(JNIEnv *jniEnv, jobject _jthis)
{
-/* fprintf(stderr, XXX AprInitialize\n); */
+jk_env_t *env;
+
apr_initialize();
+apr_pool_create( jniAprPool, NULL );
+
+if( jk_env_globalEnv == NULL ) {
+jk_pool_t *globalPool;
+jk_bean_t *jkb;
+
+if( jniAprPool==NULL ) {
+return 0;
+}
+jk2_pool_apr_create( NULL, globalPool, NULL, jniAprPool );
+/* Create the global env */
+env=jk2_env_getEnv( NULL, globalPool );
+}
+env=jk_env_globalEnv;
+
+workerEnv=env-getByName( env, workerEnv );
+if( workerEnv==NULL ) {
+jk_bean_t *jkb;
+
+jkb=env-createBean2( env, env-globalPool, logger.file, );
+if( jkb==NULL ) {
+fprintf(stderr, Error creating logger );
+return JK_ERR;
+}
+
+env-l=jkb-object;;
+env-alias( env, logger.file:, logger);
+
+jkb=env-createBean2( env, env-globalPool,workerEnv, );
+env-alias( env, workerEnv:, workerEnv);
+if( jkb==NULL ) {
+fprintf(stderr, Error creating workerEnv );
+return JK_ERR;
+}
+
+workerEnv=jkb-object;
+}
+fprintf( stderr, XXX aprImpl: %p %p\n, env, workerEnv);
return 0;
}
@@ -134,6 +175,8 @@
return 0;
}
+/* Signals */
+
static void jk2_SigAction(int signal) {
}
@@ -164,6 +207,8 @@
return 0;
}
+/* User related functions */
+
JNIEXPORT jlong JNICALL
Java_org_apache_jk_apr_AprImpl_userId(JNIEnv *jniEnv, jobject _jthis, jlong pool)
{
@@ -172,19 +217,6 @@
}
-/*
- SendPacket
-*/
-JNIEXPORT jint JNICALL
-Java_org_apache_jk_apr_AprImpl_sendPacket
- (JNIEnv *jniEnv, jobject o, jlong xEnv, jlong eP, jbyteArray data,
- jint len)
-{
-return (jint)jk2_channel_jni_javaSendPacket( jniEnv, o, xEnv, eP,
-data, len);
-}
-
-
/* Shared memory */
/* Use it to access the scoreboard or for shmem channel */
@@ -272,6 +304,41 @@
return apr_shm_destroy(shm);
}
+JNIEXPORT jint JNICALL
+Java_org_apache_jk_apr_AprImpl_shmGetInt(JNIEnv *jniEnv, jobject _jthis,
+ jlong poolJ, jlong mP )
+{
+apr_pool_t *pool=(apr_pool_t *)(void *)(long)poolJ;
+int *mem=(int *)(void *)(long)mP;
+jbyte *nbuf;
+int rd;
+
+/* XXX use atomic */
+return (jint)*mem;
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_jk_apr_AprImpl_shmSetInt(JNIEnv *jniEnv, jobject _jthis,
+ jlong poolJ, jlong mP, jint value )
+{
+apr_pool_t *pool=(apr_pool_t *)(void *)(long)poolJ;
+int *mem=(int *)(void *)(long)mP;
+
+/* XXX use atomic */
+*mem=(int)value;
+}
+
+JNIEXPORT jint JNICALL
+Java_org_apache_jk_apr_AprImpl_shmIncrement(JNIEnv *jniEnv, jobject _jthis,
+jlong poolJ, jlong mP )
+{
+apr_pool_t *pool=(apr_pool_t *)(void *)(long)poolJ;
+int *mem=(int *)(void *)(long)mP;
+
+/* XXX use atomic */
+*mem++;
+}
+
JNIEXPORT jint JNICALL
Java_org_apache_jk_apr_AprImpl_shmRead(JNIEnv *jniEnv, jobject _jthis,
@@ -659,4 +726,240 @@
return 0;
}
+/* Access jk components */
+
+/*
+ * Get a jk_env_t * from the pool
+ *
+ * XXX We should use per thread data
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c
costin 02/04/25 12:25:11
Modified:jk/native2/server/apache13 jk_service_apache13.c mod_jk2.c
jk/native2/server/apache2 jk_logger_apache2.c
jk_map_aprtable.c jk_service_apache2.c mod_jk2.c
jk/native2/server/isapi jk_service_iis.c
Log:
Update rc.
Revision ChangesPath
1.4 +12 -12
jakarta-tomcat-connectors/jk/native2/server/apache13/jk_service_apache13.c
Index: jk_service_apache13.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/jk_service_apache13.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_service_apache13.c 24 Mar 2002 19:22:19 - 1.3
+++ jk_service_apache13.c 25 Apr 2002 19:25:10 - 1.4
@@ -92,7 +92,7 @@
jk_map_t *headers;
if(s==NULL || s-ws_private==NULL )
-return JK_FALSE;
+return JK_ERR;
r = (request_rec *)s-ws_private;
@@ -149,7 +149,7 @@
/* ap_send_http_header(r); */
s-response_started = JK_TRUE;
-return JK_TRUE;
+return JK_OK;
}
/*
@@ -179,10 +179,10 @@
} else {
*actually_read = (unsigned) rv;
}
-return JK_TRUE;
+return JK_OK;
}
}
-return JK_FALSE;
+return JK_ERR;
}
/*
@@ -217,7 +217,7 @@
env-l-jkLog(env, env-l, JK_LOG_INFO,
service.write() default head\n);
if(!s-head(env, s)) {
-return JK_FALSE;
+return JK_ERR;
}
{
array_header *t = ap_table_elts(rr-headers_out);
@@ -244,7 +244,7 @@
bb+=CHUNK_SIZE;
if(toSend != r) {
-return JK_FALSE;
+return JK_ERR;
}
}
@@ -254,9 +254,9 @@
*/
ap_bflush(s-ws_private);
}
-return JK_TRUE;
+return JK_OK;
}
-return JK_FALSE;
+return JK_ERR;
}
/* = */
@@ -364,7 +364,7 @@
break;
default :
-return JK_FALSE;
+return JK_ERR;
}
s-is_ssl = JK_FALSE;
@@ -450,7 +450,7 @@
jk2_map_default_create(env, s-headers_out, s-pool );
-return JK_TRUE;
+return JK_OK;
}
/*
@@ -484,7 +484,7 @@
int jk2_service_apache13_init(jk_env_t *env, jk_ws_service_t *s)
{
if(s==NULL ) {
-return JK_FALSE;
+return JK_ERR;
}
s-head = jk2_service_apache13_head;
@@ -493,5 +493,5 @@
s-init = jk2_init_ws_service;
s-afterRequest = jk2_service_apache13_afterRequest;
-return JK_TRUE;
+return JK_OK;
}
1.10 +15 -8 jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c
Index: mod_jk2.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mod_jk2.c 9 Apr 2002 21:00:38 - 1.9
+++ mod_jk2.c 25 Apr 2002 19:25:11 - 1.10
@@ -59,7 +59,7 @@
* Description: Apache 1.3 plugin for Jakarta/Tomcat *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.9 $ *
+ * Version: $Revision: 1.10 $ *
***/
/*
@@ -123,7 +123,7 @@
int rc;
rc=workerEnv-config-setPropertyString( env, workerEnv-config, name, value );
-if( rc!=JK_TRUE ) {
+if( rc!=JK_OK ) {
fprintf( stderr, mod_jk2: Unrecognized option %s %s\n, name, value);
}
@@ -158,19 +158,26 @@
to a file. Check the logger for default settings.
*/
jkb=env-createBean2( env, env-globalPool, logger.file, );
-l = jkb-object;
+if( jkb==NULL ) {
+fprintf(stderr, Error creating logger );
+return JK_ERR;
+}
env-l=l;
env-alias( env, logger.file:, logger);
/* Create the workerEnv
*/
jkb=env-createBean2( env, env-globalPool,workerEnv, );
+if( jkb==NULL ) {
+fprintf(stderr, Error creating workerEnv );
+return JK_ERR;
+}
workerEnv=
1 problem with Coyote
Hi Remy, I would like to add one more method in Coyote - it won't touch existing functionality, just add a way for jk to fingure out what webapps are configured in the server ( I'm trying to update the auto-conf stuff ) Do you mind if I add a new ACTION_WEBAPP hook, with code in the 2 connectors to call this hook for each webapplication ( all existing and every one deployed at runtime ) ? The code changes are not big, and it won't affect the rest of the code. I'm not sure what the 'param' should be - for starters I'll just use a Hashtable with various attributes for the app ( vhost, context path, docbase ). Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: 1 problem with Coyote
Hi Remy, I would like to add one more method in Coyote - it won't touch existing functionality, just add a way for jk to fingure out what webapps are configured in the server ( I'm trying to update the auto-conf stuff ) Do you mind if I add a new ACTION_WEBAPP hook, with code in the 2 connectors to call this hook for each webapplication ( all existing and every one deployed at runtime ) ? The code changes are not big, and it won't affect the rest of the code. I'm not sure what the 'param' should be - for starters I'll just use a Hashtable with various attributes for the app ( vhost, context path, docbase ). This seems useful to implement some kind of auto-discovery mechanisms, so ok. The NPEs with JK 2 got worse BTW ;-) Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: MinTC, terrible rudeness, persistence
Craig R. McClanahan [EMAIL PROTECTED] wrote: As you will note in this case, and in many others, there is no such thing as the Sun viewpoint on many TOMCAT-DEV issues. And that's appropriate -- we are individuals with our own opinions. I am not going to comment on this as I used to be a Sun employee... Of course, the very same thing can be said about any mythical common ASF Member viewpoint ... :-) Sorry, but I strongly disagree with you on this one: the mythical ASF Membership _means_ something... If there's one thing an ASF member should be aware of, is its position within the foundation. I explain: Committers are code monkeys (sorry for the expression, but can't find anything better than this :) I'm the biggest code monkey of all). A committer is tied to his subproject (Tomcat in our case), his sphere of interference is the code in that particular repository. Committers report to the PMC, and its members. The PMC manages all the sub-projects for a given umbrella. Each PMC member sphere of interference, then, is the overall project code. Of course given the size of a project code (think about only ALL Jakarta code), the PMC does not deal with each individual commit, but gives guidance (for example) in case of legal complications, overall code guidelines, development methodology and such. Each PMC reports to the Board, and the board is that part of the foundation responsible for all code in all repositories, plus non-trivial matters such as money, conferences and so on... So, where do an ASF member stands? An ASF member is physically one of the owners of the code (given the (C) that we put on each file), but what's its relationship with the code? If he wants to do a commit, he needs to be a committer, if he wants to organize a project, he needs to be in the PMC, and if he wants to manage money or major legal issues he needs to be on the board... An ASF member _is_ the impersonation of the Apache spirit in itself, I might not know ANYTHING about PERL (for example), but if someone asked me to teach a PERL developer all about the Apache way of doing things, I can do that, because I've been around for long, because I've seen it happen all before, because because because, and because of all this, the other ASF members decided I was a person worthy of being a member myself. And not worthy because of what I wrote (doh, I would never be one), but because of what I think, of my opinions and ideas on how things should be done... And this has _major_ influence in how the ASF actually _WORKS_... For example look at our license: why is it drafted that way? Why it's so completely different from the GPL? Because we, members think in a particular way, have a common background of intersecting needs and ideas. Or even look at our latest interaction with your employer (Sun, for the records), about Java specification and their interaction with open-source communities: the project, the code, doesn't matter to the ASF (we're ready to put large portions of it in a trash bin for what it's worth), all that matters is that we can do things how we think they should be done... Now, WHY I got upset with Remm? Because he wrote to Chris (not a member, not a committer, not one of the Apache freaks) from his APACHE.ORG email address (and _therefore_ impersonating the whole Apache community), asking a questionable request. And Chris, since he's a smart kid and figured this all out by himself, actually wrote to the community saying hey what's up, is this guy _really_ representing you all?... I got upset (and still am) because each one of us must be really _aware_ of what he writes in private and/or public when his email address is [EMAIL PROTECTED], because he is _de_facto_ representing an entire community with that email address, and by doing this, he _must_ be so aware of the _responsibilities_ that using that address involves. It's just a matter of ethics... Pier (who rarely posts from his @apache.org address) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: mod_webapp.so socketpool changes..
jean-frederic clere [EMAIL PROTECTED] wrote: Simon, both I and JF have been pretty busy this last few days... I wanted to it out also with Apache 2.0's worker MPM before committing... I have been out for a week... But I will try to find some time today ;-) Same here, this week was crazy... Hopefully I'll get around to get some time to do some OSS work this week-end... Pier (now with a _real_real_ job) -- I think that it's extremely foolish to name a server after the current U.S. President. B.W. Fitzpatrick -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: mod_webapp.so socketpool changes..
Hi John-Frederic, I've only just seen your mail as I've been away for a few days... Is there any update on this? Have you had a chance to look at the updates I made? If you want me to do any more work on this just let me know... BTW I've been testing this on an NT intranet web server running Apache 1.3.24 and more recently 2.0 and so far it's seems to be stable... Simon. [EMAIL PROTECTED] wrote: Pier Fumagalli wrote: [EMAIL PROTECTED] [EMAIL PROTECTED] wrote: Hi, As mentioned in my last email I have updated the socketpool changes to incorporate the changes recommended. I'm not sure if my mail was missed or not but I haven't received any feedback on the latest changes. What's the process to get this code into the codebase? I believe I would need cvs access to commit this (if deemed acceptable) into the source myself. Is this the case? Can someone fill me in Attached are the changes made. Simon, both I and JF have been pretty busy this last few days... I wanted to it out also with Apache 2.0's worker MPM before committing... I have been out for a week... But I will try to find some time today ;-) Pier -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Bad build process for mod_webapp for Apache 2
Jeffrey Bonevich [EMAIL PROTECTED] wrote:
(sorry if this has come through already, but I did not see the post on
the mail archive, so I done went and subscribed to the list to resend it)
For those of you who do not regularly cruise the tomcat-user postings
(you all do that regularly, right? ;-), a number of us in the user
community have been struggling with getting Tomcat 4 integrated with
Apach 2 using mod_webapp. I and a number of other users found a number
of problems in the build process for mod_webapp - biggest of which is
that the Makefile does not actually produce a DSO module (i.e.
mod_webapp.so) for Apache 2. We figured out that the following will do
so (after running configure and make):
cd ${LOCATION_OF_CONNECTOR_SRC}/webapp/lib
gcc -shared -o libwebapp.so *.lo
cd ../apache-2.0
${APACHE_HOME}/build/libtool --silent --mode=link \
gcc -shared -o mod_webapp.so -rpath ${APACHE_HOME}/modules \
-module -avoid-version -I../include -L../lib \
-dlopen ../lib/libwebapp.la mod_webapp.lo
cp mod_webapp.so ${APACHE_HOME}/modules/
I have included a brief HOWTO that I compiled during the process of
figuring this all out. If more information is needed, please let me
know directly to my email (I am not presently on the dev mailing list
distribution).
Jeff. Thank you very much for the code, this will need to be integrated in
out ./configure.in code as well (I know it's broken, I use 2.0 almost
everywhere)...
Will try to patch it up with your changes later during this week-end (or if
you want to tackle M4, well, you're more than welcome! :) :) :)
Pier
--
I think that it's extremely foolish to name a server after the current U.S.
President. B.W. Fitzpatrick
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [COMMENTS] Tomcat 4.1 release plan draft posted
Remy Maucherat [EMAIL PROTECTED] wrote: * Rewritten Jasper JSP page compiler (called Jasper 2) Is this the new Jasper over which Kim is working on? Can it be decoupled from 4.1 as well (meaning, can it be used with 4.0?)... My employer's site is 100% pure JSP, but can't get away from 4.0.2 until we do some major rewriting of stuff... Pier -- I think that it's extremely foolish to name a server after the current U.S. President. B.W. Fitzpatrick -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Daemon Thread Problem in J-T-C
Craig R. McClanahan [EMAIL PROTECTED] wrote: Indeed, a thread dump after the shutdown command is executed shows a bunch of active threads, including those suspended by a wait() at: org.apache.tomcat.util.threads.ThreadPool$MonitorRunnable.run(ThreadPool.java: 407) org.apache.tomcat.util.threads.ThreadPool$MonitorRunnable.run(ThreadPool.java: 495) org.apache.tomcat.util.threads.ThreadPool$MonitorRunnable.run(ThreadPool.java: 495) org.apache.tomcat.util.threads.ThreadPool$MonitorRunnable.run(ThreadPool.java: 495) Do we still really need a thread pool? I believe that the major pain-in-the-neck (Linux) will go away once 2.4.19 gets out of the door once IBM's code get into there (has been approved)... Solaris does thread-pooling already in kernel, and windows (oh well, let's just dump it), I don't know... Any performance ideas (latest stats I've seen are of several years ago, Jserv time)... Pier -- I think that it's extremely foolish to name a server after the current U.S. President. B.W. Fitzpatrick -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [PATCH]org.apache.catalina.connector.warp.WarpRequestHandler.java
Cavan Morris [EMAIL PROTECTED] wrote: Could someone please tell me what I need to do to get the attached patch committed? It fixes a NullPointerException thrown when the Warp Connector is used with a user-data-constraint. I got the original file from the archive located here http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v4.0.4-b2/src/jaka rta-tomcat-connectors-4.0.4-b2-src.zip Thanks Cavan... Pier -- I think that it's extremely foolish to name a server after the current U.S. President. B.W. Fitzpatrick -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Tomcat in industry
Paul Wallace [EMAIL PROTECTED] wrote: Hello, I don't know where I heard it, or if indeed I heard it all, but can someone clarify if Tomcat can be used in industrial strength web applications? That is, is it able to handle for example, traffic of 100 hits p/s? Must it be integrated with the Apache web server to make it so? Where may I find such information regarding this please? Paul, yes, it can... No whatsoever problem if you give him beefy hardware as well... We work with a stripped-down customized version of 4.0.2 and have no problems whatsoever in handling an average of 100 h/sec (only servlet hits), on a dual UltraSparc Iii/400 box with 2 gigs o' ram... But when you're talking about those load the container is just one of several key components which actually come into play. I'm giving a talk at O'Reilly's Open Source Convention this July in San Diego right on this topic... Pier -- I think that it's extremely foolish to name a server after the current U.S. President. B.W. Fitzpatrick -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0 RELEASE-PLAN-4.1.txt
remm02/04/25 15:00:19 Modified:.RELEASE-PLAN-4.1.txt Log: - Update status. - 5199 looks like something which is unclear in the spec (I'll discuss that more in detail later). Revision ChangesPath 1.7 +2 -4 jakarta-tomcat-4.0/RELEASE-PLAN-4.1.txt Index: RELEASE-PLAN-4.1.txt === RCS file: /home/cvs/jakarta-tomcat-4.0/RELEASE-PLAN-4.1.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- RELEASE-PLAN-4.1.txt 25 Apr 2002 19:51:40 - 1.6 +++ RELEASE-PLAN-4.1.txt 25 Apr 2002 22:00:19 - 1.7 @@ -1,4 +1,4 @@ -$Id: RELEASE-PLAN-4.1.txt,v 1.6 2002/04/25 19:51:40 remm Exp $ +$Id: RELEASE-PLAN-4.1.txt,v 1.7 2002/04/25 22:00:19 remm Exp $ Release Plan for Apache Tomcat 4.1 == @@ -75,10 +75,7 @@ -- 4964 popBody() is called before doEndTag() is called in a BodyTag -5199 jsp:param in jsp:include section not correct -5666 Implicit object _value on jsp pages 5793 variable element in tld with TagExtraInfo class -6908 JavaCompiler interface setOutputDir always called with null parameter 7059 Jasper compiler holds pointers to jars in WEB-INF/lib: cannot delete 7989 jsp:setProperty and jsp:getProperty ignore information from jsp:useBean @@ -90,6 +87,7 @@ 4350 SSLAuthenticator did not associate SSO session +5199 jsp:param in jsp:include section not correct 5352 JDBCRealm does not work with CLIENT-CERT auth-method 5551 MANAGER: add system information query 5603 ServletContext.getResourcePaths() returns extra slashes -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common ChannelUn.java Shm.java
costin 02/04/25 15:04:00
Modified:jk/java/org/apache/jk/common ChannelUn.java Shm.java
Log:
Extra checks for APR presence.
Revision ChangesPath
1.16 +3 -0
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java
Index: ChannelUn.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ChannelUn.java25 Apr 2002 18:24:18 - 1.15
+++ ChannelUn.java25 Apr 2002 22:04:00 - 1.16
@@ -176,11 +176,13 @@
public void close(MsgContext ep) throws IOException {
+if( apr==null ) return;
Long s=(Long)ep.getNote( socketNote );
apr.unSocketClose(gPool, s.longValue(),3);
}
public void destroy() throws IOException {
+if( apr==null ) return;
try {
if( tp != null )
tp.shutdown();
@@ -315,6 +317,7 @@
void acceptConnections() {
if( log.isDebugEnabled() )
log.debug(Accepting ajp connections on + file);
+if( apr==null ) return;
while( running ) {
try {
MsgContext ep=new MsgContext();
1.5 +5 -0 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/Shm.java
Index: Shm.java
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/Shm.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Shm.java 25 Apr 2002 18:25:49 - 1.4
+++ Shm.java 25 Apr 2002 22:04:00 - 1.5
@@ -102,6 +102,7 @@
public void init() throws IOException {
super.initNative( shm );
+if( apr==null ) return;
if( file==null ) {
log.error(No shm file, disabling shared memory);
apr=null;
@@ -116,6 +117,7 @@
}
public void attach() throws IOException {
+if( apr==null ) return;
MsgContext mCtx=createMsgContext();
Msg msg=(Msg)mCtx.getMsg(0);
msg.reset();
@@ -126,6 +128,7 @@
}
public void setNativeAttribute(String name, String val) throws IOException {
+if( apr==null ) return;
MsgContext mCtx=createMsgContext();
Msg msg=(Msg)mCtx.getMsg(0);
C2BConverter c2b=(C2BConverter)mCtx.getNote(C2B_NOTE);
@@ -143,6 +146,7 @@
public void registerTomcat(String host, int port)
throws IOException
{
+if( apr==null ) return;
MsgContext mCtx=createMsgContext();
Msg msg=(Msg)mCtx.getMsg(0);
msg.reset();
@@ -172,6 +176,7 @@
public int invoke(Msg msg, MsgContext ep )
throws IOException
{
+if( apr==null ) return;
System.err.println(ChannelShm.invoke: + ep );
super.nativeDispatch( msg, ep, JK_HANDLE_SHM_DISPATCH );
return 0;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Using InstallAnywhere for Tomcat installer
Jon Scott Stevens [EMAIL PROTECTED] wrote: on 4/23/02 2:33 PM, Remy Maucherat [EMAIL PROTECTED] wrote: To get around this, Zero G has offered to donate a license of InstallAnywhere to Tomcat, as well as installer code. I have a strong -1 on this unless the licese is granted to ALL Jakarta projects. It isn't fair to judge one project under Jakarta more worthy of this license over other projects. Hey, what about the XML folks as well? Lots of Java code is developed over there as well. Frankly I'd reject even a license given only to the ASF. I would +1 it only if they had a license (with a little nag at startup, like the one we used to have in Jserv) free for everyone (or open-communities) to use... Pier -- I think that it's extremely foolish to name a server after the current U.S. President. B.W. Fitzpatrick -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Using InstallAnywhere for Tomcat installer
GOMEZ Henri [EMAIL PROTECTED] wrote: Don't want to do the OSS passionaria but we should try to use only OSS tools on Apache. NSIS is OSS so keep. For Free Java installer we have : IZPack : http://www.izforge.com/izpack/ VAInstall : http://vainstall.sourceforge.net/ FreeInstaller : http://www.xenonsoft.demon.co.uk/products/freeinstaller/index.html You're perfectly right... If there are valid alternatives with a compatible license, we simply can't advertise Zero-G over everyone else for free (what about Symantec, what about Aladdin, what about ... You name it)... Pier -- I think that it's extremely foolish to name a server after the current U.S. President. B.W. Fitzpatrick -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Using InstallAnywhere for Tomcat installer
Remy Maucherat [EMAIL PROTECTED] wrote: The licensing terms seems ok to me, so I wanted to see if the community was ok about it (apparently not). I didn't see their licensing terms So even if this installer is provided in addition to other OSS based installers, it's not ok ? Since when is this project refusing contributions from companies, BTW ? There's no explicit endorsement required, and no blinking ZeroG ad we'll have to put anywhere. They'll also provide the installer script. We're endorsing a commercial product when distributing an installer such as Zero-G with our code... Note: Did you notice what the httpd project was using for its installers (http://www.apache.org/dist/httpd/binaries/win32/apache_2.0.35-win32-x86-no_ ssl.msi) ? Doesn't seem OSS to me ... Not OSS, but directly derived from an Operating System... MSI (MicroSoft Installer) is embedded into each copy of Window$, they just leverage a capability already present in the platform... Pier -- I think that it's extremely foolish to name a server after the current U.S. President. B.W. Fitzpatrick -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common JniHandler.java Shm.java
costin 02/04/25 15:44:24
Modified:jk/java/org/apache/jk/common JniHandler.java Shm.java
Log:
Few more fixes, checking if jni is initialized corectly and enabling the components
that depend on that.
Revision ChangesPath
1.2 +1 -0
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JniHandler.java
Index: JniHandler.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JniHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JniHandler.java 25 Apr 2002 18:20:32 - 1.1
+++ JniHandler.java 25 Apr 2002 22:44:23 - 1.2
@@ -115,6 +115,7 @@
apr=(AprImpl)wEnv.getHandler(apr);
if( apr==null || ! apr.isLoaded() ) {
log.error(No apr, disabling jni proxy );
+apr=null;
return;
}
1.6 +1 -1 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/Shm.java
Index: Shm.java
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/Shm.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Shm.java 25 Apr 2002 22:04:00 - 1.5
+++ Shm.java 25 Apr 2002 22:44:23 - 1.6
@@ -176,7 +176,7 @@
public int invoke(Msg msg, MsgContext ep )
throws IOException
{
-if( apr==null ) return;
+if( apr==null ) return 0;
System.err.println(ChannelShm.invoke: + ep );
super.nativeDispatch( msg, ep, JK_HANDLE_SHM_DISPATCH );
return 0;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Problem with java.lang.OutOfMemoryError
Have you tried giving your JVM a bit more memory? Does that keep it stay alive for a little while longer or it makes no difference? The 'sometimes goes down' happens once a day, once a week or once a month? Bojan On Fri, 2002-04-26 at 06:23, Desarrollo e Investigación wrote: Hello. I use Apache Tomcat/4.0.2 in Linux Red Hat 7.1 and sometimes go down with the message: HTTP Status 500 Internal Server Error ... root cause java.lang.OutOfMemoryError I don't know the cause.. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [VOTE] Release Plan for Apache Tomcat 4.1
Remy Maucherat [EMAIL PROTECTED] wrote: [ ] +1 I approve this plan, and will help [X] +0 I approve this plan, but can't help [ ] -0 I am not in favor of this plan [ ] -1 I am against this plan, because: Don't care about the new features of the container... The only thing I'm concerned about ATM are JSPs and those need to go on 4.0 as well... :) Pier -- I think that it's extremely foolish to name a server after the current U.S. President. B.W. Fitzpatrick -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [PROPOSAL] New version numbering scheme
Remy Maucherat [EMAIL PROTECTED] wrote: ballot [X] Yes [ ] No /ballot Big time... -- I think that it's extremely foolish to name a server after the current U.S. President. B.W. Fitzpatrick -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [PROPOSAL] New version numbering scheme
[EMAIL PROTECTED] [EMAIL PROTECTED] wrote: On Wed, 24 Apr 2002, Ignacio J. Ortega wrote: De: Remy Maucherat [mailto:[EMAIL PROTECTED]] Enviado el: miércoles 24 de abril de 2002 23:41 Which will be the rules to advance the build numbers? Probably every time the release manager feels the code is stable and better than the previous build. I'm +1 on the proposal, with the mention that the 'label' should be attached _after_ one week or so - i.e. after the milestone is tested. Each milestone should work and pass some basic tests. Agreed... The stability label can be attached and changed over time... For new releases, they all should come out as Alhpha unless the code is solid Beta stage is assigned after internal/committer tests, and GA (Generally Avaliable) is only when we get feedback from users saying it works... Pier -- I think that it's extremely foolish to name a server after the current U.S. President. B.W. Fitzpatrick -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: mod_webapp.so socketpool changes..
[EMAIL PROTECTED] [EMAIL PROTECTED] wrote: Hi John-Frederic, I've only just seen your mail as I've been away for a few days... Is there any update on this? Have you had a chance to look at the updates I made? If you want me to do any more work on this just let me know... BTW I've been testing this on an NT intranet web server running Apache 1.3.24 and more recently 2.0 and so far it's seems to be stable... Simon, are you using 2.0 on WinNT as well??? Pier -- I think that it's extremely foolish to name a server after the current U.S. President. B.W. Fitzpatrick -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6702] - jk_nt_service.exe -i cannot work
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6702. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6702 jk_nt_service.exe -i cannot work --- Additional Comments From [EMAIL PROTECTED] 2002-04-25 23:05 --- I really don't think there's an actual bug here. This works fine, but you have to be careful about escaping backslashes '\' (or just using forward slashes). The other gotcha is dealing with spaces within the paths (part of this vulnerability was fixed in 3.3.1) but since people are expected to edit wrapper.properties there's always a chance for such errors. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/server JkCoyoteHandler.java JkMain.java
costin 02/04/25 16:13:24
Modified:jk/java/org/apache/jk/common ChannelSocket.java
ChannelUn.java JniHandler.java
jk/java/org/apache/jk/server JkCoyoteHandler.java
JkMain.java
Log:
Fewer messages, more info.
We can remove even more - but I would like to keep at least one line
for each endpoint that is listening.
Revision ChangesPath
1.11 +1 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java
Index: ChannelSocket.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChannelSocket.java23 Apr 2002 16:25:04 - 1.10
+++ ChannelSocket.java25 Apr 2002 23:13:24 - 1.11
@@ -214,7 +214,7 @@
log.error(Can't find free port + startPort + + maxPort );
return;
}
-log.info(Init + port );
+log.info(JK: listening on tcp port + port );
// If this is not the base port and we are the 'main' channleSocket and
// SHM didn't already set the localId - we'll set the instance id
1.17 +2 -2
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java
Index: ChannelUn.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChannelUn.java25 Apr 2002 22:04:00 - 1.16
+++ ChannelUn.java25 Apr 2002 23:13:24 - 1.17
@@ -128,7 +128,7 @@
public void init() throws IOException {
apr=(AprImpl)wEnv.getHandler(apr);
if( apr==null || ! apr.isLoaded() ) {
-log.error(Apr is not available, disabling unix channel );
+log.debug(Apr is not available, disabling unix channel );
apr=null;
return;
}
@@ -163,7 +163,7 @@
if (unixListenSocket0)
throw(new IOException(Cannot create listening socket + file));
-log.info(Listening on unix socket: + file );
+log.info(JK: listening on unix socket: + file );
// Run a thread that will accept connections.
tp.start();
1.3 +3 -2
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JniHandler.java
Index: JniHandler.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JniHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JniHandler.java 25 Apr 2002 22:44:23 - 1.2
+++ JniHandler.java 25 Apr 2002 23:13:24 - 1.3
@@ -114,7 +114,8 @@
protected void initNative(String nativeComponentName) {
apr=(AprImpl)wEnv.getHandler(apr);
if( apr==null || ! apr.isLoaded() ) {
-log.error(No apr, disabling jni proxy );
+if( log.isDebugEnabled() )
+log.debug(No apr, disabling jni proxy );
apr=null;
return;
}
@@ -126,7 +127,7 @@
log.info(Component not found, creating it + nativeComponentName );
nativeJkHandlerP=apr.createJkHandler(xEnv, nativeComponentName);
}
-log.info(Native proxy + nativeJkHandlerP );
+log.debug(Native proxy + nativeJkHandlerP );
apr.releaseJkEnv(xEnv);
}
1.18 +2 -3
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java
Index: JkCoyoteHandler.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JkCoyoteHandler.java 25 Apr 2002 18:27:18 - 1.17
+++ JkCoyoteHandler.java 25 Apr 2002 23:13:24 - 1.18
@@ -94,7 +94,8 @@
protected JkMain jkMain=new JkMain();
public void setProperty( String name, String value ) {
-log.info(setProperty + name + + value );
+if( log.isDebugEnabled())
+log.debug(setProperty + name + + value );
jkMain.setProperty( name, value );
properties.put( name, value );
}
@@ -139,8 +140,6 @@
jkMain.init();
jkMain.start();
-
-log.info(Jk2 started );
headersMsgNote=wEnv.getNoteId( WorkerEnv.ENDPOINT_NOTE, headerMsg );
Re: Problem with java.lang.OutOfMemoryError
Well, the server goes down twice a week. We are working just with servlets and in the web server are connected 150 users, approximate (my english is not so good, sorry). Thanks. Adolfo. On 26 Apr 2002 at 8:50, Bojan Smojver wrote: Have you tried giving your JVM a bit more memory? Does that keep it stay alive for a little while longer or it makes no difference? The 'sometimes goes down' happens once a day, once a week or once a month? Bojan On Fri, 2002-04-26 at 06:23, Desarrollo e Investigación wrote: Hello. I use Apache Tomcat/4.0.2 in Linux Red Hat 7.1 and sometimes go down with the message: HTTP Status 500 Internal Server Error ... root cause java.lang.OutOfMemoryError I don't know the cause.. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connector.jsp
manveen 02/04/25 16:24:31 Modified:webapps/admin/connector connector.jsp Log: Added support for SSL. Revision ChangesPath 1.5 +43 -6 jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp Index: connector.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- connector.jsp 5 Apr 2002 00:02:19 - 1.4 +++ connector.jsp 25 Apr 2002 23:24:31 - 1.5 @@ -83,12 +83,15 @@ /controls:data /controls:row +%-- do not show scheme while creating a new connector --% +logic:notEqual name=connectorForm property=adminAction value=Create controls:row labelStyle=table-label-text dataStyle=table-normal-text controls:labelbean:message key=connector.scheme/:/controls:label controls:data bean:write name=connectorForm property=scheme scope=session/ /controls:data /controls:row + /logic:notEqual controls:row labelStyle=table-label-text dataStyle=table-normal-text controls:labelbean:message key=connector.accept.count/:/controls:label @@ -193,11 +196,7 @@ /controls:data /controls:row -%-- The following properties are supported only on Coyote Connector --% - logic:equal name=connectorForm property=connectorType scope=session - value=CoyoteConnector - br - +%-- The following properties are supported for both Coyote and JK2 Connectors --% controls:row header=true labelStyle=table-header-text dataStyle=table-header-text controls:labelProxy/controls:label controls:datanbsp;/controls:data @@ -216,8 +215,46 @@ html:text property=proxyPortText size=5/ /controls:data /controls:row + +%-- The following properties are supported only on HTTPS JK2 Connector --% + logic:equal name=connectorForm property=connectorType scope=session + value=HTTPS +br + +controls:row header=true labelStyle=table-header-text dataStyle=table-header-text +controls:labelFactory Properties:/controls:label +controls:datanbsp;/controls:data +/controls:row + +controls:row labelStyle=table-label-text dataStyle=table-normal-text +controls:labelbean:message key=connector.client.auth/:/controls:label +controls:data +html:select property=clientAuthentication + bean:define id=booleanVals name=connectorForm property=booleanVals/ + html:options collection=booleanVals property=value + labelProperty=label/ +/html:select +/controls:data +/controls:row + + %-- FIXME: Input only allowed on create transaction?? --% +controls:row labelStyle=table-label-text dataStyle=table-normal-text +controls:labelbean:message key=connector.keystore.filename/:/controls:label +controls:data +html:text property=keyStoreFileName size=15/ +/controls:data +/controls:row + +controls:row labelStyle=table-label-text dataStyle=table-normal-text +controls:labelbean:message key=connector.keystore.password/:/controls:label +controls:data +%-- should the password be of type html:password or is cleartext ok? --% +html:text property=keyStorePassword size=15/ +/controls:data +/controls:row + /logic:equal - /controls:table + /controls:table /td /tr -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector AddConnectorAction.java ConnectorForm.java EditConnectorAction.java SaveConnectorAction.java
manveen 02/04/25 16:28:00
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
AddConnectorAction.java ConnectorForm.java
EditConnectorAction.java SaveConnectorAction.java
Log:
Added support for SSL.
Revision ChangesPath
1.2 +27 -8
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java
Index: AddConnectorAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AddConnectorAction.java 3 Apr 2002 23:35:35 - 1.1
+++ AddConnectorAction.java 25 Apr 2002 23:27:59 - 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
1.1 2002/04/03 23:35:35 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/04/03 23:35:35 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
1.2 2002/04/25 23:27:59 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/04/25 23:27:59 $
*
*
*
@@ -82,7 +82,7 @@
* The codeAction/code that sets up emAdd Connector/em transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/04/03 23:35:35 $
+ * @version $Revision: 1.2 $ $Date: 2002/04/25 23:27:59 $
*/
public class AddConnectorAction extends Action {
@@ -135,7 +135,8 @@
connectorFm.setConnectorName();
String type = request.getParameter(type);
if (type == null)
-type = CoyoteConnector;// default type is CoyoteConnector
+//type = CoyoteConnector;// default type is CoyoteConnector
+type = HTTP;// default type is HTTP
connectorFm.setConnectorType(type);
connectorFm.setDebugLvl(0);
connectorFm.setServiceName(serviceName);
@@ -149,7 +150,10 @@
connectorFm.setRedirectPortText(-1);
connectorFm.setMinProcessorsText(5);
connectorFm.setMaxProcessorsText(20);
-
+connectorFm.setClientAuthentication(false);
+connectorFm.setKeyStoreFileName();
+connectorFm.setKeyStorePassword();
+
// should be set only for Coyote, not supported by all connector types
if (CoyoteConnector.equalsIgnoreCase(type)) {
connectorFm.setProxyName();
@@ -159,21 +163,36 @@
connectorFm.setDebugLvlVals(Lists.getDebugLevels());
connectorFm.setBooleanVals(Lists.getBooleanValues());
+/*
String connectorTypes[] = new String[2];
connectorTypes[0] = CoyoteConnector;
connectorTypes[1] = Ajp13Connector;
+*/
+String schemeTypes[]= new String[2];
+schemeTypes[0] = HTTP;
+schemeTypes[1] = HTTPS;
+
ArrayList types = new ArrayList();
// the first element in the select list should be the type selected
types.add(new LabelValueBean(type,
/admin/AddConnector.do?serviceName= +
URLEncoder.encode(serviceName)
+ type= + type));
-for (int i=0; i connectorTypes.length; i++) {
+ for (int i=0; i schemeTypes.length; i++) {
+if (!type.equalsIgnoreCase(schemeTypes[i])) {
+types.add(new LabelValueBean(schemeTypes[i],
+/admin/AddConnector.do?serviceName= +
URLEncoder.encode(serviceName)
++ type= + schemeTypes[i]));
+}
+/*
+ for (int i=0; i connectorTypes.length; i++) {
if (!type.equalsIgnoreCase(connectorTypes[i])) {
-types.add(new LabelValueBean(connectorTypes[i],
+types.add(new LabelValueBean(schemeTypes[i],
/admin/AddConnector.do?serviceName= +
URLEncoder.encode(serviceName)
+ type= + connectorTypes[i]));
}
+ */
+
}
connectorFm.setConnectorTypeVals(types);
1.7 +85 -10
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java
Index: ConnectorForm.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u
Re: Problem with java.lang.OutOfMemoryError
I've bumped into some problems with out of memory when using StingCharacterIterator on IBM's JDK 1.3.0 and 1.3.1 for Linux (I don't use other platforms, so I don't know if it's platform specific). The piece of code that worked fine suddenly caused problems. The JVM would run out of memory (I use TC 3.3.x). I've changed that code since to use arrays, and all is cool. I'm mentioning this just in case you have similar stuff in your code and similar JVM. I would definitely try to give the JVM a bit more memory (if you have some available), since this could be just a plain lack of memory when the JVM needs more. If you use sessions, there is going to plenty of stuff hanging around before the sessions die by timeout. And that could be eating the memory. And finally and most importantly - I found that most of the problems in my applications (I also use servlets, but with Velocity) are caused by me, not by Tomcat. So, inspecting your code for potential memory leaks, increased logging to figure out what the apps were doing when the problem happens might help too. It might be worthwhile downloading the latest released version of TC 4 too, but since I don't follow the development of TC 4, I'm not sure if any bugs related to memory leaks have been fixed recently. Bojan On Fri, 2002-04-26 at 09:17, Desarrollo e Investigación wrote: Well, the server goes down twice a week. We are working just with servlets and in the web server are connected 150 users, approximate (my english is not so good, sorry). Thanks. Adolfo. On 26 Apr 2002 at 8:50, Bojan Smojver wrote: Have you tried giving your JVM a bit more memory? Does that keep it stay alive for a little while longer or it makes no difference? The 'sometimes goes down' happens once a day, once a week or once a month? Bojan On Fri, 2002-04-26 at 06:23, Desarrollo e Investigación wrote: Hello. I use Apache Tomcat/4.0.2 in Linux Red Hat 7.1 and sometimes go down with the message: HTTP Status 500 Internal Server Error ... root cause java.lang.OutOfMemoryError I don't know the cause.. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Processor.java Http11Protocol.java
billbarker02/04/25 18:50:32
Modified:http11/src/java/org/apache/coyote/http11
Http11Processor.java Http11Protocol.java
Log:
Fix problem with soTimeout.
The makes Coyote act like httpd with respect to soTimeout (which is what it was
trying to do before, but only worked on HTTP/1.0 connectors).
Revision ChangesPath
1.30 +25 -0
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
Index: Http11Processor.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Http11Processor.java 18 Apr 2002 09:11:44 - 1.29
+++ Http11Processor.java 26 Apr 2002 01:50:32 - 1.30
@@ -232,6 +232,11 @@
*/
protected String remoteHost = null;
+/**
+ * Maximum timeout on uploads.
+ */
+protected int timeout = 30; // 5 minutes as in Apache HTTPD server
+
// - Public Methods
@@ -327,6 +332,18 @@
this.socket = socket;
}
+/**
+ * Set the upload timeout.
+ */
+public void setTimeout( int timeouts ) {
+timeout = timeouts * 1000;
+}
+/**
+ * Get the upload timeout.
+ */
+public int getTimeout() {
+return timeout;
+}
/**
* Process pipelined HTTP requests using the specified input and output
@@ -354,10 +371,18 @@
keepAlive = true;
int keepAliveLeft = maxKeepAliveRequests;
+int soTimeout = socket.getSoTimeout();
+boolean keptAlive = false;
+socket.setSoTimeout(timeout);
while (started !error keepAlive) {
try {
+if( keptAlive soTimeout 0 ) {
+socket.setSoTimeout(soTimeout);
+}
inputBuffer.parseRequestLine();
+keptAlive = false;
+socket.setSoTimeout(timeout);
inputBuffer.parseHeaders();
} catch (IOException e) {
error = true;
1.9 +0 -5
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java
Index: Http11Protocol.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Http11Protocol.java 17 Apr 2002 17:31:37 - 1.8
+++ Http11Protocol.java 26 Apr 2002 01:50:32 - 1.9
@@ -164,7 +164,6 @@
protected String sslImplementationName=null;
private int maxKeepAliveRequests=100; // as in Apache HTTPD server
-private int timeout = 30; // 5 minutes as in Apache HTTPD server
private String reportedname;
private int socketCloseDelay=-1;
@@ -289,9 +288,6 @@
return (ServerSocketFactory)chC.newInstance();
}
-public void setTimeout( int timeouts ) {
- timeout = timeouts * 1000;
-}
public void setReportedname( String reportedName) {
reportedname = reportedName;
}
@@ -338,7 +334,6 @@
((ActionHook) processor).action(ActionCode.ACTION_START, null);
}
socket=connection.getSocket();
-socket.setSoTimeout(proto.timeout);
InputStream in = socket.getInputStream();
OutputStream out = socket.getOutputStream();
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Protocol.java
billbarker02/04/25 18:54:54
Modified:http11/src/java/org/apache/coyote/http11 Http11Protocol.java
Log:
If you add an attribute, it helps to be able to actually set it.
Revision ChangesPath
1.10 +5 -0
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java
Index: Http11Protocol.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Http11Protocol.java 26 Apr 2002 01:50:32 - 1.9
+++ Http11Protocol.java 26 Apr 2002 01:54:54 - 1.10
@@ -164,6 +164,7 @@
protected String sslImplementationName=null;
private int maxKeepAliveRequests=100; // as in Apache HTTPD server
+private int timeout = 30; // 5 minutes as in Apache HTTPD server
private String reportedname;
private int socketCloseDelay=-1;
@@ -288,6 +289,9 @@
return (ServerSocketFactory)chC.newInstance();
}
+public void setTimeout( int timeouts ) {
+ timeout = timeouts * 1000;
+}
public void setReportedname( String reportedName) {
reportedname = reportedName;
}
@@ -317,6 +321,7 @@
Http11Processor processor = new Http11Processor();
processor.setAdapter( proto.adapter );
processor.setMaxKeepAliveRequests( proto.maxKeepAliveRequests );
+processor.setTimeout( proto.timeout );
//thData[0]=adapter;
thData[1]=processor;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connector.jsp
manveen 02/04/25 19:11:28 Modified:webapps/admin/connector connector.jsp Log: Added check that one Should not be able to delete the connector on which the admin tool is running. Revision ChangesPath 1.6 +3 -0 jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp Index: connector.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- connector.jsp 25 Apr 2002 23:24:31 - 1.5 +++ connector.jsp 26 Apr 2002 02:11:28 - 1.6 @@ -45,10 +45,13 @@ controls:action selected=true bean:message key=actions.available.actions/ /controls:action controls:action - /controls:action logic:notEqual name=connectorForm property=adminAction value=Create +logic:notEqual name=connectorForm property=portText +value='%= Integer.toString(request.getServerPort()) %' controls:action url='%= /DeleteConnector.do?select= + URLEncoder.encode(thisObjectName) %' bean:message key=actions.connectors.delete/ /controls:action +/logic:notEqual /logic:notEqual /controls:actions /div -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector AddConnectorAction.java DeleteConnectorAction.java
manveen 02/04/25 19:13:48
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
AddConnectorAction.java DeleteConnectorAction.java
Log:
Do not display the connector on which the admin app runs in the list of connectors
that can be deleted.
This operation is prohibited from the admin tool.
Revision ChangesPath
1.3 +7 -25
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java
Index: AddConnectorAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AddConnectorAction.java 25 Apr 2002 23:27:59 - 1.2
+++ AddConnectorAction.java 26 Apr 2002 02:13:48 - 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
1.2 2002/04/25 23:27:59 manveen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/04/25 23:27:59 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
1.3 2002/04/26 02:13:48 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/04/26 02:13:48 $
*
*
*
@@ -82,7 +82,7 @@
* The codeAction/code that sets up emAdd Connector/em transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/04/25 23:27:59 $
+ * @version $Revision: 1.3 $ $Date: 2002/04/26 02:13:48 $
*/
public class AddConnectorAction extends Action {
@@ -135,7 +135,6 @@
connectorFm.setConnectorName();
String type = request.getParameter(type);
if (type == null)
-//type = CoyoteConnector;// default type is CoyoteConnector
type = HTTP;// default type is HTTP
connectorFm.setConnectorType(type);
connectorFm.setDebugLvl(0);
@@ -154,21 +153,13 @@
connectorFm.setKeyStoreFileName();
connectorFm.setKeyStorePassword();
-// should be set only for Coyote, not supported by all connector types
-if (CoyoteConnector.equalsIgnoreCase(type)) {
-connectorFm.setProxyName();
-connectorFm.setProxyPortText(0);
-}
+// supported by both JK2 and Coyote
+connectorFm.setProxyName();
+connectorFm.setProxyPortText(0);
connectorFm.setDebugLvlVals(Lists.getDebugLevels());
connectorFm.setBooleanVals(Lists.getBooleanValues());
-/*
-String connectorTypes[] = new String[2];
-connectorTypes[0] = CoyoteConnector;
-connectorTypes[1] = Ajp13Connector;
-*/
-
String schemeTypes[]= new String[2];
schemeTypes[0] = HTTP;
schemeTypes[1] = HTTPS;
@@ -184,15 +175,6 @@
/admin/AddConnector.do?serviceName= +
URLEncoder.encode(serviceName)
+ type= + schemeTypes[i]));
}
-/*
- for (int i=0; i connectorTypes.length; i++) {
-if (!type.equalsIgnoreCase(connectorTypes[i])) {
-types.add(new LabelValueBean(schemeTypes[i],
-/admin/AddConnector.do?serviceName= +
URLEncoder.encode(serviceName)
-+ type= + connectorTypes[i]));
-}
- */
-
}
connectorFm.setConnectorTypeVals(types);
1.2 +10 -5
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/DeleteConnectorAction.java
Index: DeleteConnectorAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/DeleteConnectorAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DeleteConnectorAction.java4 Apr 2002 00:38:19 - 1.1
+++ DeleteConnectorAction.java26 Apr 2002 02:13:48 - 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/DeleteConnectorAction.java,v
1.1 2002/04/04 00:38:19 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/04/04 00:38:19 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/DeleteConnectorAction.java,v
1.2 2002/04/26 02:13:48 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/04/26 02:13:48 $
*
*
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Processor.java
billbarker02/04/25 19:25:08
Modified:http11/src/java/org/apache/coyote/http11
Http11Processor.java
Log:
The timeout is in MS here.
Revision ChangesPath
1.31 +1 -1
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
Index: Http11Processor.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Http11Processor.java 26 Apr 2002 01:50:32 - 1.30
+++ Http11Processor.java 26 Apr 2002 02:25:08 - 1.31
@@ -336,7 +336,7 @@
* Set the upload timeout.
*/
public void setTimeout( int timeouts ) {
-timeout = timeouts * 1000;
+timeout = timeouts ;
}
/**
* Get the upload timeout.
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans StandardServerMBean.java mbeans-descriptors.xml
craigmcc02/04/25 19:27:33
Modified:catalina/src/share/org/apache/catalina/mbeans
StandardServerMBean.java mbeans-descriptors.xml
Log:
Add the beginnings of the ability to save the current Tomcat configuration
to conf/server.xml.
Revision ChangesPath
1.8 +237 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/StandardServerMBean.java
Index: StandardServerMBean.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/StandardServerMBean.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StandardServerMBean.java 8 Mar 2002 00:42:14 - 1.7
+++ StandardServerMBean.java 26 Apr 2002 02:27:33 - 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/StandardServerMBean.java,v
1.7 2002/03/08 00:42:14 amyroh Exp $
- * $Revision: 1.7 $
- * $Date: 2002/03/08 00:42:14 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/StandardServerMBean.java,v
1.8 2002/04/26 02:27:33 craigmcc Exp $
+ * $Revision: 1.8 $
+ * $Date: 2002/04/26 02:27:33 $
*
*
*
@@ -64,14 +64,19 @@
package org.apache.catalina.mbeans;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanAttributeInfo;
import javax.management.MBeanException;
+import javax.management.MBeanInfo;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.RuntimeOperationsException;
import org.apache.catalina.Server;
-import org.apache.catalina.Service;
import org.apache.catalina.core.StandardServer;
-import org.apache.catalina.core.StandardService;
import org.apache.commons.modeler.BaseModelMBean;
@@ -80,7 +85,7 @@
* codeorg.apache.catalina.core.StandardServer/code component./p
*
* @author Amy Roh
- * @version $Revision: 1.7 $ $Date: 2002/03/08 00:42:14 $
+ * @version $Revision: 1.8 $ $Date: 2002/04/26 02:27:33 $
*/
public class StandardServerMBean extends BaseModelMBean {
@@ -114,10 +119,236 @@
// - Attributes
+/**
+ * Set the value of a specific attribute of this MBean.
+ *
+ * @param attribute The identification of the attribute to be set
+ * and the new value
+ *
+ * @exception AttributeNotFoundException if this attribute is not
+ * supported by this MBean
+ * @exception MBeanException if the initializer of an object
+ * throws an exception
+ * @exception ReflectionException if a Java reflection exception
+ * occurs when invoking the getter
+ */
+public void setAttribute(javax.management.Attribute attribute)
+throws javax.management.AttributeNotFoundException,
+ MBeanException,
+ javax.management.ReflectionException {
+
+// KLUDGE - This is only here to force calling store()
+// until the admin webapp calls it directly
+super.setAttribute(attribute);
+try {
+store();
+} catch (InstanceNotFoundException e) {
+throw new MBeanException(e);
+}
+
+}
// - Operations
+
+/**
+ * Write the configuration information for this entire codeServer/code
+ * out to the server.xml configuration file.
+ *
+ * @exception InstanceNotFoundException if the managed resource object
+ * cannot be found
+ * @exception MBeanException if the initializer of the object throws
+ * an exception, or persistence is not supported
+ * @exception RuntimeOperationsException if an exception is reported
+ * by the persistence mechanism
+ */
+public synchronized void store() throws InstanceNotFoundException,
+MBeanException, RuntimeOperationsException {
+
+// Calculate file objects for the old and new configuration files.
+String configFile = conf/server.xml; // FIXME - configurable?
+File configOld = new File(configFile);
+if (!configOld.isAbsolute()) {
+configOld = new File(System.getProperty(catalina.base),
+ configFile);
+}
+File configNew = new File(configFile + .new);
+if (!configNew.isAbsolute()) {
+configNew = new File(System.getProperty(catalina.base),
+ configFile + .new);
+
unknown protocol : https
Hi all, l'm struck up with a minor problem. l use jsse1.0.2 with jdk1.3 and Tomcat 3.2.1. ln my sslclient, though l added SSLProvider and set system property like this: -- java.security.Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider()); System.setProperty(java.protocol.handler.pkgs, com.sun.net.ssl.internal.www.protocol); -- still l'm getting unknown protocol : https exception when l run my jsp which inturn calls my SSLClient class. jsse.jar is in classpath etc etc.. Suggest me where l am going wrong? regards Rams -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Processor.java
billbarker02/04/25 20:23:46
Modified:http11/src/java/org/apache/coyote/http11
Http11Processor.java
Log:
Fix typo.
Timeouts now seem to be working.
Revision ChangesPath
1.32 +3 -2
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
Index: Http11Processor.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Http11Processor.java 26 Apr 2002 02:25:08 - 1.31
+++ Http11Processor.java 26 Apr 2002 03:23:46 - 1.32
@@ -374,14 +374,15 @@
int soTimeout = socket.getSoTimeout();
boolean keptAlive = false;
socket.setSoTimeout(timeout);
-
+ log.warn(soTimeout = + soTimeout + timeout = + timeout);
while (started !error keepAlive) {
try {
if( keptAlive soTimeout 0 ) {
socket.setSoTimeout(soTimeout);
}
+ log.warn(timeout = + socket.getSoTimeout());
inputBuffer.parseRequestLine();
-keptAlive = false;
+keptAlive = true;
socket.setSoTimeout(timeout);
inputBuffer.parseHeaders();
} catch (IOException e) {
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Processor.java
billbarker02/04/25 20:26:21
Modified:http11/src/java/org/apache/coyote/http11
Http11Processor.java
Log:
Note to self: Remember to take debugging statements out before ci
Revision ChangesPath
1.33 +0 -2
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
Index: Http11Processor.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Http11Processor.java 26 Apr 2002 03:23:46 - 1.32
+++ Http11Processor.java 26 Apr 2002 03:26:21 - 1.33
@@ -374,13 +374,11 @@
int soTimeout = socket.getSoTimeout();
boolean keptAlive = false;
socket.setSoTimeout(timeout);
- log.warn(soTimeout = + soTimeout + timeout = + timeout);
while (started !error keepAlive) {
try {
if( keptAlive soTimeout 0 ) {
socket.setSoTimeout(soTimeout);
}
- log.warn(timeout = + socket.getSoTimeout());
inputBuffer.parseRequestLine();
keptAlive = true;
socket.setSoTimeout(timeout);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties
manveen 02/04/25 20:39:04 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties Log: SSL related properties Revision ChangesPath 1.45 +4 -0 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties Index: ApplicationResources_en.properties === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- ApplicationResources_en.properties24 Apr 2002 06:05:55 - 1.44 +++ ApplicationResources_en.properties26 Apr 2002 03:39:04 - 1.45 @@ -119,6 +119,10 @@ connector.max=Maximum connector.proxy.name=Proxy Name connector.proxy.portnumber=Proxy Port Number +connector.client.auth=Client Authentication +connector.keystore.filename=Keystore Filename +connector.keystore.password=Keystore Password +connector.keyPass.warning=liPlease use keytool to generate certificate./li host.properties=Host Properties host.name=Name host.base=Application Base 1.40 +4 -0 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties Index: ApplicationResources_es.properties === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- ApplicationResources_es.properties24 Apr 2002 06:05:55 - 1.39 +++ ApplicationResources_es.properties26 Apr 2002 03:39:04 - 1.40 @@ -120,6 +120,10 @@ connector.max=M\u00e1ximo connector.proxy.name=Nombre del Proxy connector.proxy.portnumber=N\u00fmero de Puerto del Proxy +connector.client.auth=Client Authentication +connector.keystore.filename=Keystore Filename +connector.keystore.password=Keystore Password +connector.keyPass.warning=liUtilice por favor el keytool para generar el certificado/li host.properties=Propiedades del ordenador principal host.name=Nombre host.base=Base De la Aplicacion -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connectors.jsp
manveen 02/04/25 20:50:41 Modified:webapps/admin/connector connectors.jsp Log: Do not display a checkbox in front of the connector that the admin app runs on in order to prevent it from being deleted through the tool. Revision ChangesPath 1.2 +4 -0 jakarta-tomcat-4.0/webapps/admin/connector/connectors.jsp Index: connectors.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/connector/connectors.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- connectors.jsp4 Apr 2002 00:40:26 - 1.1 +++ connectors.jsp26 Apr 2002 03:50:41 - 1.2 @@ -64,8 +64,12 @@ logic:iterate name=connectorsList id=connector tr class=line-row tddiv align=left class=table-normal-textnbsp; +%-- the connector the admin app is running on cannot be deleted + through the tool --% +logic:notMatch name=connector value='%= Integer.toString(request.getServerPort()) %' html:multibox property=connectors value=%= connector.toString() %/ +/logic:notMatch /div/td tddiv align=left class=table-normal-textnbsp; html:link page='%= /EditConnector.do?select= + -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
