cvs commit: jakarta-tomcat-4.0/webapps/admin/realm jdbcRealm.jsp jndiRealm.jsp memoryRealm.jsp userDatabaseRealm.jsp
manveen 02/05/03 00:16:58 Modified:webapps/admin/realm jdbcRealm.jsp jndiRealm.jsp memoryRealm.jsp userDatabaseRealm.jsp Log: Add a check if the realm can be deleted or not. Revision ChangesPath 1.4 +4 -1 jakarta-tomcat-4.0/webapps/admin/realm/jdbcRealm.jsp Index: jdbcRealm.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/jdbcRealm.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jdbcRealm.jsp 24 Mar 2002 04:13:24 - 1.3 +++ jdbcRealm.jsp 3 May 2002 07:16:58 - 1.4 @@ -23,6 +23,7 @@ html:hidden property=adminAction/ html:hidden property=parentObjectName/ html:hidden property=objectName/ + html:hidden property=allowDeletion/ table width=100% border=0 cellspacing=0 cellpadding=0 tr bgcolor=7171A5 @@ -42,10 +43,12 @@ controls:action selected=true bean:message key=actions.available.actions/ /controls:action controls:action - /controls:action logic:notEqual name=jdbcRealmForm property=adminAction value=Create +logic:notEqual name=userDatabaseRealmForm property=allowDeletion value=false controls:action url='%= /DeleteRealm.do?select= + URLEncoder.encode(thisObjectName) %' bean:message key=actions.realms.delete/ - /controls:action + /controls:action + /logic:notEqual /logic:notEqual /controls:actions /div 1.4 +4 -1 jakarta-tomcat-4.0/webapps/admin/realm/jndiRealm.jsp Index: jndiRealm.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/jndiRealm.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jndiRealm.jsp 24 Mar 2002 04:13:24 - 1.3 +++ jndiRealm.jsp 3 May 2002 07:16:58 - 1.4 @@ -22,6 +22,7 @@ html:hidden property=adminAction/ html:hidden property=objectName/ html:hidden property=parentObjectName/ + html:hidden property=allowDeletion/ table width=100% border=0 cellspacing=0 cellpadding=0 tr bgcolor=7171A5 @@ -41,11 +42,13 @@ controls:action selected=true bean:message key=actions.available.actions/ /controls:action controls:action - /controls:action logic:notEqual name=jndiRealmForm property=adminAction value=Create +logic:notEqual name=userDatabaseRealmForm property=allowDeletion value=false controls:action url='%= /DeleteRealm.do?select= + URLEncoder.encode(thisObjectName) %' bean:message key=actions.realms.delete/ /controls:action - /logic:notEqual + /logic:notEqual +/logic:notEqual /controls:actions /div /td 1.4 +3 -0 jakarta-tomcat-4.0/webapps/admin/realm/memoryRealm.jsp Index: memoryRealm.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/memoryRealm.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- memoryRealm.jsp 24 Mar 2002 04:13:24 - 1.3 +++ memoryRealm.jsp 3 May 2002 07:16:58 - 1.4 @@ -23,6 +23,7 @@ html:hidden property=parentObjectName/ html:hidden property=adminAction/ html:hidden property=objectName/ + html:hidden property=allowDeletion/ table width=100% border=0 cellspacing=0 cellpadding=0 tr bgcolor=7171A5 @@ -42,10 +43,12 @@ controls:action selected=true bean:message key=actions.available.actions/ /controls:action controls:action - /controls:action logic:notEqual name=memoryRealmForm property=adminAction value=Create +logic:notEqual name=userDatabaseRealmForm property=allowDeletion value=false controls:action url='%= /DeleteRealm.do?select= + URLEncoder.encode(thisObjectName) %' bean:message key=actions.realms.delete/ /controls:action +/logic:notEqual /logic:notEqual /controls:actions /div 1.4 +4 -1 jakarta-tomcat-4.0/webapps/admin/realm/userDatabaseRealm.jsp Index: userDatabaseRealm.jsp
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm EditRealmAction.java JDBCRealmForm.java JNDIRealmForm.java MemoryRealmForm.java UserDatabaseRealmForm.java
manveen 02/05/03 00:19:23
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
EditRealmAction.java JDBCRealmForm.java
JNDIRealmForm.java MemoryRealmForm.java
UserDatabaseRealmForm.java
Log:
Add a check is delete this realm operation should be enabled from the realm page.
Realms under the service, host or context same as the admin app should not be deleted.
Revision ChangesPath
1.4 +52 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java
Index: EditRealmAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EditRealmAction.java 16 Apr 2002 06:00:17 - 1.3
+++ EditRealmAction.java 3 May 2002 07:19:23 - 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v
1.3 2002/04/16 06:00:17 manveen Exp $
- * $Revision: 1.3 $
- * $Date: 2002/04/16 06:00:17 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v
1.4 2002/05/03 07:19:23 manveen Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/05/03 07:19:23 $
*
*
*
@@ -92,7 +92,7 @@
* Realm /em transactions, based on the type of Realm.
*
* @author Manveen Kaur
- * @version $Revision: 1.3 $ $Date: 2002/04/16 06:00:17 $
+ * @version $Revision: 1.4 $ $Date: 2002/05/03 07:19:23 $
*/
public class EditRealmAction extends Action {
@@ -111,6 +111,7 @@
private HttpSession session = null;
private Locale locale = null;
+private HttpServletRequest request = null;
// - Public Methods
@@ -137,6 +138,7 @@
// Acquire the resources that we need
session = request.getSession();
+this.request = request;
locale = (Locale) session.getAttribute(Action.LOCALE_KEY);
if (resources == null) {
resources = getServlet().getResources();
@@ -217,6 +219,8 @@
realmFm.setNodeLabel(sb.toString());
realmFm.setRealmType(realmType);
realmFm.setDebugLvlVals(Lists.getDebugLevels());
+realmFm.setAllowDeletion(allowDeletion(rname));
+
String attribute = null;
try {
@@ -254,6 +258,8 @@
realmFm.setNodeLabel(sb.toString());
realmFm.setRealmType(realmType);
realmFm.setDebugLvlVals(Lists.getDebugLevels());
+realmFm.setAllowDeletion(allowDeletion(rname));
+
String attribute = null;
try {
@@ -291,6 +297,8 @@
realmFm.setNodeLabel(sb.toString());
realmFm.setRealmType(realmType);
realmFm.setDebugLvlVals(Lists.getDebugLevels());
+realmFm.setAllowDeletion(allowDeletion(rname));
+
String attribute = null;
try {
@@ -353,6 +361,8 @@
realmFm.setRealmType(realmType);
realmFm.setDebugLvlVals(Lists.getDebugLevels());
realmFm.setSearchVals(Lists.getBooleanValues());
+realmFm.setAllowDeletion(allowDeletion(rname));
+
String attribute = null;
try {
@@ -404,4 +414,42 @@
attribute));
}
}
+
+/*
+ * Check if delete this realm operation should be enabled.
+ * this operation is not allowed in case the realm is under service,
+ * host or context that the admin app runs on.
+ * return true if deletion is allowed.
+ */
+
+private String allowDeletion(ObjectName rname) {
+
+ boolean retVal = true;
+ try{
+// admin app's values
+String adminService = Lists.getAdminAppService(
+ mBServer, rname.getDomain(),request);
+String adminHost = request.getServerName();
+String adminContext = request.getContextPath();
+
+String thisService = rname.getKeyProperty(service);
+String thisHost = rname.getKeyProperty(host);
+String thisContext = rname.getKeyProperty(path);
+
+// realm is under context
+if (thisContext!=null) {
+retVal = !(thisContext.equalsIgnoreCase(adminContext));
+} else if (thisHost != null) {
+// realm is under host
+retVal =
Re: cvs commit: jakarta-tomcat-4.0/webapps/admin/users user.jsp
- Original Message - From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Thursday, May 02, 2002 9:45 PM Subject: cvs commit: jakarta-tomcat-4.0/webapps/admin/users user.jsp manveen 02/05/02 21:45:46 Modified:webapps/admin/users user.jsp Log: * Password should not be displayed in clear text. Since the Password is only obscured on the client's browser, without a confirm password box, this really doesn't make the app more secure. But it does make it more error prone to random typos. Just my opinion, since I'm not actively involved with coding. N.B. I really like the new look of the Manager. Greate job! -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: PROPOSAL: mod_jk2: Group/Instance
Hi Costin, May be I checked out the wrong repository. I checked out jakarta-tomcat-connectors with the CVSROOT=:pserver:[EMAIL PROTECTED]:/home/cvspublic Now to the details, see below. [EMAIL PROTECTED] wrote: On Thu, 2 May 2002, Bernd Koecke wrote: misunderstood it. After you said that my patch is included a had a closer look at mod_jk. I can't see anything of my code but I found the special meaning of the zero lb_factor/lb_value. It seems that I didn't understand it right at the first time. This could solve my problem but after a closer look and some testing I found another problem. When you set the lb_value in workers.properties to 1 for the local tomcat and 0 for the others, you get the desired behavior. But if you switch off the local tomcat for a short time you come into trouble. The problem is the 0 for the other workers. The calculation of lb_worker transforms the 0 to _inf_. Because 1/0 for a double is _inf_. This is greater than any I think there is a piece that checks for 0 and sets it to DEFAULT_VALUE (==1 ) before doing 1/lb. No, I think not :). I checked it yesterday. With some additional log statements in the validate function of jk_lb_worker.c you get the value _inf_ for the lb_factor and lb_value (line 434-444). Because if it would be set to 1, my config hadn't worked. Because I set the local worker to 1 and the others to 0. While looking at the code - I'm not very sure this whole float is needed, I'll try to find a way to simplify it and use ints ( maybe 0..100 with some 'special' values for NEVER and ALLWAYS, or some additional flags ). This is possible, but then you must add a check if the value is 0. Because without it you calc 1/0 with an int and this will give you an error. But the way it works ( or at least how I understand it ) is that if the main worker fails, then we look at all workers in error state and try the one with the oldest error. And the 'main' worker will be tried again when the timeout expires. Thats not the whole story. Its right you will check the main worker when its back again and use it only once. Because when the request was successful handled rec-in_recovering is true (line 332 of jk_lb_worker.c, service function). Than get_max_lb get the value _inf_ from one of the other worker. Than the things happen which I said in my prior mail. I haven't tested this too much, I just applied the patches ( that I understand :-), I'll add some more debugging for this process and maybe we can find a better solution. But this functionality is essential for the JNI worker and very important in general - so I really want to find the best solution. If you have any patch idea, let me know. To avoid further confusion and complexity in the lb-factor/value, I think we should add one more flag ( 'local_worker' ? ) and use it explicitely. Again, patches are wellcome - it's allways good to have different ( and more ) eyes looking at the code. That was it what I did in my sent patch, the additional documentation was sent a few days later. But my additions to the lb_worker were a little bit to complex. You are right we should get it when we use the flag only on the main worker and change the behavior after a failure for this worker. But we need the trick with 0/inf for the other worker, because only with this we have the situation that the other worker wouldn't be asked when there is no session and the main worker is up. I will try to build another patch and send it. I think it could be possible without an additional flag. Another tought about this: When you use double and we fix the handling after an error, the main worker would never reach _inf_. Because the lb_factor is 1 if lb_value wasn't 0. After choosing the worker this value is added to the lb_value. But with a high value for lb_value the differenc between two savable double numbers is greater than the lb_factor. But this is only interessting in theory. I think in real world we will reboot apache before this will happen :). Bernd ( that can go in both jk1, but I can't see a release of jk2 without this functionality ) Costin other lb_value and greater than the lb_value of the local tomcat. But after a failure of the local tomcat he is in error_state. After some time its set to recovering and if the local tomcat is back again the function jk(2)_get_max_lb gets the highest lb_value. This is _inf_ from one of the other workers. The addition of a value to _inf_ is meaningless. You end up with an lb_value of _inf_ for the local worker. If this worker isn't the first in the worker list, it will never be choosen again. Because his lb_value will never be less than another lb_value, because all the other workers have _inf_ as theire lb_values. So every request without a session will be routed to the first of the other tomcats. The only way out is a restart of the local apache after tomcat is up and running. But I don't
[PATHC] jakarta-tomcat-connectors Re: PROPOSAL: mod_jk2: Group/Instance
Hi Costin, now here is my patch. It is very small and it works. And we don't need additional config flags. When the lb_value is read from the config file it is checked against zero. With this a flag in lb_worker is set so that the get_max_lb-function could decide if this worker should be used or not. When you set lb_value of the main or local worker to 1 and 0 for the others all works fine. When you switch off the main worker you will be routed to the first of the other worker. Thats not very balancing, but the load balancer in front of the cluster shouldn't send requestes to a node with a shutdowned tomcat. It is only for requests with sessions on this node and for the time between shutdown of tomcat and the recognition of this by the balancer. When tomcat is up again it will take a little time, in maximum the value of WAIT_BEFORE_RECOVER and the worker will be choosen and because of the flag it wouldn't get _inf_ as his lb_value. the patch was created by cvs diff -u jk_lb_worker.c Bernd Bernd Koecke wrote: Hi Costin, May be I checked out the wrong repository. I checked out jakarta-tomcat-connectors with the CVSROOT=:pserver:[EMAIL PROTECTED]:/home/cvspublic Now to the details, see below. [EMAIL PROTECTED] wrote: On Thu, 2 May 2002, Bernd Koecke wrote: misunderstood it. After you said that my patch is included a had a closer look at mod_jk. I can't see anything of my code but I found the special meaning of the zero lb_factor/lb_value. It seems that I didn't understand it right at the first time. This could solve my problem but after a closer look and some testing I found another problem. When you set the lb_value in workers.properties to 1 for the local tomcat and 0 for the others, you get the desired behavior. But if you switch off the local tomcat for a short time you come into trouble. The problem is the 0 for the other workers. The calculation of lb_worker transforms the 0 to _inf_. Because 1/0 for a double is _inf_. This is greater than any I think there is a piece that checks for 0 and sets it to DEFAULT_VALUE (==1 ) before doing 1/lb. No, I think not :). I checked it yesterday. With some additional log statements in the validate function of jk_lb_worker.c you get the value _inf_ for the lb_factor and lb_value (line 434-444). Because if it would be set to 1, my config hadn't worked. Because I set the local worker to 1 and the others to 0. While looking at the code - I'm not very sure this whole float is needed, I'll try to find a way to simplify it and use ints ( maybe 0..100 with some 'special' values for NEVER and ALLWAYS, or some additional flags ). This is possible, but then you must add a check if the value is 0. Because without it you calc 1/0 with an int and this will give you an error. But the way it works ( or at least how I understand it ) is that if the main worker fails, then we look at all workers in error state and try the one with the oldest error. And the 'main' worker will be tried again when the timeout expires. Thats not the whole story. Its right you will check the main worker when its back again and use it only once. Because when the request was successful handled rec-in_recovering is true (line 332 of jk_lb_worker.c, service function). Than get_max_lb get the value _inf_ from one of the other worker. Than the things happen which I said in my prior mail. I haven't tested this too much, I just applied the patches ( that I understand :-), I'll add some more debugging for this process and maybe we can find a better solution. But this functionality is essential for the JNI worker and very important in general - so I really want to find the best solution. If you have any patch idea, let me know. To avoid further confusion and complexity in the lb-factor/value, I think we should add one more flag ( 'local_worker' ? ) and use it explicitely. Again, patches are wellcome - it's allways good to have different ( and more ) eyes looking at the code. That was it what I did in my sent patch, the additional documentation was sent a few days later. But my additions to the lb_worker were a little bit to complex. You are right we should get it when we use the flag only on the main worker and change the behavior after a failure for this worker. But we need the trick with 0/inf for the other worker, because only with this we have the situation that the other worker wouldn't be asked when there is no session and the main worker is up. I will try to build another patch and send it. I think it could be possible without an additional flag. Another tought about this: When you use double and we fix the handling after an error, the main worker would never reach _inf_. Because the lb_factor is 1 if lb_value wasn't 0. After choosing the worker this value is added to the lb_value. But with a high value for lb_value the differenc between two
cvs commit: jakarta-tomcat-connectors/webapp/include wa_version.h
hgomez 02/05/03 01:41:36 Added: webapp/include wa_version.h Log: Add mod_webapp version include as discussed we start at version 1.2.0 Provided by Punky Tse [EMAIL PROTECTED] Revision ChangesPath 1.1 jakarta-tomcat-connectors/webapp/include/wa_version.h Index: wa_version.h === /* = * * * * The Apache Software License, Version 1.1 * * * * Copyright (c) 1999-2001 The Apache Software Foundation. * * All rights reserved.* * * * = * * * * Redistribution and use in source and binary forms, with or without modi- * * fication, are permitted provided that the following conditions are met: * * * * 1. Redistributions of source code must retain the above copyright notice * *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, WebApp, 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 Software Foundation.* * * * 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 indivi- * * duals on behalf of the Apache Software Foundation. For more information * * on the Apache Software Foundation, please see http://www.apache.org/. * * * * = */ #ifndef _WA_VERSION_H_ #define _WA_VERSION_H_ /**
cvs commit: jakarta-tomcat-connectors/webapp/apache-2.0 mod_webapp.c
hgomez 02/05/03 01:42:40
Modified:webapp/apache-1.3 mod_webapp.c
webapp/apache-2.0 mod_webapp.c
Log:
mod_webapp will now report it's current version
Provided by Puky Tse [EMAIL PROTECTED]
Revision ChangesPath
1.32 +8 -2 jakarta-tomcat-connectors/webapp/apache-1.3/mod_webapp.c
Index: mod_webapp.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/mod_webapp.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mod_webapp.c 17 Jan 2002 17:02:13 - 1.31
+++ mod_webapp.c 3 May 2002 08:42:40 - 1.32
@@ -57,7 +57,7 @@
/**
* @author Pier Fumagalli mailto:[EMAIL PROTECTED]
- * @version $Id: mod_webapp.c,v 1.31 2002/01/17 17:02:13 jfclere Exp $
+ * @version $Id: mod_webapp.c,v 1.32 2002/05/03 08:42:40 hgomez Exp $
*/
#include httpd.h
@@ -68,6 +68,7 @@
#include http_protocol.h
#include util_script.h
#include wa.h
+#include wa_version.h
/* * */
/* GENERIC DECLARATIONS */
@@ -82,6 +83,11 @@
/* The main server using for logging error not related to requests */
static server_rec *server=NULL;
+static void wam_init_handler(server_rec *s, ap_pool *p)
+{
+ap_add_version_component(WA_EXPOSED_VERSION);
+}
+
/* * */
/* MODULE AND LIBRARY INITIALIZATION AND DESTRUCTION */
/* * */
@@ -532,7 +538,7 @@
/* Apache module declaration */
module MODULE_VAR_EXPORT webapp_module = {
STANDARD_MODULE_STUFF,
-NULL, /* module initializer */
+wam_init_handler, /* module initializer */
NULL, /* per-directory config creator */
NULL, /* dir config merger */
NULL, /* server config creator */
1.8 +10 -1 jakarta-tomcat-connectors/webapp/apache-2.0/mod_webapp.c
Index: mod_webapp.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-2.0/mod_webapp.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_webapp.c 17 Jan 2002 17:02:13 - 1.7
+++ mod_webapp.c 3 May 2002 08:42:40 - 1.8
@@ -57,7 +57,7 @@
/**
* @author Pier Fumagalli mailto:[EMAIL PROTECTED]
- * @version $Id: mod_webapp.c,v 1.7 2002/01/17 17:02:13 jfclere Exp $
+ * @version $Id: mod_webapp.c,v 1.8 2002/05/03 08:42:40 hgomez Exp $
*/
#include httpd.h
@@ -69,6 +69,7 @@
#include http_protocol.h
#include util_script.h
#include wa.h
+#include wa_version.h
#include apr_tables.h
/* * */
@@ -88,6 +89,13 @@
/* MODULE AND LIBRARY INITIALIZATION AND DESTRUCTION */
/* * */
+static int wam_init_handler(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,
+ server_rec *s)
+{
+ap_add_version_component(p, WA_EXPOSED_VERSION);
+return OK;
+}
+
/* Destroy the module and the WebApp Library */
static apr_status_t wam_shutdown(void *data) {/*void *nil) { */
if (!wam_initialized) return APR_SUCCESS;
@@ -526,6 +534,7 @@
ap_hook_translate_name(wam_match, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_child_init(wam_startup, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_map_to_storage(wam_map_to_storage, NULL, NULL, APR_HOOK_MIDDLE);
+ap_hook_post_config(wam_init_handler, NULL, NULL, APR_HOOK_MIDDLE);
}
/* Apache module declaration */
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp/support wa_apxs.m4 wa_util.m4
pier02/05/03 02:38:52
Modified:webapp/support wa_apxs.m4 wa_util.m4
Log:
Added WA_PATH_PROG (cuz' AC_PATH_PROG is just plain silly), and HTTPD
version discovery.
Revision ChangesPath
1.6 +27 -14jakarta-tomcat-connectors/webapp/support/wa_apxs.m4
Index: wa_apxs.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/wa_apxs.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wa_apxs.m41 May 2002 20:58:36 - 1.5
+++ wa_apxs.m43 May 2002 09:38:52 - 1.6
@@ -57,7 +57,7 @@
dnl --
dnl Author Pier Fumagalli [EMAIL PROTECTED]
-dnl Version $Id: wa_apxs.m4,v 1.5 2002/05/01 20:58:36 pier Exp $
+dnl Version $Id: wa_apxs.m4,v 1.6 2002/05/03 09:38:52 pier Exp $
dnl --
dnl --
@@ -86,19 +86,7 @@
esac
])
AC_MSG_RESULT([${wa_apxs_tempval}])
-if test -x ${wa_apxs_tempval} ; then
- wa_apxs_tempdir=`dirname ${wa_apxs_tempval}`
- wa_apxs_tempfil=`basename ${wa_apxs_tempval}`
- WA_PATH_DIR([wa_apxs_tempdir],[${wa_apxs_tempdir}],[apxs])
- $1=${wa_apxs_tempdir}/${wa_apxs_tempfil}
-else
- AC_PATH_PROG($1,[${wa_apxs_tempval}])
-fi
-
-if test -z ${$1} ; then
- AC_MSG_ERROR([cannot find apxs utility ${wa_apxs_tempval}])
- exit 1
-fi
+WA_PATH_PROG([$1],[${wa_apxs_tempval}],[apxs])
unset wa_apxs_tempval
])
@@ -153,4 +141,29 @@
AC_MSG_RESULT([${wa_apxs_get_tempval}])
WA_APPEND([$1],[${wa_apxs_get_tempval}])
unset wa_apxs_get_tempval
+ ])
+
+dnl --
+dnl WA_APXS_SERVER
+dnl Retrieve the HTTP server version via APXS
+dnl $1 = Environment variable where the info string will be stored
+dnl $2 = Name of the APXS script (as returned by WA_APXS)
+dnl --
+AC_DEFUN(
+ [WA_APXS_SERVER],
+ [
+WA_APXS_GET([wa_apxs_server_sbindir],[$2],[SBINDIR])
+WA_APXS_GET([wa_apxs_server_target],[$2],[TARGET])
+wa_apxs_server_daemon=${wa_apxs_server_sbindir}/${wa_apxs_server_target}
+WA_PATH_PROG([wa_apxs_server_daemon],[${wa_apxs_server_daemon}],[httpd])
+AC_MSG_CHECKING([httpd version])
+wa_apxs_server_info=`${wa_apxs_server_daemon} -v | head -1`
+wa_apxs_server_info=`echo ${wa_apxs_server_info} | cut -d: -f2`
+wa_apxs_server_info=`echo ${wa_apxs_server_info}`
+AC_MSG_RESULT([${wa_apxs_server_info}])
+$1=${wa_apxs_server_info}
+unset wa_apxs_server_sbindir
+unset wa_apxs_server_target
+unset wa_apxs_server_daemon
+unset wa_apxs_server_info
])
1.5 +30 -2 jakarta-tomcat-connectors/webapp/support/wa_util.m4
Index: wa_util.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/wa_util.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wa_util.m41 May 2002 20:58:36 - 1.4
+++ wa_util.m43 May 2002 09:38:52 - 1.5
@@ -57,7 +57,7 @@
dnl --
dnl Author Pier Fumagalli [EMAIL PROTECTED]
-dnl Version $Id: wa_util.m4,v 1.4 2002/05/01 20:58:36 pier Exp $
+dnl Version $Id: wa_util.m4,v 1.5 2002/05/03 09:38:52 pier Exp $
dnl --
dnl --
@@ -105,6 +105,34 @@
])
dnl --
+dnl WA_PATH_PROG
+dnl Resolve the FULL path name of an executable.
+dnl $1 = The variable where the full path name will be stored.
+dnl $2 = The executable to resolve.
+dnl $3 = The description of what we're trying to locate.
+dnl --
+AC_DEFUN(
+ [WA_PATH_PROG],
+ [
+wa_path_prog_tempval=`echo $2`
+if test -x ${wa_path_prog_tempval} ; then
+ wa_path_prog_tempdir=`dirname ${wa_path_prog_tempval}`
+ wa_path_prog_tempfil=`basename ${wa_path_prog_tempval}`
+ WA_PATH_DIR([wa_path_prog_tempdir],[${wa_path_prog_tempdir}],[$3])
+ $1=${wa_path_prog_tempdir}/${wa_path_prog_tempfil}
+else
+ AC_PATH_PROG($1,[${wa_path_prog_tempval}])
+fi
+AC_MSG_CHECKING([for $3 binary path])
+if test -z ${$1} ; then
+
DO NOT REPLY [Bug 8718] - missing directories
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=8718. 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=8718 missing directories [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME --- Additional Comments From [EMAIL PROTECTED] 2002-05-03 10:18 --- Without any further details, the latest nightly .zip looks good to me. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp/include wa_version.h
hgomez 02/05/03 03:25:04 Modified:webapp/include wa_version.h Log: correct webapp release number. 1.2.0-dev instead of 1.0.2 Thanks Punky Revision ChangesPath 1.2 +3 -3 jakarta-tomcat-connectors/webapp/include/wa_version.h Index: wa_version.h === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/include/wa_version.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wa_version.h 3 May 2002 08:41:36 - 1.1 +++ wa_version.h 3 May 2002 10:25:04 - 1.2 @@ -61,9 +61,9 @@ /** START OF AREA TO MODIFY BEFORE RELEASING */ #define WA_VERMAJOR 1 -#define WA_VERMINOR 0 -#define WA_VERFIX 2 -#define WA_VERSTRING1.0.2 +#define WA_VERMINOR 2 +#define WA_VERFIX 0 +#define WA_VERSTRING1.2.0-dev /* Beta number */ #define WA_VERBETA 1 -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [PROPOSAL] tag mod_jk 1.2.1
Hi to all, What about tagging the current mod_jk (may be after the latest lb patches) to 1.2.1 ? The goal is to populate the jtc builds directory and make binary available for various platform (Linux, Win32, Netware). +1. Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvscommit:jakarta-tomcat-connectors/webapp/supportbuildconf.sh
Punky Tse [EMAIL PROTECTED] wrote: I had been make this patch for a very long time (3/4/5 months). And send to this list several times... If you like, just grap my patch and comit. (wa_version.h must be placed in include/ dir, and change to *whatever* version you like!) Punky, I appreciate your effort, but IMO, wa_version.h is way too utterly complicated. I'd add -DWEBAPP_VERSION=x to CFLAGS from the autoconf magicness, and go from there... Pier -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/webapp/apache-2.0mod_webapp.c
[EMAIL PROTECTED] [EMAIL PROTECTED] wrote: hgomez 02/05/03 01:42:40 Modified:webapp/apache-1.3 mod_webapp.c webapp/apache-2.0 mod_webapp.c Log: mod_webapp will now report it's current version Provided by Puky Tse [EMAIL PROTECTED] As I said, I'm -1 on this patch... Pier -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Admin webapp save-to-XML
The save-to-XML feature of the admin webapp appears to be working good (of course, I only tried the default configuration ;-) ). I don't know what is the policy that will be used for ovewiting the existing server.xml, but I would do: - rename existing server.xml to server.xml.timestamp.old - write the new one to server.xml Is this what was planned ? Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvscommit:jakarta-tomcat-connectors/webapp/supportbuildconf.sh
Pier Fumagalli wrote: Punky Tse [EMAIL PROTECTED] wrote: I had been make this patch for a very long time (3/4/5 months). And send to this list several times... If you like, just grap my patch and comit. (wa_version.h must be placed in include/ dir, and change to *whatever* version you like!) Punky, I appreciate your effort, but IMO, wa_version.h is way too utterly complicated. I'd add -DWEBAPP_VERSION=x to CFLAGS from the autoconf magicness, and go from there... Sorry man, when I saw Henri commited my version patch also this morning, and you've commited VERSION file. I had seen some conflicts. Hum what do you think? 1. incorporate VERSION file to (modified and clean) wa_version.h through configure? 2. delete wa_version.h and patch mod_webapp.c in apache-1.3 and apache-2.0 currently in CVS? 3. other ways? Sorry, I had made confusion to you guys. Pier Punky -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: cvscommit:jakarta-tomcat-connectors/webapp/supportbuildconf.sh
Sorry man, when I saw Henri commited my version patch also this morning, and you've commited VERSION file. I had seen some conflicts. I'll be +1 to keep wa_version.h : - it's the same way in mod_jk (merge merge said Jon) - it's the same way in httpd server And it works rigth now -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvscommit:jakarta-tomcat-connectors/webapp/supportbuildconf.sh
GOMEZ Henri [EMAIL PROTECTED] wrote: Punky, I appreciate your effort, but IMO, wa_version.h is way too utterly complicated. I'd add -DWEBAPP_VERSION=x to CFLAGS from the autoconf magicness, and go from there... Hum, I just commited wa_version.h and it's really similar to what Jean-Frederic proposed and commited to mod_jk. And it's what httpd 2.0 (ap_release.h) use Well, it seriously look ugly though... Ok, I admit it might be a PITA cuz in Windows we can't simply do a `cat VERSION` and get that number in somewhere, but boy that wa_version header looks ugly... Just the fact that we somehow have an area to modify and one not, _is_ complicating things around... Secondly, I don't want to have alpha/beta/gamma/whatever compiled in the code: for releasing purpose, a code is x.x.x-dev if it's not associated with a tag, and x.x.x when it actually _IS_ associated with a tag... When we tag a release, we call it 1.2.0, and then depending on how well it goes, we can promote it from beta to gamma to whatever, but we will NOT rebuild the binaries... I'll commit a patch... Pier -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: cvscommit:jakarta-tomcat-connectors/webapp/supportbuildconf.sh
Secondly, I don't want to have alpha/beta/gamma/whatever compiled in the code: for releasing purpose, a code is x.x.x-dev if it's not associated with a tag, and x.x.x when it actually _IS_ associated with a tag... ditto, that's why the recent proposal from Remy for TC 4, was to use the Apache HTTPD release scheme x.y.z. You are x.y.z-dev up to the time you make a release where you became x.y.z When we tag a release, we call it 1.2.0, and then depending on how well it goes, we can promote it from beta to gamma to whatever, but we will NOT rebuild the binaries... I'll commit a patch... Simple, before release remove the -dev in wa_version.h ;) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit:jakarta-tomcat-connectors/webapp/apache-2.0mod_webapp.c
GOMEZ Henri [EMAIL PROTECTED] wrote: Log: mod_webapp will now report it's current version Provided by Puky Tse [EMAIL PROTECTED] As I said, I'm -1 on this patch... -1 on wa_version.h, or -1 on version report in error.log ? -1 on THIS way for doing versions... Check out the masters: -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvscommit:jakarta-tomcat-connectors/webapp/supportbuildconf.sh
Punky Tse [EMAIL PROTECTED] wrote: Pier Fumagalli wrote: Punky Tse [EMAIL PROTECTED] wrote: I had been make this patch for a very long time (3/4/5 months). And send to this list several times... If you like, just grap my patch and comit. (wa_version.h must be placed in include/ dir, and change to *whatever* version you like!) Punky, I appreciate your effort, but IMO, wa_version.h is way too utterly complicated. I'd add -DWEBAPP_VERSION=x to CFLAGS from the autoconf magicness, and go from there... Sorry man, when I saw Henri commited my version patch also this morning, and you've commited VERSION file. I had seen some conflicts. Hum what do you think? 1. incorporate VERSION file to (modified and clean) wa_version.h through configure? 2. delete wa_version.h and patch mod_webapp.c in apache-1.3 and apache-2.0 currently in CVS? 3. other ways? Sorry, I had made confusion to you guys. The VERSION file is wrong because there's no chance in hell I'm going to get something out of it under Win32. So wa_version.h is all right (my mistake)... But that version.h takes complication to a next level You need to have a manual just to figure out WHAT you have to change... Pier -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp configure.in
pier02/05/03 04:40:24
Modified:webapp configure.in
Log:
Undo my patch of this morning to get versions out of the VERSION file
Revision ChangesPath
1.56 +2 -13 jakarta-tomcat-connectors/webapp/configure.in
Index: configure.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- configure.in 3 May 2002 09:40:39 - 1.55
+++ configure.in 3 May 2002 11:40:24 - 1.56
@@ -57,7 +57,7 @@
dnl --
dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
-dnl Version $Id: configure.in,v 1.55 2002/05/03 09:40:39 pier Exp $
+dnl Version $Id: configure.in,v 1.56 2002/05/03 11:40:24 pier Exp $
dnl
dnl NOTE: close all functions with ]) on the same line otherwise M4 will spit
dnl out the last argument of the function with an extra newline.
@@ -72,7 +72,7 @@
dnl Initialize GNU Autoconf (note, this requires autoconf vers. = 2.52)
dnl --
AC_INIT([WebApp Module],[],[http://nagoya.apache.org/bugzilla])
-AC_CONFIG_SRCDIR([VERSION])
+AC_CONFIG_SRCDIR([configure.in])
dnl --
dnl Get rid of all that --prefix ... --xxxdir in the help message
@@ -110,12 +110,6 @@
WA_VARIABLE([EXTRA_BUILD])
WA_VARIABLE([EXTRA_CLEAN])
-WA_VARIABLE([APACHE_VERSION])
-WA_VARIABLE([WEBAPP_VERSION])
-AC_MSG_CHECKING([for version])
-WEBAPP_VERSION=`cat ${SRC_DIR}/VERSION`
-AC_MSG_RESULT([${WEBAPP_VERSION}])
-
WA_VARIABLE([MODULE])
dnl --
@@ -242,11 +236,6 @@
MODULE=apache-2.0
fi
-
-dnl --
-dnl Get some informations about the server
-dnl --
-WA_APXS_SERVER([APACHE_VERSION],[${APXS}])
dnl --
dnl All done
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
wa_version.h / jk_version.h : WAS ......
But that version.h takes complication to a next level You need to have a manual just to figure out WHAT you have to change... Ok let be more pragmatic, let use the same way httpd2 for mod_webapp #define WA_MODULE_BASEVENDOR Apache Software Foundation #define WA_MODULE_NAME Apache #define WA_MODULE_BASEREVISION 1.2.0-dev #define WA_MODULE_BASEVERSION WA_MODULE_BASEPRODUCT / WA_MODULE_BASEREVISION for mod_jk (native) #define JK_MODULE_BASEVENDOR Apache Software Foundation #define JK_MODULE_NAME Apache #define JK_MODULE_BASEREVISION 1.2.1-dev #define JK_MODULE_BASEVERSION JK_MODULE_BASEPRODUCT / JK_MODULE_BASEREVISION for mod_jk (native2) #define JK_MODULE_BASEVENDOR Apache Software Foundation #define JK_MODULE_NAME Apache #define JK_MODULE_BASEREVISION 2.0.0-dev #define JK_MODULE_BASEVERSION JK_MODULE_BASEPRODUCT / JK_MODULE_BASEREVISION Are we agree (Pier, Costin, JF, ) ? -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: wa_version.h / jk_version.h : WAS ......
Urg, I'm stupid some days : for mod_webapp #define WA_MODULE_BASEVENDOR Apache Software Foundation #define WA_MODULE_NAME mod_webapp #define WA_MODULE_BASEREVISION 1.2.0-dev #define WA_MODULE_BASEVERSION WA_MODULE_BASEPRODUCT / WA_MODULE_BASEREVISION for mod_jk (native) #define JK_MODULE_BASEVENDOR Apache Software Foundation #define JK_MODULE_NAME mod_jk #define JK_MODULE_BASEREVISION 1.2.1-dev #define JK_MODULE_BASEVERSION JK_MODULE_BASEPRODUCT / JK_MODULE_BASEREVISION for mod_jk (native2) #define JK_MODULE_BASEVENDOR Apache Software Foundation #define JK_MODULE_NAME mod_jk #define JK_MODULE_BASEREVISION 2.0.0-dev #define JK_MODULE_BASEVERSION JK_MODULE_BASEPRODUCT / JK_MODULE_BASEREVISION -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Admin webapp save-to-XML
I'm in total agreement with that! Possibly a way to roll back to a timestamp.old too? - Original Message - From: Remy Maucherat [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Friday, May 03, 2002 06:49 Subject: Admin webapp save-to-XML The save-to-XML feature of the admin webapp appears to be working good (of course, I only tried the default configuration ;-) ). I don't know what is the policy that will be used for ovewiting the existing server.xml, but I would do: - rename existing server.xml to server.xml.timestamp.old - write the new one to server.xml Is this what was planned ? 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: cvscommit:jakarta-tomcat-connectors/webapp/supportbuildconf.sh
Well, it seriously look ugly though... Ok, I admit it might be a PITA cuz in Windows we can't simply do a `cat VERSION` and get that number in somewhere, but boy that wa_version header looks ugly... I admited that it is ugly. See below. Just the fact that we somehow have an area to modify and one not, _is_ complicating things around... Secondly, I don't want to have alpha/beta/gamma/whatever compiled in the code: for releasing purpose, a code is x.x.x-dev if it's not associated with a tag, and x.x.x when it actually _IS_ associated with a tag... When we tag a release, we call it 1.2.0, and then depending on how well it goes, we can promote it from beta to gamma to whatever, but we will NOT rebuild the binaries... I'll commit a patch... See the attached wa_version I originally proposed. I initially copied this from httpd-2.0. See this thread: http://marc.theaimsgroup.com/?l=tomcat-devm=100878406017530w=2 The reason I change to mod_jk way is that JF suggested, and I followed. Hope this help. Pier Punky /* = * * * * The Apache Software License, Version 1.1 * * * * Copyright (c) 1999-2001 The Apache Software Foundation. * * All rights reserved.* * * * = * * * * Redistribution and use in source and binary forms, with or without modi- * * fication, are permitted provided that the following conditions are met: * * * * 1. Redistributions of source code must retain the above copyright notice * *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, WebApp, 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 Software Foundation.* * * * 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. * * * * = * *
RE: wa_version.h / jk_version.h : WAS ......
Stupid 2 times :[ #define WA_MODULE_BASEVENDOR Apache Software Foundation #define WA_MODULE_NAME mod_webapp #define WA_MODULE_BASEREVISION 1.2.0-dev #define WA_MODULE_BASEVERSION WA_MODULE_NAME / WA_MODULE_BASEREVISION for mod_jk (native) #define JK_MODULE_BASEVENDOR Apache Software Foundation #define JK_MODULE_NAME mod_jk #define JK_MODULE_BASEREVISION 1.2.1-dev #define JK_MODULE_BASEVERSION JK_MODULE_NAME / JK_MODULE_BASEREVISION for mod_jk (native2) #define JK_MODULE_BASEVENDOR Apache Software Foundation #define JK_MODULE_NAME mod_jk #define JK_MODULE_BASEREVISION 2.0.0-dev #define JK_MODULE_BASEVERSION JK_MODULE_NAME / JK_MODULE_BASEREVISION -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp/support wa_exec.m4
pier02/05/03 05:06:34
Modified:webapp/support wa_exec.m4
Log:
Get back to the original directory before exiting (configure will complain
it can't find a file otherwise)
Revision ChangesPath
1.3 +2 -1 jakarta-tomcat-connectors/webapp/support/wa_exec.m4
Index: wa_exec.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/wa_exec.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wa_exec.m41 May 2002 18:12:47 - 1.2
+++ wa_exec.m43 May 2002 12:06:34 - 1.3
@@ -57,7 +57,7 @@
dnl --
dnl Author Pier Fumagalli [EMAIL PROTECTED]
-dnl Version $Id: wa_exec.m4,v 1.2 2002/05/01 18:12:47 pier Exp $
+dnl Version $Id: wa_exec.m4,v 1.3 2002/05/03 12:06:34 pier Exp $
dnl --
dnl --
@@ -87,6 +87,7 @@
set $2
wa_exec_file=[$]1
if test ! -x ${wa_exec_file} ; then
+ cd ${wa_exec_curdir}
AC_MSG_ERROR([cannot find or execute \${wa_exec_file}\ in \$4\])
exit 1
fi
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp/support wa_exec.m4
pier02/05/03 05:13:57
Modified:webapp/support wa_exec.m4
Log:
Aesthetics change (report the value of the return code, not the name of its
variable)
Revision ChangesPath
1.4 +2 -2 jakarta-tomcat-connectors/webapp/support/wa_exec.m4
Index: wa_exec.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/wa_exec.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wa_exec.m43 May 2002 12:06:34 - 1.3
+++ wa_exec.m43 May 2002 12:13:57 - 1.4
@@ -57,7 +57,7 @@
dnl --
dnl Author Pier Fumagalli [EMAIL PROTECTED]
-dnl Version $Id: wa_exec.m4,v 1.3 2002/05/03 12:06:34 pier Exp $
+dnl Version $Id: wa_exec.m4,v 1.4 2002/05/03 12:13:57 pier Exp $
dnl --
dnl --
@@ -121,7 +121,7 @@
$1=`cat retvalue.tmp`
rm -f retvalue.tmp
echo execution of \$2\
-echo returned with value \$1\
+echo returned with value \${$1}\
cd ${wa_exec_curdir}
unset wa_exec_curdir
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
query
Hi, Just a small problem, i'm having a problem using the useBean tags in my jsp page, i am trying to pass an arraylist from the model but i get the following error. jsp:useBean id=sidebarObjects scope=request class=java.util.Iterator / Internal Servlet Error: javax.servlet.ServletException: Cannot create bean of class java.util.Iterator Any ideas thanks. _ Get your FREE download of MSN Explorer at http://explorer.msn.com/intl.asp. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvscommit:jakarta-tomcat-connectors/webapp/supportbuildconf.sh
That still doesn't change the fact that whatever is in JK for versioning is utterly complicated, is completely different from what the Apache folks have done so far (look at both 1.3 and 2.0 trees), and I don't want to look up at a manual on how to interpret the va_version.h header every time I have to roll a release, right? Punky, your ORIGINAL file from December last year looked _MUCH_ better Yes, I know, but it's shame that you were *so* inactive at that time. ;-) I'm still -1 on the version currently in CVS. This is how I would like to see things at the end, exactly like Apache 1.3 and 2.0 are doing... +1 for httpd way. My idea of -DWEBAPP_VERSION=. is wrong because it's impossible to gather that piece of information under Windows when building with Visual Studio (stupid operating system)... You said that you don't support M$ platform, you changed your mind? ;-) Pier Punky -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: wa_version.h / jk_version.h : WAS ......
+1 for the patch -Punky Pier Fumagalli wrote: GOMEZ Henri [EMAIL PROTECTED] wrote: Urg, I'm stupid some days : for mod_webapp #define WA_MODULE_BASEVENDOR Apache Software Foundation #define WA_MODULE_NAME mod_webapp #define WA_MODULE_BASEREVISION 1.2.0-dev #define WA_MODULE_BASEVERSION WA_MODULE_BASEPRODUCT / WA_MODULE_BASEREVISION for mod_jk (native) #define JK_MODULE_BASEVENDOR Apache Software Foundation #define JK_MODULE_NAME mod_jk #define JK_MODULE_BASEREVISION 1.2.1-dev #define JK_MODULE_BASEVERSION JK_MODULE_BASEPRODUCT / JK_MODULE_BASEREVISION for mod_jk (native2) #define JK_MODULE_BASEVENDOR Apache Software Foundation #define JK_MODULE_NAME mod_jk #define JK_MODULE_BASEREVISION 2.0.0-dev #define JK_MODULE_BASEVERSION JK_MODULE_BASEPRODUCT / JK_MODULE_BASEREVISION I just sent a patch over, I'd like to see some comments... -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvscommit:jakarta-tomcat-connectors/webapp/supportbuildconf.sh
Pier Fumagalli wrote: Punky Tse [EMAIL PROTECTED] wrote: GOMEZ Henri wrote: Punky, I appreciate your effort, but IMO, wa_version.h is way too utterly complicated. I'd add -DWEBAPP_VERSION=x to CFLAGS from the autoconf magicness, and go from there... Hum, I just commited wa_version.h and it's really similar to what Jean-Frederic proposed and commited to mod_jk. And it's what httpd 2.0 (ap_release.h) use I tell you why: http://marc.theaimsgroup.com/?l=tomcat-devm=100878406017530w=2 That still doesn't change the fact that whatever is in JK for versioning is utterly complicated, is completely different from what the Apache folks have done so far (look at both 1.3 and 2.0 trees), and I don't want to look up at a manual on how to interpret the va_version.h header every time I have to roll a release, right? This version handling is like the Linux Kernel version... (but there it is in the first lines of the main Makefile). The idea behind the complexity is that we could decide version of protocol based on the version containted in version.h file. Punky, your ORIGINAL file from December last year looked _MUCH_ better I'm still -1 on the version currently in CVS. This is how I would like to see things at the end, exactly like Apache 1.3 and 2.0 are doing... In this case we should both mod_webapp and mod_jk/mod_jk2 version. My idea of -DWEBAPP_VERSION=. is wrong because it's impossible to gather that piece of information under Windows when building with Visual Studio (stupid operating system)... 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]
Re: query
jsp:useBean id=sidebarObjects scope=request class=java.util.Iterator / Internal Servlet Error: javax.servlet.ServletException: Cannot create bean of class java.util.Iterator Any ideas Check out tomcat-users, and read the Iterator Javadocs. It's an Interface; you can't instantiate an Interface. Because of this, Iterator doesn't support javabean-style creation (no constructor, no properties, etc). Use your own custom class that conforms to the bean standard and implements (or uses) Iterator instead. I really can't give you details, I have no idea what your design requires. -michael -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvscommit:jakarta-tomcat-connectors/webapp/supportbuildconf.sh
jean-frederic clere [EMAIL PROTECTED] wrote: That still doesn't change the fact that whatever is in JK for versioning is utterly complicated, is completely different from what the Apache folks have done so far (look at both 1.3 and 2.0 trees), and I don't want to look up at a manual on how to interpret the va_version.h header every time I have to roll a release, right? This version handling is like the Linux Kernel version... (but there it is in the first lines of the main Makefile). That's not the best example of code beauty... The idea behind the complexity is that we could decide version of protocol based on the version containted in version.h file. Get real, we have ONE protocol. Punky, your ORIGINAL file from December last year looked _MUCH_ better I'm still -1 on the version currently in CVS. This is how I would like to see things at the end, exactly like Apache 1.3 and 2.0 are doing... In this case we should both mod_webapp and mod_jk/mod_jk2 version. I'm not -1ing anything on JK... That code might NEED that complicateness, and frankly I could care less.. I'm absolutely -1 on that where it concerns me, namedly, mod_webapp... Pier -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: query
- Original Message - From: fergal dalton [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Friday, May 03, 2002 08:14 Subject: query Hi, Just a small problem, i'm having a problem using the useBean tags in my jsp page, i am trying to pass an arraylist from the model but i get the following error. jsp:useBean id=sidebarObjects scope=request class=java.util.Iterator / Internal Servlet Error: javax.servlet.ServletException: Cannot create bean of class java.util.Iterator Fergal, java.util.Iterator is an Interface which cannot be instantiated. You have to instantiate one of the concrete implementations of the Collections classes to get an instance of this from the object. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvscommit:jakarta-tomcat-connectors/webapp/supportbuildconf.sh
Punky Tse [EMAIL PROTECTED] wrote: That still doesn't change the fact that whatever is in JK for versioning is utterly complicated, is completely different from what the Apache folks have done so far (look at both 1.3 and 2.0 trees), and I don't want to look up at a manual on how to interpret the va_version.h header every time I have to roll a release, right? Punky, your ORIGINAL file from December last year looked _MUCH_ better Yes, I know, but it's shame that you were *so* inactive at that time. ;-) My priorities are kinda right... Get laid off by Sun in november, go on a long vacation in December (basically trying to get all my stuff toghether), find a new job in January, and start working on February... Sorry... I'm still -1 on the version currently in CVS. This is how I would like to see things at the end, exactly like Apache 1.3 and 2.0 are doing... +1 for httpd way. Good My idea of -DWEBAPP_VERSION=. is wrong because it's impossible to gather that piece of information under Windows when building with Visual Studio (stupid operating system)... You said that you don't support M$ platform, you changed your mind? ;-) No, I didn't, but I'm sure that my inbox will start to be polluted by questions like how do I do that? WA_VERSION is not defined... Just to keep spam low, and if someone wants to port it, well, I'm not here to prevent them... Pier -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: [PROPOSAL] tag mod_jk 1.2.1
+1 Though I need this weekend to make sure Win32 versions are building and running successfully. Apache 1.3 and IIS seem to be okay now, but I still need to check the others. Cheers, Larry -Original Message- From: GOMEZ Henri [mailto:[EMAIL PROTECTED]] Sent: Friday, May 03, 2002 6:16 AM To: Tomcat Developers List Subject: [PROPOSAL] tag mod_jk 1.2.1 Hi to all, What about tagging the current mod_jk (may be after the latest lb patches) to 1.2.1 ? The goal is to populate the jtc builds directory and make binary available for various platform (Linux, Win32, Netware). webapp should be populated soon (layout is ready) : http://jakarta.apache.org/builds/jakarta-tomcat-connectors/webapp/release/v1.2.0/ I'd like to do the same for mod_jk (1.2.1) (layout is ready) http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.1/ We need to have known versions for both webapp/jk (not jk2) : - A known place where users could get latest connectors (src/bin). - Will remove duplicate works when a arrive new release of Tomcat 3.3.x or 4.x - Something stable enough to hire people to release package / binaries for multiples platforms (AIX, HPUX, SOLARIS, WIN32, NETWARE, OS400 ;), on multiples processors/archs (ppc, ia32, ia64, os390, sparc, mips) What do you think about ? - Henri Gomez ___[_] EMAIL : [EMAIL PROTECTED](. .) PGP KEY : 697ECEDD...oOOo..(_)..oOOo... PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 -- 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] tag mod_jk 1.2.1
+1 Though I need this weekend to make sure Win32 versions are building and running successfully. Apache 1.3 and IIS seem to be okay now, but I still need to check the others. I also want to known if the latests patches received on list about lb will be included or not... -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: wa_version.h / jk_version.h : WAS ......
for mod_webapp #define WA_MODULE_BASEVENDOR Apache Software Foundation #define WA_MODULE_NAME mod_webapp #define WA_MODULE_BASEREVISION 1.2.0-dev #define WA_MODULE_BASEVERSION WA_MODULE_BASEPRODUCT / WA_MODULE_BASEREVISION I just sent a patch over, I'd like to see some comments... And I also like to see yours about ---^ Directly inspired from httpd 2.0 ap_release.h -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvscommit:jakarta-tomcat-connectors/webapp/supportbuildconf.sh
Pier Fumagalli wrote: jean-frederic clere [EMAIL PROTECTED] wrote: That still doesn't change the fact that whatever is in JK for versioning is utterly complicated, is completely different from what the Apache folks have done so far (look at both 1.3 and 2.0 trees), and I don't want to look up at a manual on how to interpret the va_version.h header every time I have to roll a release, right? This version handling is like the Linux Kernel version... (but there it is in the first lines of the main Makefile). That's not the best example of code beauty... May be not. But a Kernel needs more complexity than a TC connector. The idea behind the complexity is that we could decide version of protocol based on the version containted in version.h file. Get real, we have ONE protocol. And it is possible to add a #define PROTOCOL_NUMBER n where n increases when we change the protocol. (More easy than testing a version). Punky, your ORIGINAL file from December last year looked _MUCH_ better I'm still -1 on the version currently in CVS. This is how I would like to see things at the end, exactly like Apache 1.3 and 2.0 are doing... In this case we should both mod_webapp and mod_jk/mod_jk2 version. I'm not -1ing anything on JK... That code might NEED that complicateness, and frankly I could care less.. I'm absolutely -1 on that where it concerns me, namedly, mod_webapp... Ok... Please commit your changes. We could add the complexity when needed. 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]
Re: cvscommit:jakarta-tomcat-connectors/webapp/supportbuildconf.sh
jean-frederic clere [EMAIL PROTECTED] wrote: Pier Fumagalli wrote: That's not the best example of code beauty... May be not. But a Kernel needs more complexity than a TC connector. Correct... The idea behind the complexity is that we could decide version of protocol based on the version containted in version.h file. Get real, we have ONE protocol. And it is possible to add a #define PROTOCOL_NUMBER n where n increases when we change the protocol. (More easy than testing a version). Take a look at pr_warp_defs.h when that gets generated... Punky, your ORIGINAL file from December last year looked _MUCH_ better I'm still -1 on the version currently in CVS. This is how I would like to see things at the end, exactly like Apache 1.3 and 2.0 are doing... In this case we should both mod_webapp and mod_jk/mod_jk2 version. I'm not -1ing anything on JK... That code might NEED that complicateness, and frankly I could care less.. I'm absolutely -1 on that where it concerns me, namedly, mod_webapp... Ok... Please commit your changes. We could add the complexity when needed. We don't need complexity... Pier -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp/support wa_version.m4
pier02/05/03 06:30:26
Modified:webapp configure.in
webapp/apache-1.3 mod_webapp.c
webapp/apache-2.0 mod_webapp.c
webapp/include wa.h wa_version.h
Added: webapp/support wa_version.m4
Log:
Versioning done right.
Revision ChangesPath
1.57 +5 -1 jakarta-tomcat-connectors/webapp/configure.in
Index: configure.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- configure.in 3 May 2002 11:40:24 - 1.56
+++ configure.in 3 May 2002 13:30:25 - 1.57
@@ -57,7 +57,7 @@
dnl --
dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
-dnl Version $Id: configure.in,v 1.56 2002/05/03 11:40:24 pier Exp $
+dnl Version $Id: configure.in,v 1.57 2002/05/03 13:30:25 pier Exp $
dnl
dnl NOTE: close all functions with ]) on the same line otherwise M4 will spit
dnl out the last argument of the function with an extra newline.
@@ -65,6 +65,7 @@
sinclude(./support/wa_util.m4)
sinclude(./support/wa_exec.m4)
+sinclude(./support/wa_version.m4)
sinclude(./support/wa_apr.m4)
sinclude(./support/wa_apxs.m4)
@@ -236,6 +237,9 @@
MODULE=apache-2.0
fi
+
+WA_APXS_SERVER([APACHE_VERSION],[${APXS}])
+WA_VERSION([WEBAPP_VERSION],[${CC}])
dnl --
dnl All done
1.33 +11 -12jakarta-tomcat-connectors/webapp/apache-1.3/mod_webapp.c
Index: mod_webapp.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/mod_webapp.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mod_webapp.c 3 May 2002 08:42:40 - 1.32
+++ mod_webapp.c 3 May 2002 13:30:25 - 1.33
@@ -57,7 +57,7 @@
/**
* @author Pier Fumagalli mailto:[EMAIL PROTECTED]
- * @version $Id: mod_webapp.c,v 1.32 2002/05/03 08:42:40 hgomez Exp $
+ * @version $Id: mod_webapp.c,v 1.33 2002/05/03 13:30:25 pier Exp $
*/
#include httpd.h
@@ -68,7 +68,6 @@
#include http_protocol.h
#include util_script.h
#include wa.h
-#include wa_version.h
/* * */
/* GENERIC DECLARATIONS */
@@ -83,29 +82,29 @@
/* The main server using for logging error not related to requests */
static server_rec *server=NULL;
-static void wam_init_handler(server_rec *s, ap_pool *p)
-{
-ap_add_version_component(WA_EXPOSED_VERSION);
-}
-
/* * */
/* MODULE AND LIBRARY INITIALIZATION AND DESTRUCTION */
/* * */
/* Destroy the module and the WebApp Library */
-static void wam_shutdown(server_rec *s, pool *p) {/*void *nil) { */
+static void wam_child_destroy(server_rec *s, pool *p) {
if (!wam_initialized) return;
wa_shutdown();
wam_initialized=wa_false;
}
/* Startup the module and the WebApp Library */
-static void wam_startup(server_rec *s, pool *p) {
+static void wam_child_init(server_rec *s, pool *p) {
if (!wam_initialized) return;
server=s;
wa_startup();
}
+/* Initialize the module, by adding our version info in Apache. */
+static void wam_module_init(server_rec *s, ap_pool *p) {
+ap_add_version_component(WA_VERSION);
+}
+
/* Initialize the module and the WebApp Library */
static const char *wam_init(pool *p) {
const char *ret=NULL;
@@ -538,7 +537,7 @@
/* Apache module declaration */
module MODULE_VAR_EXPORT webapp_module = {
STANDARD_MODULE_STUFF,
-wam_init_handler, /* module initializer */
+wam_module_init,/* module initializer */
NULL, /* per-directory config creator */
NULL, /* dir config merger */
NULL, /* server config creator */
@@ -553,7 +552,7 @@
NULL, /* [8] fixups */
NULL, /* [10] logger */
NULL, /* [3] header parser */
-wam_startup,/* child initializer */
-wam_shutdown, /* child exit/cleanup */
+wam_child_init, /* child initializer */
+wam_child_destroy, /* child exit/cleanup */
cvs commit: jakarta-tomcat-connectors/webapp VERSION
pier02/05/03 06:31:23 Removed: webapp VERSION Log: Leftovers from versioning. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: cvscommit:jakarta-tomcat-connectors/webapp/supportbuildconf.sh
Ok... Please commit your changes. We could add the complexity when needed. We don't need complexity... And users need release. Even if if a release is imperfect. That's why there is release/patch in version ;] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp/support wa_version.m4
pier02/05/03 06:37:46 Modified:webapp/support wa_version.m4 Log: M4 documentation of WA_VERSION macro. Revision ChangesPath 1.2 +4 -3 jakarta-tomcat-connectors/webapp/support/wa_version.m4 Index: wa_version.m4 === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/wa_version.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wa_version.m4 3 May 2002 13:30:26 - 1.1 +++ wa_version.m4 3 May 2002 13:37:46 - 1.2 @@ -57,13 +57,14 @@ dnl -- dnl Author Pier Fumagalli [EMAIL PROTECTED] -dnl Version $Id: wa_version.m4,v 1.1 2002/05/03 13:30:26 pier Exp $ +dnl Version $Id: wa_version.m4,v 1.2 2002/05/03 13:37:46 pier Exp $ dnl -- dnl -- dnl WA_VERSION -dnl -dnl $1 = . +dnl Retrieve the version of the WebApp module +dnl $1 = The variable name where the version number will be stored. +dnl $2 = A working C compiler. dnl -- AC_DEFUN( [WA_VERSION], -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvscommit:jakarta-tomcat-connectors/webapp/supportbuildconf.sh
GOMEZ Henri [EMAIL PROTECTED] wrote: Ok... Please commit your changes. We could add the complexity when needed. We don't need complexity... And users need release. They do... Even if if a release is imperfect. Are you _CRAZY_? I'm going to -1 any release that is not clearly an interim test release (such as Tomcat 4.1.0, which is _supposed_ not to work, although it does) and which doesn't have all the Apache standards to _be_ a release... AKA, at least, it _has_ to build, right? Now webapp doesn't, not how it should anyway, so, -1 on tagging NOW. Plus, given the last changes, the documentation is outdated, that needs to be addressed. If 1.2.0 goes out, I want it to build, run and crash, but at least I don't want to see people writing me because I did what was written there and it doesn't work. Screw that... That's why there is release/patch in version ;] There is -dev and not -dev... And non -dev have to at least compile and come out in a decent state... I'm _not_ going to tag a release... And I'm going to -1 anyone who will propose to do that now, and then we count, ok? Pier -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: wa_version.h / jk_version.h : WAS ......
GOMEZ Henri wrote: for mod_webapp #define WA_MODULE_BASEVENDOR Apache Software Foundation #define WA_MODULE_NAME mod_webapp #define WA_MODULE_BASEREVISION 1.2.0-dev #define WA_MODULE_BASEVERSION WA_MODULE_BASEPRODUCT / WA_MODULE_BASEREVISION I just sent a patch over, I'd like to see some comments... And I also like to see yours about ---^ Directly inspired from httpd 2.0 ap_release.h In mod_jk the idea sounds not so good: The following in domino/jk_dsapi_plugin.c will not work: +++ #if defined(JK_VERSION) JK_VERSION = MAKEVERSION(1, 2, 0, 1) static jk_worker_env_t worker_env; #endif +++ -- 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: cvscommit:jakarta-tomcat-connectors/webapp/supportbuildconf.sh
Are you _CRAZY_? I'm going to -1 any release that is not clearly an interim test release (such as Tomcat 4.1.0, which is _supposed_ not to work, although it does) and which doesn't have all the Apache standards to _be_ a release... Did there is still blocking (showstopper) bug in mod_webapp ? If so, delay the release. AKA, at least, it _has_ to build, right? Now webapp doesn't, not how it should anyway, so, -1 on tagging NOW. It was compiling 2 or 3 hours ago (I've grabbed an autoconf 2.53 in /usr/local ;(. Plus, given the last changes, the documentation is outdated, that needs to be addressed. If 1.2.0 goes out, I want it to build, run and crash, but at least I don't want to see people writing me because I did what was written there and it doesn't work. Screw that... What's that changes ? That's why there is release/patch in version ;] There is -dev and not -dev... And non -dev have to at least compile and come out in a decent state... I'm _not_ going to tag a release... And I'm going to -1 anyone who will propose to do that now, and then we count, ok? mod_webapp is your baby, do what you want with it. I'll delay the official release to generate linux binaries and rpms. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 8775] New: - checksum error
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=8775. 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=8775 checksum error Summary: checksum error Product: Tomcat 4 Version: 4.0.3 Final Platform: Sun URL: http://jakarta.apache.org/builds/jakarta-tomcat- 4.0/release/v4.0.3/bin/jakarta-tomcat-4.0.3.tar.gz OS/Version: Solaris Status: NEW Severity: Blocker Priority: Other Component: Installable Packages AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] I get a checksum error when I run the command: gzip -d -c jakarta-tomcat-4.0.3.tar.gz | tar -xf - or the combination of commands: gzip -d jakarta-tomcat-4.0.3.tar.gz tar -xf jakarta-tomcat-4.0.3.tar -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 8776] New: - The session url encoding under somce circumstances fails to use cookies even when request to do 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=8776. 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=8776 The session url encoding under somce circumstances fails to use cookies even when request to do so Summary: The session url encoding under somce circumstances fails to use cookies even when request to do so Product: Tomcat 4 Version: 4.0 Beta 4 Platform: All OS/Version: Windows 9x Status: NEW Severity: Enhancement Priority: Other Component: Catalina AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] When accessing a webapp if a valid ;jsession= session is found on the url then cookies are not used for session tracking. The impacts primarily users that return to a web applications and then use their history box to navigate to the site. The impact is greatest for those applications which force an initial redirect to force tomcat to recognise whether cookies are supported or not. Under these circumstances the first url that appears in the history box will have a valid session id. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvscommit:jakarta-tomcat-connectors/webapp/supportbuildconf.sh
GOMEZ Henri wrote: Are you _CRAZY_? I'm going to -1 any release that is not clearly an interim test release (such as Tomcat 4.1.0, which is _supposed_ not to work, although it does) and which doesn't have all the Apache standards to _be_ a release... Did there is still blocking (showstopper) bug in mod_webapp ? If so, delay the release. - Multi-thread Apsche are not working and may be even not compiling due to atomic support in APR.(atomic have to be change to mutex). - We have to run a watchdog test. - There are still 6 bugs to check. AKA, at least, it _has_ to build, right? Now webapp doesn't, not how it should anyway, so, -1 on tagging NOW. It was compiling 2 or 3 hours ago (I've grabbed an autoconf 2.53 in /usr/local ;(. Plus, given the last changes, the documentation is outdated, that needs to be addressed. If 1.2.0 goes out, I want it to build, run and crash, but at least I don't want to see people writing me because I did what was written there and it doesn't work. Screw that... What's that changes ? That's why there is release/patch in version ;] There is -dev and not -dev... And non -dev have to at least compile and come out in a decent state... I'm _not_ going to tag a release... And I'm going to -1 anyone who will propose to do that now, and then we count, ok? mod_webapp is your baby, do what you want with it. I'll delay the official release to generate linux binaries and rpms. -- 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: cvscommit:jakarta-tomcat-connectors/webapp/supportbuildconf.sh
mod_webapp is your baby, do what you want with it. I'll delay the official release to generate linux binaries and rpms. tipo ^ I'll wait the official release to generate linux binaries and rpms -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Add a target in build.xml
Hi, I would like to add a target to the TC build.xml: download. Last time I have tried to help to release TC I have found there is no clean way to know easly what is needed to build a TC release (which xerces.jar is needed for example). The download would download using wget and extract the need files using tar. Any comments? Cheers Jean-frederic -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: [PROPOSAL] tag mod_jk 1.2.1
+1 -Original Message- From: GOMEZ Henri [mailto:[EMAIL PROTECTED]] Sent: Friday, May 03, 2002 5:16 AM To: Tomcat Developers List Subject: [PROPOSAL] tag mod_jk 1.2.1 Hi to all, What about tagging the current mod_jk (may be after the latest lb patches) to 1.2.1 ? The goal is to populate the jtc builds directory and make binary available for various platform (Linux, Win32, Netware). webapp should be populated soon (layout is ready) : http://jakarta.apache.org/builds/jakarta-tomcat-connectors/web app/release/v1.2.0/ I'd like to do the same for mod_jk (1.2.1) (layout is ready) http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/ release/v1.2.1/ We need to have known versions for both webapp/jk (not jk2) : - A known place where users could get latest connectors (src/bin). - Will remove duplicate works when a arrive new release of Tomcat 3.3.x or 4.x - Something stable enough to hire people to release package / binaries for multiples platforms (AIX, HPUX, SOLARIS, WIN32, NETWARE, OS400 ;), on multiples processors/archs (ppc, ia32, ia64, os390, sparc, mips) What do you think about ? - Henri Gomez ___[_] EMAIL : [EMAIL PROTECTED](. .) PGP KEY : 697ECEDD...oOOo..(_)..oOOo... PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 -- 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: mod_jk2: Group/Instance
Hi Bernd, First, many thanks for your help :-) No, I think not :). I checked it yesterday. With some additional log statements in the validate function of jk_lb_worker.c you get the value _inf_ for the lb_factor and lb_value (line 434-444). Because if it would be set to 1, my config hadn't worked. Because I set the local worker to 1 and the others to 0. I'll check again, and fix it if necesarry. I wrote some code in jk2 that seems to solve the problem, and I can backport this to jk1 if it is correct. Probably this is my mistake - I remember the discussion and the patch that was sent for this problem, and most likely I did something wrong commiting it ( i.e. I did few changes trying to simplify it, and it seems I 'simplified' too much ). But my memory still has the patch's logic which seemed fine :-) This is possible, but then you must add a check if the value is 0. Because without it you calc 1/0 with an int and this will give you an error. Yes, of course. 0 will continue to mean 'default worker'. I'm not very comfortable with float calculations in the critical path ( and in an area that is executed concurently !). The only problem is what happens on overflows - the lb_value may become 0 ( or a small value ) and then the worker will take all the load. Thats not the whole story. Its right you will check the main worker when its back again and use it only once. Because when the request was successful handled rec-in_recovering is true (line 332 of jk_lb_worker.c, service function). Than get_max_lb get the value _inf_ from one of the other worker. Than the things happen which I said in my prior mail. That was it what I did in my sent patch, the additional documentation was sent a few days later. But my additions to the lb_worker were a little bit to complex. You are right we should get it when we use the flag only on the main worker and change the behavior after a failure for this worker. But we need the trick with 0/inf for the other worker, because only with this we have the situation that the other worker wouldn't be asked when there is no session and the main worker is up. Ok, can you send the patch again :-) ? For going back to the main worker - if we let it with lb_value=0 at all time ( i.e. we don't alter that at any time ), and only in_error_state is set on failure - then I believe the thing will work fine. I will try to build another patch and send it. I think it could be possible without an additional flag. Great ! Another tought about this: When you use double and we fix the handling after an error, the main worker would never reach _inf_. Because the lb_factor is 1 if lb_value wasn't 0. After choosing the worker this value is added to the lb_value. But with a high value for lb_value the differenc between two savable double numbers is greater than the lb_factor. But this is only interessting in theory. I think in real world we will reboot apache before this will happen :). That may become a problem if we use ints. Costin Bernd ( that can go in both jk1, but I can't see a release of jk2 without this functionality ) Costin other lb_value and greater than the lb_value of the local tomcat. But after a failure of the local tomcat he is in error_state. After some time its set to recovering and if the local tomcat is back again the function jk(2)_get_max_lb gets the highest lb_value. This is _inf_ from one of the other workers. The addition of a value to _inf_ is meaningless. You end up with an lb_value of _inf_ for the local worker. If this worker isn't the first in the worker list, it will never be choosen again. Because his lb_value will never be less than another lb_value, because all the other workers have _inf_ as theire lb_values. So every request without a session will be routed to the first of the other tomcats. The only way out is a restart of the local apache after tomcat is up and running. But I don't know when tomcat is finished with all his contexts and started the connectors. I didn't looked very deep into jk2, but I found the same get_most_suitable_worker and get_max_lb functions. The jk2_get_max_lb function will always return _inf_. In your answer to some other mails you said, that workers could be removed. Do I understand it right, that if my local tomcat goes down his worker is removed from the list and after he is comming up again added to the worker list with reseted lb_value (only for mod_jk2)? The next days I will look in the docu and code of jk2 and give it a try. May be all my problems gone away with the new module :). Sorry if I ask stupid questions, but I want to make it working for our new cluster. Thanks Bernd This is essential for jk2's JNI worker, which fits perfectly this case ( you don't want to send via TCP when you have a tomcat instance in the same process ). (2) Tomcat instances in standby or soft
RE: Add a target in build.xml
Hi, Are you referring to TC 4.x or TC 3.3.x? I haven't updated the README yet to cover the dependency on jakarta-tomcat-connectors. But AFAIK, that is the only external requirement to build the jakarta-tomcat HEAD distribution, excluding options. It builds for me with just the jakarta-tomcat-connectors property defined. Cheers, Larry -Original Message- From: jean-frederic clere [mailto:[EMAIL PROTECTED]] Sent: Friday, May 03, 2002 10:45 AM To: [EMAIL PROTECTED] Subject: Add a target in build.xml Hi, I would like to add a target to the TC build.xml: download. Last time I have tried to help to release TC I have found there is no clean way to know easly what is needed to build a TC release (which xerces.jar is needed for example). The download would download using wget and extract the need files using tar. Any comments? Cheers Jean-frederic -- To unsubscribe, e-mail: mailto:tomcat-dev- [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]
New LDAP Realm for Catalina
Hi anybody, I have implemented a LDAP Realm for Tomcat 4..0.x based upon JNDI. The one embedded in Tomcat 4.0.3 seems to have a lot of problems. The one I have coded has been tested with iPlanet and is already used in production. The roles can be stored as LDAP groups and as entry attributes as well. How can I post my sources, documentation and samples ? Best regards, -- Pierre-Yves CLOUX Linkvest S.A. Knowledge Center Manager Av. des Baumettes 19 PO Box 271 CH 1020 Renens/Lausanne Switzerland Tel : + 41 21 632 90 00 Fax : + 41 21 632 90 90 http://www.linkvest.com -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Performance problem while using tomcat and solaris
Hi, We are using the following : 1. JSP and servlets 2. Java -JDK 1.2.2 3. jakarta tomcat 3.3 as standalone WebServer. 4. Operating System :Solaris 2.7/2.8/2.6. We are facing the following issues: 1. Slow performance. 2. Runtime compilation takes a long time resulting in server timeout. 3. Long time to load pages resulting in timeout. We have tried out the following settings on tomcat : 1. We have copied the compiled class files from Windows and put in the tomcat working directory and Set Auto reload to false in server.xml file. 2. Changed the Http Connector settings : a. Reduced the max no of threads b. Reduced the min and max spare threads c. We have also set the flags in server.xml file tcpNoDelay=true debug=0 minProcessors=50 maxProcessors=250 acceptCount=250 enableLookups=false bufferSize=8192 Same application is working with good performance on HPUX and Windows NT with the above configuration. Can any body guide us for improving the performance of tomcat for Solaris 7/8? Thanks and Regards, Pramod Deval Patni Computer Systems Ltd Phone: 91-22-829 1454 Extension: 5023
[PATCH] connector SRPM does not build mod_webapp
Dear developers, installation of tomcat has been greatly improved since last November. Thanks for your effort. Nevertheless I had troubles when building the apache connector modules utilizing the appropriate SRPM. I prefer mod_webapp instead of mod_jk. But the .spec file of the SRPM did not include code to build mod_webapp. So I had to add some missing statements and attached a patch for the .spec file. The added code extracts an APR snapshot-archive if available or retrieves APR via CVS. (You can either grab a snapshot prior to compiling or rely on CVS.) Then mod_webapp is compiled and an apropriate RPM created. Since there are some properties to be set before compiling mod_webapp can be successfully made, I included another patch to the source-directory of webapp/ that will create the file build.properties. The defined properties in this file are applicable when junit has been installed as RPM (http://www.jpackage.org/rpm/free/junit/junit-3.7-6jpp.noarch.rpm) and when using tomcat4. So if anyone uses my patches be sure to adapt tomcat-connectors.webapp- properties.patch to your requirements. Regards Perolo -- GMX - Die Kommunikationsplattform im Internet. http://www.gmx.net tomcat-connectors-4.0.2.rpm-spec.patch.gz Description: GNU Zip compressed data tomcat-connectors.webapp-properties.patch Description: Binary data -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: PROPOSAL: mod_jk2: Group/Instance
Hi Costin, [EMAIL PROTECTED] wrote: Hi Bernd, First, many thanks for your help :-) your welcome, its a lot of fun :) No, I think not :). I checked it yesterday. With some additional log statements in the validate function of jk_lb_worker.c you get the value _inf_ for the lb_factor and lb_value (line 434-444). Because if it would be set to 1, my config hadn't worked. Because I set the local worker to 1 and the others to 0. I'll check again, and fix it if necesarry. I wrote some code in jk2 that seems to solve the problem, and I can backport this to jk1 if it is correct. Probably this is my mistake - I remember the discussion and the patch that was sent for this problem, and most likely I did something wrong commiting it ( i.e. I did few changes trying to simplify it, and it seems I 'simplified' too much ). But my memory still has the patch's logic which seemed fine :-) This is possible, but then you must add a check if the value is 0. Because without it you calc 1/0 with an int and this will give you an error. Yes, of course. 0 will continue to mean 'default worker'. see below I'm not very comfortable with float calculations in the critical path ( and in an area that is executed concurently !). The only problem is what happens on overflows - the lb_value may become 0 ( or a small value ) and then the worker will take all the load. Thats not the whole story. Its right you will check the main worker when its back again and use it only once. Because when the request was successful handled rec-in_recovering is true (line 332 of jk_lb_worker.c, service function). Than get_max_lb get the value _inf_ from one of the other worker. Than the things happen which I said in my prior mail. That was it what I did in my sent patch, the additional documentation was sent a few days later. But my additions to the lb_worker were a little bit to complex. You are right we should get it when we use the flag only on the main worker and change the behavior after a failure for this worker. But we need the trick with 0/inf for the other worker, because only with this we have the situation that the other worker wouldn't be asked when there is no session and the main worker is up. Ok, can you send the patch again :-) ? For going back to the main worker - if we let it with lb_value=0 at all time ( i.e. we don't alter that at any time ), and only in_error_state is set on failure - then I believe the thing will work fine. Thats the invers from the actual situation. So my patch from a few hours earlier this day depends on the fact that the other worker get a lb_value of 0 in the config file. This will be converted to _inf_ and the main worker gets 1 and this will be the minimal lb_value of the balanced workers. If we want the possibility to switch to ints I could send a new patch which handles 0 as a special value for the main worker. Should I? Bernd I will try to build another patch and send it. I think it could be possible without an additional flag. Great ! Another tought about this: When you use double and we fix the handling after an error, the main worker would never reach _inf_. Because the lb_factor is 1 if lb_value wasn't 0. After choosing the worker this value is added to the lb_value. But with a high value for lb_value the differenc between two savable double numbers is greater than the lb_factor. But this is only interessting in theory. I think in real world we will reboot apache before this will happen :). That may become a problem if we use ints. Costin [...] -- Dipl.-Inform. Bernd Koecke UNIX-Entwicklung Schlund+Partner AG Fon: +49-721-91374-0 E-Mail: [EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: [PATCH] connector SRPM does not build mod_webapp
Thanks Perolo for your patches. Pier is finalising mod_webapp 1.2.0 and I'll release a specific mod_webapp rpm. I'll do also like this for jk (and jk2) later since we may have differents release cycles. Stay tuned, mod_webapp will be release as soon as Pier will tag mod_webapp 1.2.0 (2/3 days ?) Pier ? - Henri Gomez ___[_] EMAIL : [EMAIL PROTECTED](. .) PGP KEY : 697ECEDD...oOOo..(_)..oOOo... PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 -Original Message- From: Perolo Silantico [mailto:[EMAIL PROTECTED]] Sent: Friday, May 03, 2002 3:34 PM To: [EMAIL PROTECTED] Subject: [PATCH] connector SRPM does not build mod_webapp Dear developers, installation of tomcat has been greatly improved since last November. Thanks for your effort. Nevertheless I had troubles when building the apache connector modules utilizing the appropriate SRPM. I prefer mod_webapp instead of mod_jk. But the .spec file of the SRPM did not include code to build mod_webapp. So I had to add some missing statements and attached a patch for the .spec file. The added code extracts an APR snapshot-archive if available or retrieves APR via CVS. (You can either grab a snapshot prior to compiling or rely on CVS.) Then mod_webapp is compiled and an apropriate RPM created. Since there are some properties to be set before compiling mod_webapp can be successfully made, I included another patch to the source-directory of webapp/ that will create the file build.properties. The defined properties in this file are applicable when junit has been installed as RPM (http://www.jpackage.org/rpm/free/junit/junit-3.7-6jpp.noarch.r pm) and when using tomcat4. So if anyone uses my patches be sure to adapt tomcat-connectors.webapp- properties.patch to your requirements. Regards Perolo -- GMX - Die Kommunikationsplattform im Internet. http://www.gmx.net -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Add a target in build.xml
Larry Isaacs wrote: Hi, Are you referring to TC 4.x or TC 3.3.x? 4.x. I haven't updated the README yet to cover the dependency on jakarta-tomcat-connectors. But AFAIK, that is the only external requirement to build the jakarta-tomcat HEAD distribution, excluding options. It builds for me with just the jakarta-tomcat-connectors property defined. Cheers, Larry -Original Message- From: jean-frederic clere [mailto:[EMAIL PROTECTED]] Sent: Friday, May 03, 2002 10:45 AM To: [EMAIL PROTECTED] Subject: Add a target in build.xml Hi, I would like to add a target to the TC build.xml: download. Last time I have tried to help to release TC I have found there is no clean way to know easly what is needed to build a TC release (which xerces.jar is needed for example). The download would download using wget and extract the need files using tar. Any comments? Cheers Jean-frederic -- To unsubscribe, e-mail: mailto:tomcat-dev- [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]
DO NOT REPLY [Bug 8718] - missing directories
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=8718. 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=8718 missing directories [EMAIL PROTECTED] changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|WORKSFORME | --- Additional Comments From [EMAIL PROTECTED] 2002-05-03 16:02 --- If you download these, jakarta-tomcat-4.0/logs jakarta-tomcat-4.0/temp are not created when the files are expanded. http://jakarta.apache.org/builds/jakarta-tomcat-4.0/nightly/jakarta-tomcat-4.0- 20020503.zip http://jakarta.apache.org/builds/jakarta-tomcat-4.0/nightly/jakarta-tomcat-4.0- 20020503.tar.gz -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp/support install.sh config.guess config.sub
pier02/05/03 09:10:01 Added: webapp/support install.sh config.guess config.sub Log: We actually need those one in place when not building using APR. Revision ChangesPath 1.4 +82 -221 jakarta-tomcat-connectors/webapp/support/install.sh 1.4 +32 -13jakarta-tomcat-connectors/webapp/support/config.guess 1.4 +84 -48jakarta-tomcat-connectors/webapp/support/config.sub -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp/support wa_apr.m4
pier02/05/03 09:11:22
Modified:webapp/support wa_apr.m4
Log:
The default location of the APR directory is actually relative to
${srcdir} if this is defined.
Revision ChangesPath
1.4 +6 -2 jakarta-tomcat-connectors/webapp/support/wa_apr.m4
Index: wa_apr.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/wa_apr.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wa_apr.m4 1 May 2002 20:58:36 - 1.3
+++ wa_apr.m4 3 May 2002 16:11:22 - 1.4
@@ -57,7 +57,7 @@
dnl --
dnl Author Pier Fumagalli [EMAIL PROTECTED]
-dnl Version $Id: wa_apr.m4,v 1.3 2002/05/01 20:58:36 pier Exp $
+dnl Version $Id: wa_apr.m4,v 1.4 2002/05/03 16:11:22 pier Exp $
dnl --
dnl --
@@ -68,7 +68,11 @@
AC_DEFUN(
[WA_APR],
[
-wa_apr_tempval=apr
+if test -z ${srcdir} ; then
+ wa_apr_tempval=apr
+else
+ wa_apr_tempval=${srcdir}/apr
+fi
AC_MSG_CHECKING([for apr sources])
AC_ARG_WITH(
[apr],
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp/support wa_version.m4
pier02/05/03 09:12:07
Modified:webapp/support wa_version.m4
Log:
Only retrieve the REVISION part instead of the full VERSION.
Revision ChangesPath
1.3 +3 -3 jakarta-tomcat-connectors/webapp/support/wa_version.m4
Index: wa_version.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/wa_version.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wa_version.m4 3 May 2002 13:37:46 - 1.2
+++ wa_version.m4 3 May 2002 16:12:07 - 1.3
@@ -57,7 +57,7 @@
dnl --
dnl Author Pier Fumagalli [EMAIL PROTECTED]
-dnl Version $Id: wa_version.m4,v 1.2 2002/05/03 13:37:46 pier Exp $
+dnl Version $Id: wa_version.m4,v 1.3 2002/05/03 16:12:07 pier Exp $
dnl --
dnl --
@@ -74,11 +74,11 @@
#include stdio.h
int main(void) [ {
- printf(WA_VERSION \n);
+ printf(WA_REVISION \n);
exit(0);
} ]
EOF
-AC_MSG_CHECKING([for version])
+AC_MSG_CHECKING([for webapp version])
$2 ${TGT_DIR}/wa_version.c -o ${TGT_DIR}/wa_version.o
if test $? != 0 ; then
AC_MSG_ERROR([compiler didn't run successfully])
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp/apache-2.0 Makefile.in
pier02/05/03 09:13:40 Modified:webapp/apache-1.3 Makefile.in webapp/apache-2.0 Makefile.in Log: Added the dist target to build a binary distribution directory Revision ChangesPath 1.26 +7 -2 jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in Index: Makefile.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- Makefile.in 1 May 2002 21:24:04 - 1.25 +++ Makefile.in 3 May 2002 16:13:40 - 1.26 @@ -56,7 +56,7 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.25 2002/05/01 21:24:04 pier Exp $ +# @version $Id: Makefile.in,v 1.26 2002/05/03 16:13:40 pier Exp $ LOCAL_TGT_DIR = @TGT_DIR@/apache-1.3 LOCAL_SRC_DIR = @SRC_DIR@/apache-1.3 @@ -66,7 +66,7 @@ OBJECT = mod_webapp.o TARGET = libwebapp.so -.PHONY: build clean +.PHONY: build clean dist build: $(TARGET) @@ -77,6 +77,11 @@ echo rm -f $(SOURCE) ; \ rm -f $(SOURCE) ; \ fi + +dist: + $(INSTALL) \ + $(LOCAL_TGT_DIR)/libwebapp.so \ + $(DST_DIR)/mod_webapp.so $(SOURCE): $(LOCAL_SRC_DIR)/$(SOURCE) ln -s $ $@ 1.7 +17 -3 jakarta-tomcat-connectors/webapp/apache-2.0/Makefile.in Index: Makefile.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-2.0/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile.in 1 May 2002 21:23:19 - 1.6 +++ Makefile.in 3 May 2002 16:13:40 - 1.7 @@ -56,7 +56,7 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.6 2002/05/01 21:23:19 pier Exp $ +# @version $Id: Makefile.in,v 1.7 2002/05/03 16:13:40 pier Exp $ LOCAL_TGT_DIR = @TGT_DIR@/apache-2.0 LOCAL_SRC_DIR = @SRC_DIR@/apache-2.0 @@ -65,8 +65,10 @@ SOURCE = mod_webapp.c OBJECT = mod_webapp.lo TARGET = libwebapp.la +INSDIR = .inst +LIBDIR = .libs -.PHONY: build clean +.PHONY: build clean dist build: $(TARGET) @@ -78,7 +80,19 @@ rm -f $(SOURCE) ; \ fi rm -f *.o *.slo - rm -rf .libs + rm -rf $(INSDIR) $(LIBDIR) + +dist: build $(INSDIR) + $(LIBTOOL) --mode=install \ + $(INSTALL) \ + $(LOCAL_TGT_DIR)/$(TARGET) \ + $(LOCAL_TGT_DIR)/$(INSDIR) + $(INSTALL) \ + $(LOCAL_TGT_DIR)/$(INSDIR)/libwebapp.so \ + $(DST_DIR)/mod_webapp.so + +$(INSDIR): + mkdir $(INSDIR) $(SOURCE): $(LOCAL_SRC_DIR)/$(SOURCE) ln -s $ $@ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 8718] - missing directories
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=8718. 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=8718 missing directories [EMAIL PROTECTED] changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||WORKSFORME --- Additional Comments From [EMAIL PROTECTED] 2002-05-03 16:15 --- The .zip work (I tried). Don't use the .tar.gz when you're on Windows. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp Makedefs.in Makefile.in
pier02/05/03 09:16:23 Modified:webapp Makedefs.in Makefile.in Log: Added the dist target to create a binary distribution directory (now the default when calling make) and a tarball target to create a binary distribution tarball. Revision ChangesPath 1.16 +13 -2 jakarta-tomcat-connectors/webapp/Makedefs.in Index: Makedefs.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makedefs.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Makedefs.in 1 May 2002 21:25:40 - 1.15 +++ Makedefs.in 3 May 2002 16:16:23 - 1.16 @@ -56,7 +56,7 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makedefs.in,v 1.15 2002/05/01 21:25:40 pier Exp $ +# @version $Id: Makedefs.in,v 1.16 2002/05/03 16:16:23 pier Exp $ .SUFFIXES: .c .o .lo @@ -65,6 +65,7 @@ CPP = @CPP@ SHELL = @SHELL@ LIBTOOL = @LIBTOOL@ +INSTALL = $(SHELL) $(SRC_DIR)/support/install.sh -c APXS= @APXS@ # Build flags @@ -87,6 +88,14 @@ SRC_DIR = @SRC_DIR@ TGT_DIR = @TGT_DIR@ OBJ_DIR = @TGT_DIR@/objects +DST_DIR = @TGT_DIR@/distrib +TARBALL = webapp-module-$(WEBAPP_VERSION) + +# Versions +APACHE_VERSION = @APACHE_VERSION@ +WEBAPP_VERSION = @WEBAPP_VERSION@ +HOST = @HOST@ +DATE = @DATE@ # Compilation template %.lo: $(LOCAL_SRC_DIR)/%.c @@ -96,4 +105,6 @@ $(CPPFLAGS) \ $(CFLAGS) $(LIBTOOL) --mode=install \ - cp $@ $(OBJ_DIR) + $(INSTALL) \ + $@ \ + $(OBJ_DIR) 1.30 +24 -3 jakarta-tomcat-connectors/webapp/Makefile.in Index: Makefile.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- Makefile.in 1 May 2002 21:26:28 - 1.29 +++ Makefile.in 3 May 2002 16:16:23 - 1.30 @@ -56,17 +56,19 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.29 2002/05/01 21:26:28 pier Exp $ +# @version $Id: Makefile.in,v 1.30 2002/05/03 16:16:23 pier Exp $ include @TGT_DIR@/Makedefs -all: extra-build +all: dist distclean: extra-clean rm -f $(MODULE)/Makefile rm -f lib/Makefile rm -f Makedefs rm -f Makefile + rm -f DETAILS.txt + rm -fr $(DST_DIR) extra-build: $(OBJ_DIR) @EXTRA_BUILD@ build @@ -75,10 +77,29 @@ build: $(OBJ_DIR) lib-build $(MODULE)-build clean: lib-clean $(MODULE)-clean - rm -rf $(OBJ_DIR)/* + rm -rf $(OBJ_DIR) + +dist: $(DST_DIR) extra-build + cp $(SRC_DIR)/LICENSE.txt $(DST_DIR) + cp $(SRC_DIR)/README.txt $(DST_DIR) + cp $(SRC_DIR)/INSTALL.txt $(DST_DIR) + cp $(TGT_DIR)/DETAILS.txt $(DST_DIR) + @$(MAKE) SUBF=$(MAKEFLAGS) SUBD=$(TGT_DIR)/$(MODULE) SUBT=dist subdir + +tarball: dist + cd $(TGT_DIR) + rm -rf $(TARBALL) + mkdir $(TARBALL) + cp -R $(DST_DIR)/. $(TARBALL) + tar -cf $(TARBALL).tar $(TARBALL) + gzip -9f $(TARBALL).tar + rm -rf $(TARBALL) $(OBJ_DIR): mkdir $(OBJ_DIR) + +$(DST_DIR): + mkdir $(DST_DIR) $(MODULE)-build: @$(MAKE) SUBF=$(MAKEFLAGS) SUBD=$(TGT_DIR)/$(MODULE) SUBT=build subdir -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp DETAILS.txt.in configure.in
pier02/05/03 09:17:56
Modified:webapp configure.in
Added: webapp DETAILS.txt.in
Log:
Output details for this build in DETAILS.txt, and add support for the
dist and tarball targets.
Revision ChangesPath
1.58 +15 -2 jakarta-tomcat-connectors/webapp/configure.in
Index: configure.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- configure.in 3 May 2002 13:30:25 - 1.57
+++ configure.in 3 May 2002 16:17:55 - 1.58
@@ -57,7 +57,7 @@
dnl --
dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
-dnl Version $Id: configure.in,v 1.57 2002/05/03 13:30:25 pier Exp $
+dnl Version $Id: configure.in,v 1.58 2002/05/03 16:17:55 pier Exp $
dnl
dnl NOTE: close all functions with ]) on the same line otherwise M4 will spit
dnl out the last argument of the function with an extra newline.
@@ -74,6 +74,9 @@
dnl --
AC_INIT([WebApp Module],[],[http://nagoya.apache.org/bugzilla])
AC_CONFIG_SRCDIR([configure.in])
+AC_CONFIG_AUX_DIR([support])
+AC_CANONICAL_HOST()
+
dnl --
dnl Get rid of all that --prefix ... --xxxdir in the help message
@@ -113,6 +116,13 @@
WA_VARIABLE([MODULE])
+WA_VARIABLE([APACHE_VERSION])
+WA_VARIABLE([WEBAPP_VERSION])
+WA_VARIABLE([HOST])
+WA_VARIABLE([DATE])
+HOST=${host}
+DATE=`date`
+
dnl --
dnl Figure out if we have APXS, where it's located, and what version it is
dnl --
@@ -238,10 +248,13 @@
MODULE=apache-2.0
fi
+dnl --
+dnl Retrieve Apache and WebApp version
+dnl --
WA_APXS_SERVER([APACHE_VERSION],[${APXS}])
WA_VERSION([WEBAPP_VERSION],[${CC}])
dnl --
dnl All done
dnl --
-AC_OUTPUT([Makedefs Makefile lib/Makefile ${MODULE}/Makefile])
+AC_OUTPUT([Makedefs Makefile lib/Makefile ${MODULE}/Makefile DETAILS.txt])
1.1 jakarta-tomcat-connectors/webapp/DETAILS.txt.in
Index: DETAILS.txt.in
===
Coonfiguration details:
module version: @WEBAPP_VERSION@
httpd version: @APACHE_VERSION@
host machine/os: @HOST@
cration date:@DATE@
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Admin webapp save-to-XML
On Fri, 3 May 2002, David Graff wrote: Date: Fri, 3 May 2002 07:52:03 -0400 From: David Graff [EMAIL PROTECTED] Reply-To: Tomcat Developers List [EMAIL PROTECTED] To: Tomcat Developers List [EMAIL PROTECTED] Subject: Re: Admin webapp save-to-XML I'm in total agreement with that! +1 ... I will implement it that way. I've been ultra-cautious about taking this final step until trying it with a few more configurations. Possibly a way to roll back to a timestamp.old too? I'm not sure how we could implement a decision to do this automatically ... obviously, a sysadmin could do it manually with no difficulty. Craig - Original Message - From: Remy Maucherat [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Friday, May 03, 2002 06:49 Subject: Admin webapp save-to-XML The save-to-XML feature of the admin webapp appears to be working good (of course, I only tried the default configuration ;-) ). I don't know what is the policy that will be used for ovewiting the existing server.xml, but I would do: - rename existing server.xml to server.xml.timestamp.old - write the new one to server.xml Is this what was planned ? 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] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 8719] - catalina.sh bug
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=8719. 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=8719 catalina.sh bug [EMAIL PROTECTED] changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|WONTFIX | --- Additional Comments From [EMAIL PROTECTED] 2002-05-03 16:21 --- Look, if you don't want to support Cygwin, remove the code entirely and note it as officially no longer supported. I have no problem with that. But I don't think it's terribly cool to put partial support in, cause people to waste hours of time wondering why something won't work when it isn't even supposed to work, then complain about how tired you are of Cygwin when you get a bug report. Just remove it instead. You'll have less code to maintain. Alternatively, you could spend 5 seconds doing a simple cut paste of the fix I already provided. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 8718] - missing directories
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=8718. 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=8718 missing directories --- Additional Comments From [EMAIL PROTECTED] 2002-05-03 16:39 --- Trust me, one day you will suddenly realize: Oh my! The directories really *aren't* there! Til then, fine, whatever... -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Admin webapp save-to-XML
Ok, I don't want to start a flame war or anything - but I really don't like the current solution. For short term - we can live with it, and I can accept that as long as we are commited to replace it with something better. I spent a lot of time on this issue - there are many solutions around - Mozilla, gnome, KDE, linuxconf, win32 registry, etc. There one essential requirement: the manager should preserve all elements and config that he doesn't understand. The best solution IMHO is to have a layer between the config file and the configuration. Right now we have XmlMapper ( or however it's called now ) pushing the config info directly into the components, and the components generating config fragments. That will loose information and makes the xml too hardcoded in. In jk we have a jk_config object that reads the properties and sits between config changer and the components. Any change in config ( by wire protocol, shm, etc ) can be registered by jk_config and he can persist it. And it's trivial to later change the format and interface to the config file ( to use LDAP or registry or xml ). A similar thing can be done in java - it is obviously harder with XML, but it can be done. The simplest implementation would be to read the XML as DOM, use the DOM-SAX transformer to get things configured ( while preserving the DOM ), and have the MBeans make calls to the Config object to make the aproriate config changes. This would eventually allow replacing the XML with an LDAP ( which would be nice for clustering and farming ), it would preserve comments and all unmanaged elements, and I believe it would be cleaner and easier. Just MHO. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 8775] - checksum error
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=8775. 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=8775 checksum error [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2002-05-03 17:19 --- You have to use GNU TAR to untar. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
[PATCH] added handling of a main worker in jk_lb_worker, Re: PROPOSAL:mod_jk2: Group/Instance
Hi Costin,
it wasn't difficult, so here is the new patch. The new (old) behavior is:
The main worker is defined by a lb_value of 0. This will never be changed in
jk_lb_worker. The other workers can get a value greater than 0. If the value
from config file is less than 0 it is multiplicated with -1.
Your are right this is a better solution. We can switch from doubles to int and
we get the other worker balanced if the main worker is down.
Bernd
Bernd Koecke wrote:
Hi Costin,
[EMAIL PROTECTED] wrote:
Hi Bernd,
First, many thanks for your help :-)
your welcome, its a lot of fun :)
No, I think not :). I checked it yesterday. With some additional log
statements in the validate function of jk_lb_worker.c you get the
value _inf_ for the lb_factor and lb_value (line 434-444). Because if
it would be set to 1, my config hadn't worked. Because I set the
local worker to 1 and the others to 0.
I'll check again, and fix it if necesarry.
I wrote some code in jk2 that seems to solve the problem, and I can
backport this to jk1 if it is correct.
Probably this is my mistake - I remember the discussion and the patch
that was sent for this problem, and most likely I did something
wrong commiting it ( i.e. I did few changes trying to simplify it, and it
seems I 'simplified' too much ). But my memory still has the patch's
logic
which seemed fine :-)
This is possible, but then you must add a check if the value is 0.
Because without it you calc 1/0 with an int and this will give you an
error.
Yes, of course. 0 will continue to mean 'default worker'.
see below
I'm not very comfortable with float calculations in the critical
path ( and in an area that is executed concurently !). The only problem
is what happens on overflows - the lb_value may become 0 ( or a small
value ) and then the worker will take all the load.
Thats not the whole story. Its right you will check the main worker
when its back again and use it only once. Because when the request
was successful handled rec-in_recovering is true (line 332 of
jk_lb_worker.c, service function). Than get_max_lb get the value
_inf_ from one of the other worker. Than the things happen which I
said in my prior mail.
That was it what I did in my sent patch, the additional documentation
was sent a few days later. But my additions to the lb_worker were a
little bit to complex. You are right we should get it when we use the
flag only on the main worker and change the behavior after a failure
for this worker. But we need the trick with 0/inf for the other
worker, because only with this we have the situation that the other
worker wouldn't be asked when there is no session and the main worker
is up.
Ok, can you send the patch again :-) ?
For going back to the main worker - if we let it with lb_value=0 at all
time ( i.e. we don't alter that at any time ), and only in_error_state
is set on failure - then I believe the thing will work fine.
Thats the invers from the actual situation. So my patch from a few hours
earlier this day depends on the fact that the other worker get a
lb_value of 0 in the config file. This will be converted to _inf_ and
the main worker gets 1 and this will be the minimal lb_value of the
balanced workers. If we want the possibility to switch to ints I could
send a new patch which handles 0 as a special value for the main worker.
Should I?
Bernd
I will try to build another patch and send it. I think it could be
possible without an additional flag.
Great !
Another tought about this:
When you use double and we fix the handling after an error, the main
worker would never reach _inf_. Because the lb_factor is 1 if
lb_value wasn't 0. After choosing the worker this value is added to
the lb_value. But with a high value for lb_value the differenc
between two savable double numbers is greater than the lb_factor. But
this is only interessting in theory. I think in real world we will
reboot apache before this will happen :).
That may become a problem if we use ints.
Costin
[...]
--
Dipl.-Inform. Bernd Koecke
UNIX-Entwicklung
Schlund+Partner AG
Fon: +49-721-91374-0
E-Mail: [EMAIL PROTECTED]
Index: jk_lb_worker.c
===
RCS file: /home/cvspublic/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v
retrieving revision 1.8
diff -u -r1.8 jk_lb_worker.c
--- jk_lb_worker.c 12 Jan 2002 05:27:39 - 1.8
+++ jk_lb_worker.c 3 May 2002 17:17:35 -
@@ -291,7 +291,12 @@
}
}
-if(rc) {
+/*
+ * The following isn't necessary, because for the 'main' worker
+ * lb_value and lb_factor are == 0. And all other worker have a value 0
+ * But it makes the intention clearer.
+ */
+if(rc rc-lb_value != 0) {
rc-lb_value += rc-lb_factor;
}
@@ -329,7 +334,7 @@
Re: Add a target in build.xml
Don't use wget as it's platform specific. Use the 'Get' built-in task. May not do exactly what you want but it will work everywhere that ant does. - Original Message - From: jean-frederic clere [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Friday, May 03, 2002 10:44 Subject: Add a target in build.xml Hi, I would like to add a target to the TC build.xml: download. Last time I have tried to help to release TC I have found there is no clean way to know easly what is needed to build a TC release (which xerces.jar is needed for example). The download would download using wget and extract the need files using tar. Any comments? Cheers Jean-frederic -- 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/jk/native2/include jk_endpoint.h jk_env.h jk_msg.h jk_worker.h
costin 02/05/03 10:36:46 Modified:jk/native2/include jk_endpoint.h jk_env.h jk_msg.h jk_worker.h Log: Added 'reqCnt' and 'errCnt' and reorganize the worker struct. Few minor improvements (debug for env to filter out the low level messages), Revision ChangesPath 1.12 +3 -1 jakarta-tomcat-connectors/jk/native2/include/jk_endpoint.h Index: jk_endpoint.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_endpoint.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- jk_endpoint.h 23 Mar 2002 16:52:18 - 1.11 +++ jk_endpoint.h 3 May 2002 17:36:46 - 1.12 @@ -61,7 +61,7 @@ * Author: Gal Shachor [EMAIL PROTECTED] * Author: Dan Milstein [EMAIL PROTECTED] * Author: Henri Gomez [EMAIL PROTECTED] - * Version: $Revision: 1.11 $ + * Version: $Revision: 1.12 $ ***/ #ifndef JK_ENDPOINT_H @@ -85,6 +85,8 @@ struct jk_map; typedef struct jk_endpoint jk_endpoint_t; +/* XXX replace worker with channel, endpoints are specific to channels not workers */ + /* * The endpoint 'class', which represents one end of a connection to the * servlet engine. Basically, supports nothing other than forwarding the 1.14 +1 -0 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.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- jk_env.h 25 Apr 2002 18:37:44 - 1.13 +++ jk_env.h 3 May 2002 17:36:46 - 1.14 @@ -306,6 +306,7 @@ struct jk_objCache *envCache; struct jk_exception *lastException; int id; +int debug; }; void JK_METHOD jk2_registry_init(jk_env_t *env); 1.7 +10 -6 jakarta-tomcat-connectors/jk/native2/include/jk_msg.h Index: jk_msg.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_msg.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jk_msg.h 2 May 2002 03:13:05 - 1.6 +++ jk_msg.h 3 May 2002 17:36:46 - 1.7 @@ -146,7 +146,7 @@ const char *param); int (*appendMap)(struct jk_env *env, struct jk_msg *_this, - struct jk_map map); + struct jk_map *map); unsigned char (*getByte)(struct jk_env *env, struct jk_msg *_this); @@ -165,18 +165,22 @@ unsigned char *(*getString)(struct jk_env *env, struct jk_msg *_this); /** Return a byte[] and it's length. -The buffer is internal to the message, you must save -or make sure the message lives long enough. + * The buffer is internal to the message, you must save + * or make sure the message lives long enough. */ unsigned char *(*getBytes)(struct jk_env *env, struct jk_msg *_this, int *len); /** Read a map structure from the message. The map is encoded -as an int count and then the NV pairs -*/ + * as an int count and then the NV pairs. + * + * The content will not be copied - but point to the msg's buffer. + * If you want to use the map after the msg becomes invalid, you need + * to copy it. + */ int (*getMap)(struct jk_env *env, struct jk_msg *_this, - struct jk_map map); + struct jk_map *map); /** * Special method. Will read data from the server and add them as 1.17 +30 -18jakarta-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.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- jk_worker.h 25 Apr 2002 18:43:29 - 1.16 +++ jk_worker.h 3 May 2002 17:36:46 - 1.17 @@ -58,7 +58,7 @@ /*** * Description: Workers controller header file * * Author: Gal Shachor [EMAIL PROTECTED] * - * Version: $Revision: 1.16 $
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_status.c
costin 02/05/03 10:37:35
Modified:jk/native2/common jk_worker_status.c
Log:
Better organization, make the worker status the first on the page.
See also the changes in jk_worker_ajp, now informations about lb status
and number of requests/err will be easy accessible.
Revision ChangesPath
1.16 +101 -1jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c
Index: jk_worker_status.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_worker_status.c2 May 2002 03:13:05 - 1.15
+++ jk_worker_status.c3 May 2002 17:37:35 - 1.16
@@ -95,6 +95,99 @@
}
+static void jk2_worker_status_displayRuntimeWorkers(jk_env_t *env, jk_ws_service_t
*s,
+ jk_workerEnv_t *wenv)
+{
+jk_map_t *map=wenv-initData;
+int i;
+int needHeader=JK_TRUE;
+
+s-jkprintf(env, s, H3Worker runtime info/H3\n);
+s-jkprintf(env, s, pWorker information, using getAttribute() /p\n);
+
+s-jkprintf(env, s, table border\n);
+for( i=0; i env-_objects-size( env, env-_objects ); i++ ) {
+char *name=env-_objects-nameAt( env, env-_objects, i );
+jk_bean_t *mbean=env-_objects-valueAt( env, env-_objects, i );
+int j;
+int propCount;
+
+/* Don't display aliases */
+if( strchr(name, ':')==NULL )
+continue;
+
+if( mbean==NULL || mbean-getAttributeInfo==NULL )
+continue;
+
+if( mbean-getAttribute == NULL )
+continue;
+
+if( strncmp( ajp13, mbean-type, 5 ) != 0 )
+continue;
+
+if( needHeader ) {
+s-jkprintf(env, s, trthname/th\n);
+for( j=0; mbean-getAttributeInfo[j] != NULL; j++ ) {
+char *pname=mbean-getAttributeInfo[j];
+
+s-jkprintf(env, s, th%s/th, pname );
+}
+needHeader = JK_FALSE;
+}
+
+s-jkprintf(env, s, /trtrtd%s/td\n, mbean-localName);
+for( j=0; mbean-getAttributeInfo[j] != NULL; j++ ) {
+char *pname=mbean-getAttributeInfo[j];
+
+s-jkprintf(env, s, td%s/td,
+mbean-getAttribute( env, mbean, pname));
+}
+}
+s-jkprintf( env,s , /table\n );
+}
+
+static void jk2_worker_status_displayRuntimeUris(jk_env_t *env, jk_ws_service_t *s,
+ jk_workerEnv_t *wenv)
+{
+jk_map_t *map=wenv-initData;
+int i;
+
+s-jkprintf(env, s, H3URI info/H3\n);
+s-jkprintf(env, s, pInformation about uri mappings.
+Will include some statistics ( for the active process )/p\n);
+s-jkprintf(env, s, table border\n);
+s-jkprintf(env, s, trthName/ththValue/td/tr\n);
+for( i=0; i env-_objects-size( env, env-_objects ); i++ ) {
+char *name=env-_objects-nameAt( env, env-_objects, i );
+jk_bean_t *mbean=env-_objects-valueAt( env, env-_objects, i );
+int j;
+int propCount;
+
+/* Don't display aliases */
+if( strchr(name, ':')==NULL )
+continue;
+
+if( mbean==NULL || mbean-getAttributeInfo==NULL )
+continue;
+
+if( mbean-getAttribute == NULL )
+continue;
+
+if( strncmp( uri, mbean-type, 3 ) != 0 )
+continue;
+
+for( j=0; mbean-getAttributeInfo[j] != NULL; j++ ) {
+char *pname=mbean-getAttributeInfo[j];
+
+
+s-jkprintf(env, s, trtd%s/tdtd%s/tdtd%s/td/tr,
+mbean-localName, pname,
+mbean-getAttribute( env, mbean, pname));
+}
+}
+s-jkprintf( env,s , /table\n );
+}
+
static void jk2_worker_status_displayRuntimeProperties(jk_env_t *env,
jk_ws_service_t *s,
jk_workerEnv_t *wenv)
{
@@ -122,6 +215,11 @@
if( mbean-getAttribute == NULL )
continue;
+if( strncmp( uri, mbean-type, 3 ) == 0 ||
+strncmp( ajp13, mbean-type, 5 ) == 0 ) {
+continue;
+}
+
for( j=0; mbean-getAttributeInfo[j] != NULL; j++ ) {
char *pname=mbean-getAttributeInfo[j];
@@ -200,9 +298,11 @@
}
/* Body */
+jk2_worker_status_displayRuntimeWorkers(env, s, s-workerEnv );
+jk2_worker_status_displayRuntimeUris(env, s, s-workerEnv );
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_apr_socket.c jk_channel_jni.c jk_channel_socket.c
costin 02/05/03 10:39:40
Modified:jk/native2/common jk_channel_apr_socket.c jk_channel_jni.c
jk_channel_socket.c
Log:
Call the setter on the worker for non-specific properties.
Each channel is associated with an ajp worker ( later we can configure
that, but at this moment we use ajp13 as the main protocol ). The
load balancing parameters are set in the worker ( again, it's 1-1 relation
between worker and channel, the worker is just a protocol with an
associated channel ).
Revision ChangesPath
1.11 +7 -7
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_channel_apr_socket.c 30 Apr 2002 06:49:45 - 1.10
+++ jk_channel_apr_socket.c 3 May 2002 17:39:40 - 1.11
@@ -135,10 +135,10 @@
jk_bean_t *mbean,
char *name, void *valueP)
{
-jk_channel_t *_this=(jk_channel_t *)mbean-object;
+jk_channel_t *ch=(jk_channel_t *)mbean-object;
char *value=valueP;
jk_channel_apr_private_t *socketInfo=
-(jk_channel_apr_private_t *)(_this-_privatePtr);
+(jk_channel_apr_private_t *)(ch-_privatePtr);
if( strcmp( host, name ) == 0 ) {
socketInfo-host=value;
@@ -148,6 +148,9 @@
socketInfo-host=value;
socketInfo-type=AF_UNIX;
} else {
+ if( ch-worker!=NULL ) {
+return ch-worker-mbean-setAttribute( env, ch-worker-mbean, name,
valueP );
+}
return JK_ERR;
}
return JK_OK;
@@ -258,9 +261,6 @@
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);
@@ -415,8 +415,6 @@
jk_channel_apr_data_t *chD=endpoint-channelData;
-env-l-jkLog(env, env-l, JK_LOG_ERROR,
- jk2_channel_apr_send %p\n, chD);
if( chD==NULL )
return JK_ERR;
@@ -446,6 +444,8 @@
while(sent len) {
this_time = send(unixsock, (char *)b + sent , len - sent, 0);
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ channel.apr:send() send() %d %d\n, this_time, errno);
if(0 == this_time) {
return -2;
}
1.14 +14 -2 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jk_channel_jni.c 2 May 2002 03:13:05 - 1.13
+++ jk_channel_jni.c 3 May 2002 17:39:40 - 1.14
@@ -102,15 +102,27 @@
static int JK_METHOD jk2_channel_jni_setProperty(jk_env_t *env,
jk_bean_t *mbean,
- char *name, void *value)
+ char *name, void *valueP)
{
+jk_channel_t *ch=(jk_channel_t *)mbean-object;
+char *value=valueP;
+
+if( ch-worker!=NULL ) {
+return ch-worker-mbean-setAttribute( env, ch-worker-mbean, name,
valueP );
+}
return JK_OK;
}
static int JK_METHOD jk2_channel_jni_init(jk_env_t *env,
- jk_channel_t *_this)
+ jk_channel_t *jniW)
{
+jk_workerEnv_t *wEnv=jniW-workerEnv;
+if( wEnv-vm == NULL ) {
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ channel_jni.init() no VM found\n );
+return JK_ERR;
+}
return JK_OK;
}
1.21 +4 -1 jakarta-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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_channel_socket.c 25 Apr 2002 18:49:37 - 1.20
+++ jk_channel_socket.c 3 May 2002 17:39:40 - 1.21
@@ -131,7 +131,10 @@
} else if( strcmp( port, name ) == 0 ) {
socketInfo-port=atoi( value );
} else {
- return JK_ERR;
+ if( ch-worker!=NULL ) {
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_config.c
costin 02/05/03 10:40:25
Modified:jk/native2/common jk_config.c
Log:
Display an error message on unknown property names.
debugEnv will turn on the messages about object creation/etc.
Revision ChangesPath
1.13 +18 -3 jakarta-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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_config.c 25 Apr 2002 18:49:37 - 1.12
+++ jk_config.c 3 May 2002 17:40:25 - 1.13
@@ -58,7 +58,7 @@
/***
* Description: General purpose config object *
* Author: Gal Shachor [EMAIL PROTECTED] *
- * Version: $Revision: 1.12 $ *
+ * Version: $Revision: 1.13 $ *
***/
#include jk_global.h
@@ -278,8 +278,14 @@
return JK_OK;
}
-if(mbean-setAttribute)
-return mbean-setAttribute( env, mbean, name, val );
+if(mbean-setAttribute) {
+int rc= mbean-setAttribute( env, mbean, name, val );
+if( rc != JK_OK ) {
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ config.setAttribute() Error setting %s %s %s\n,
mbean-name, name, val );
+}
+return rc;
+}
return JK_ERR;
}
@@ -302,7 +308,14 @@
cfg-setProperty( env, cfg, cfg-mbean, name, value );
return status;
}
+
+if( strncmp( objName, disabled:, 9) == 0 ) {
+return JK_OK;
+}
+/** Replace properties in the object name */
+objName = jk2_config_replaceProperties(env, cfg-map, cfg-map-pool, objName);
+
mbean=env-getBean( env, objName );
if( mbean==NULL ) {
mbean=env-createBean( env, cfg-pool, objName );
@@ -779,6 +792,8 @@
if( strcmp( name, file )==0 ) {
return jk2_config_setConfigFile(env, cfg, cfg-workerEnv, value);
+} else if( strcmp( name, debugEnv )==0 ) {
+env-debug=atoi( value );
} else if( strcmp( name, save )==0 ) {
/* Experimental. Setting save='foo' will save the current config in
foo
--
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/05/03 10:41:06
Modified:jk/native2/common jk_env.c
Log:
Filter the messages if debug is not enabled.
Most of the time they don't matter, but in case of error they are
very usefull to debug.
Revision ChangesPath
1.21 +52 -12jakarta-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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_env.c 30 Apr 2002 06:49:45 - 1.20
+++ jk_env.c 3 May 2002 17:41:06 - 1.21
@@ -78,6 +78,7 @@
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;
@@ -114,8 +115,15 @@
env-l=parentEnv-l;
env-globalPool=parentEnv-globalPool;
env-envCache=parentEnv-envCache;
-
-fprintf( stderr, env:Create child env %p %p\n, parentEnv, env);
+env-debug=parentEnv-debug;
+
+if( env-debug 0 ) {
+if( env-l == NULL )
+fprintf( stderr, env:Create child env %p %p\n, parentEnv, env);
+else
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ env:Create child env %p %p\n, parentEnv, env);
+}
}
return env;
}
@@ -186,6 +194,10 @@
return NULL;
}
+if( strcmp( disabled, type ) == 0 ) {
+return NULL;
+}
+
if( localName!=NULL strncmp( localName, type, strlen( type )) == 0 ) {
/* Common error, make it 'localName' */
if( strcmp( type, localName ) == 0 ) {
@@ -195,11 +207,13 @@
}
}
-if( env-l != NULL ) {
-env-l-jkLog(env, env-l, JK_LOG_INFO,
- env.createBean2(): Create [%s] %s\n, type, localName);
-} else {
+if( env-debug 0 ) {
+if( env-l != NULL ) {
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ env.createBean2(): Create [%s] %s\n, type, localName);
+} else {
fprintf(stderr, env.createBean2(): Create [%s] %s\n, type, localName);
+}
}
fac=(jk_env_objectFactory_t)env-_registry-get( env, env-_registry, type);
@@ -251,7 +265,13 @@
return NULL;
}
-fprintf(stderr,env.createBean2(): register %s %p\n, result-name,
result-object);
+if( env-debug 0 ) {
+if( env-l == NULL )
+fprintf(stderr,env.createBean2(): register %s %p\n, result-name,
result-object);
+else
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ env.createBean2(): register %s %p\n, result-name,
result-object);
+}
jk_env_globalEnv-_objects-put( env, jk_env_globalEnv-_objects, result-name,
result, NULL );
@@ -272,15 +292,23 @@
if( jkb==NULL ) {
if( env-l==NULL ) {
-fprintf(stderr,env.alias(): Not found %s\n, name);
+if( env-debug 0 )
+fprintf(stderr,env.alias(): Not found %s\n, name);
} else {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
env.alias(): Not found %s\n, name);
}
return ;
}
+
+if( env-debug 0 ) {
+if( env-l == NULL )
+fprintf(stderr,env.alias(): alias %s %s\n, name, alias);
+else
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ env.alias(): alias %s %s\n, name, alias);
+}
-fprintf(stderr,env.alias(): alias %s %s\n, name, alias);
jk_env_globalEnv-_objects-put( env, jk_env_globalEnv-_objects, alias, jkb,
NULL );
}
@@ -291,11 +319,23 @@
jk_bean_t *result=env-getBean( env, name );
if( result==NULL ) {
-fprintf(stderr,env.alias(): Can't find %p %s\n, env, name);
+if( env-debug 0 ) {
+if( env-l == NULL )
+fprintf(stderr,env.getByName(): Can't find %p %s\n, env, name);
+else
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ env.getByName(): Can't find %p %s\n, env, name);
+}
return NULL;
}
-fprintf(stderr,env.alias(): Get by name %s %p\n, name, result-object);
+if( env-debug 0 ) {
+if( env-l == NULL )
+fprintf(stderr,env.getByName(): Get by name %s %p\n, name,
result-object);
+else
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ env.getByName(): Get by name %s %p\n, name,
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_msg_ajp.c
costin 02/05/03 10:41:52
Modified:jk/native2/common jk_msg_ajp.c
Log:
Add encoding/decoding for map.
That'll be used very frequently to pass properties back and
forth ( either via shm or a different channel )
Revision ChangesPath
1.9 +26 -4 jakarta-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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_msg_ajp.c 2 May 2002 03:13:05 - 1.8
+++ jk_msg_ajp.c 3 May 2002 17:41:52 - 1.9
@@ -60,7 +60,7 @@
* Author: Costin Manolache
* Author: Gal Shachor [EMAIL PROTECTED] *
* Author: Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.8 $ *
+ * Version: $Revision: 1.9 $ *
***/
#include jk_pool.h
@@ -172,14 +172,36 @@
static int jk2_msg_ajp_appendMap(jk_env_t *env, jk_msg_t *msg,
jk_map_t *map)
{
+int rc;
+int i;
+int size=map-size(env, map);
-return JK_OK;
+rc=msg-appendInt( env, msg, size );
+
+for( i=0; i size; i++ ) {
+char *name=map-nameAt( env, map, i );
+char *val=map-valueAt( env, map, i );
+if( rc== JK_OK )
+rc=msg-appendString( env, msg, name );
+if( rc== JK_OK )
+msg-appendString( env, msg, val );
+}
+
+return rc;
}
static int jk2_msg_ajp_getMap(jk_env_t *env, jk_msg_t *msg,
jk_map_t *map)
{
+int size=msg-getInt( env, msg );
+int i;
+
+for( i=0; isize; i++ ) {
+char *name= msg-getString( env, msg );
+char *val=msg-getString( env, msg );
+map-add( env, map, name, val );
+}
return JK_OK;
}
@@ -189,8 +211,8 @@
{
int len;
-if(!param) {
- msg-appendInt( env, msg, 0x );
+if(param==NULL) {
+msg-appendInt( env, msg, 0x );
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_uriEnv.c
costin 02/05/03 10:43:59
Modified:jk/native2/common jk_uriEnv.c
Log:
Rename 'worker' to 'group' in the config.
This will hopefully reduce the confusion.
Revision ChangesPath
1.15 +9 -6 jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c
Index: jk_uriEnv.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_uriEnv.c 1 May 2002 17:23:14 - 1.14
+++ jk_uriEnv.c 3 May 2002 17:43:59 - 1.15
@@ -126,7 +126,7 @@
return (uriEnv-virtual==NULL) ? * : uriEnv-virtual;
} else if( strcmp( name, uri ) ) {
return uriEnv-uri;
-} else if( strcmp( name, worker ) ) {
+} else if( strcmp( name, group ) ) {
return uriEnv-workerName;
}
return NULL;
@@ -223,10 +223,13 @@
if( uriEnv-workerName != NULL uriEnv-worker==NULL ) {
uriEnv-worker= env-getByName( env, wname );
if( uriEnv-worker==NULL ) {
-env-l-jkLog(env, env-l, JK_LOG_ERROR,
- uriEnv.init() map to invalid worker %s %s\n,
- uriEnv-uri, uriEnv-workerName);
-/* XXX that's allways a 'lb' worker, create it */
+uriEnv-worker= env-getByName2( env, worker.lb, wname );
+if( uriEnv-worker==NULL ) {
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ uriEnv.init() map to invalid worker %s %s\n,
+ uriEnv-uri, uriEnv-workerName);
+/* XXX that's allways a 'lb' worker, create it */
+}
}
}
@@ -358,7 +361,7 @@
return JK_OK;
}
-static char *myAttInfo[]={ host, uri, worker, NULL };
+static char *myAttInfo[]={ host, uri, group, NULL };
int JK_METHOD jk2_uriEnv_factory(jk_env_t *env, jk_pool_t *pool,
jk_bean_t *result,
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_uriMap.c
costin 02/05/03 10:45:06
Modified:jk/native2/common jk_uriMap.c
Log:
Another fix in uriMap - make sure each host has a default context.
Deja-vu, check the commits of about 2 years ago :-)
Still missing - add /servlet/*, *.jsp and WEB-INF mappings automatically.
Revision ChangesPath
1.29 +43 -3 jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c
Index: jk_uriMap.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jk_uriMap.c 1 May 2002 17:23:14 - 1.28
+++ jk_uriMap.c 3 May 2002 17:45:06 - 1.29
@@ -331,6 +331,7 @@
int i;
jk_workerEnv_t *workerEnv=uriMap-workerEnv;
jk_bean_t *mbean;
+jk_uriEnv_t *uriEnv;
mbean=env-getBean2( env, uri, );
if( mbean==NULL )
@@ -347,7 +348,7 @@
/* Initialize the vhosts table */
for(i = 0 ; i uriMap-maps-size( env, uriMap-maps ) ; i++) {
-jk_uriEnv_t *uriEnv=uriMap-maps-valueAt( env, uriMap-maps, i );
+uriEnv=uriMap-maps-valueAt( env, uriMap-maps, i );
if( uriEnv == NULL ) continue;
if( uriEnv-match_type== MATCH_TYPE_HOST ) {
@@ -366,7 +367,7 @@
/* Add the vhost aliases ( for each vhost, by looking in the aliases ) */
for(i = 0 ; i uriMap-maps-size( env, uriMap-maps ) ; i++) {
-jk_uriEnv_t *uriEnv=uriMap-maps-valueAt( env, uriMap-maps, i );
+uriEnv=uriMap-maps-valueAt( env, uriMap-maps, i );
if( uriEnv-match_type== MATCH_TYPE_HOST
uriEnv-virtual!=NULL ) {
@@ -376,6 +377,41 @@
}
}
+/** Make sure each vhost has a default context
+ */
+for(i = 0 ; i uriMap-vhosts-size( env, uriMap-vhosts ) ; i++) {
+jk_uriEnv_t *hostEnv=uriMap-vhosts-valueAt( env, uriMap-vhosts, i );
+jk_uriEnv_t *rootCtx;
+char *uriPath;
+
+if( hostEnv-virtual != NULL ) {
+uriPath=env-tmpPool-calloc( env, env-tmpPool,
+ strlen( hostEnv-virtual ) + 3 );
+strcpy( uriPath, hostEnv-virtual );
+strcat( uriPath, / );
+} else {
+uriPath=/;
+}
+
+rootCtx=env-getByName2( env, uri, uriPath );
+if( rootCtx==NULL ) {
+env-createBean2( env, uriMap-mbean-pool, uri, uriPath );
+rootCtx=env-getByName2( env, uri, uriPath );
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ uriMap.init() Create default context %s\n, uriPath );
+rootCtx-mbean-setAttribute( env, rootCtx-mbean, context, / );
+}
+}
+
+uriEnv=env-getByName2( env, uri, / );
+if( uriEnv==NULL ) {
+env-createBean2( env, uriMap-mbean-pool, uri, / );
+uriEnv=env-getByName2( env, uri, / );
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ uriMap.init() Create default context / ( for default host
)\n );
+uriEnv-mbean-setAttribute( env, uriEnv-mbean, context, / );
+}
+
/* Init all contexts */
/* For each context, init the local uri maps */
for(i = 0 ; i uriMap-maps-size( env, uriMap-maps ) ; i++) {
@@ -411,7 +447,6 @@
}
}
-
if( uriMap-debug 5 )
env-l-jkLog(env, env-l, JK_LOG_INFO,
uriMap.init() processing mappings\n);
@@ -438,6 +473,11 @@
ctxEnv=jk2_uriMap_prefixMap( env, uriMap, hostEnv-webapps, uri, strlen(
uri ) );
+if( ctxEnv==NULL ) {
+env-l-jkLog(env, env-l, JK_LOG_INFO, uriMap.init() no context for
%s\n, uri);
+return JK_ERR;
+}
+
if( MATCH_TYPE_EXACT == uriEnv-match_type ) {
ctxEnv-exactMatch-add( env, ctxEnv-exactMatch, uri, uriEnv );
} else if( MATCH_TYPE_SUFFIX == uriEnv-match_type ) {
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_workerEnv.c
costin 02/05/03 10:45:57
Modified:jk/native2/common jk_workerEnv.c
Log:
Remove some old code.
Make sure the protocol is associated with each channel automatically.
Update the default worker as 'lb', and make sure the name is correct.
Revision ChangesPath
1.33 +28 -48jakarta-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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- jk_workerEnv.c1 May 2002 22:23:36 - 1.32
+++ jk_workerEnv.c3 May 2002 17:45:57 - 1.33
@@ -59,7 +59,7 @@
* Description: Workers controller *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Author: Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.32 $ *
+ * Version: $Revision: 1.33 $ *
***/
#include jk_env.h
@@ -70,7 +70,7 @@
#include jk_channel.h
#include jk_registry.h
-#define DEFAULT_WORKER (ajp13)
+#define DEFAULT_WORKER (lb)
static void jk2_workerEnv_close(jk_env_t *env, jk_workerEnv_t *wEnv);
static void jk2_workerEnv_initHandlers(jk_env_t *env, jk_workerEnv_t *wEnv);
@@ -181,24 +181,10 @@
err=w-init(env, w);
if(err!=JK_OK) {
-if( w-destroy != NULL )
-w-destroy(env, w);
env-l-jkLog(env, env-l, JK_LOG_ERROR,
workerEnv.initWorkers() init failed for %s\n,
name);
-} else {
-/* Add the worker automatically in the 'default' lb and in any
group */
-if( strncmp( worker.ajp13, w-mbean-name, 12 ) == 0 ||
-strncmp( ajp13, w-mbean-name, 5 ) == 0 ) {
-/* It's a forwarding worker */
-lb-mbean-setAttribute(env, lb-mbean, balanced_workers,
-w-mbean-name);
-}
-
-/* XXX Find any 'group' property - find or create an lb for that
- and register it
-*/
-}
+}
}
}
return JK_OK;
@@ -213,38 +199,16 @@
if( ch-init != NULL ) {
rc=ch-init(env, ch);
-
if(rc!=JK_OK) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
workerEnv.initChannel() init failed for %s\n,
- ch-mbean-name);
+ ch-mbean-name);
+/* Disable the associated worker */
+ch-worker-channel=NULL;
+ch-worker-channelName=NULL;
}
}
-if( ch-workerName != NULL ) {
-jk_worker_t *w=wEnv-worker_map-get( env, wEnv-worker_map, ch-workerName
);
-ch-worker=w;
-}
-
-/* If a worker is not defined ( yet ) for the channel, define a default one (
ajp13 )*/
-if( ch-worker == NULL ) {
-jk_bean_t *jkb;
-
-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, 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;
-
-/* XXX Set additional parameters - use defaults otherwise */
-}
return rc;
}
@@ -330,10 +294,10 @@
/* Set default worker. It'll be used for all uris that have no worker
*/
if( wEnv-defaultWorker == NULL ) {
-jk_worker_t *w=wEnv-worker_map-get( env, wEnv-worker_map, worker.lb );
+jk_worker_t *w=wEnv-worker_map-get( env, wEnv-worker_map, worker.lb:lb
);
if( w==NULL ) {
-jk_bean_t *jkb=env-createBean2(env, wEnv-pool, worker.lb, );
+jk_bean_t *jkb=env-createBean2(env, wEnv-pool, worker.lb, lb );
w=jkb-object;
env-l-jkLog(env, env-l, JK_LOG_ERROR, workerEnv.init() create
default worker %s\n, jkb-name );
}
@@ -498,12 +462,28 @@
}
static int jk2_workerEnv_addChannel(jk_env_t *env, jk_workerEnv_t *wEnv,
-
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_ajp13.c
costin 02/05/03 10:47:31
Modified:jk/native2/common jk_worker_ajp13.c
Log:
Update the list of properties to include more lb info.
Automatically add the worker to all the groups that are configured in.
The load balancing is now configured by including (one or many)
group attributes on the channel. Each group name will be used
to construct automatically an lb worker, and the channel will be
added to the lb worker.
The name of the group can then be used in uri mappings.
Revision ChangesPath
1.12 +73 -60jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c
Index: jk_worker_ajp13.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_worker_ajp13.c 1 May 2002 23:10:17 - 1.11
+++ jk_worker_ajp13.c 3 May 2002 17:47:31 - 1.12
@@ -85,7 +85,8 @@
#define AJP14_DEF_PORT (8011)
/* Impl */
-static char *myAttInfo[]={ channelName, route, errorState, recovering,
+static char *myAttInfo[]={ lb_factor, lb_value, reqCnt, errCnt,
+ route, errorState, recovering,
epCount, NULL };
static void * JK_METHOD jk2_worker_ajp14_getAttribute(jk_env_t *env, jk_bean_t
*bean, char *name ) {
@@ -98,6 +99,22 @@
return worker-channelName;
} else if (strcmp( name, route )==0 ) {
return worker-route;
+} else if (strcmp( name, lb_value )==0 ) {
+char *buf=env-tmpPool-calloc( env, env-tmpPool, 20 );
+sprintf( buf, %f, worker-lb_value );
+return buf;
+} else if (strcmp( name, reqCnt )==0 ) {
+char *buf=env-tmpPool-calloc( env, env-tmpPool, 20 );
+sprintf( buf, %d, worker-reqCnt );
+return buf;
+} else if (strcmp( name, errCnt )==0 ) {
+char *buf=env-tmpPool-calloc( env, env-tmpPool, 20 );
+sprintf( buf, %d, worker-errCnt );
+return buf;
+} else if (strcmp( name, lb_factor )==0 ) {
+char *buf=env-tmpPool-calloc( env, env-tmpPool, 20 );
+sprintf( buf, %f, worker-lb_factor );
+return buf;
} else if (strcmp( name, errorState )==0 ) {
if( worker-in_error_state )
return Y;
@@ -136,6 +153,10 @@
if( strcmp( name, secretkey )==0 ) {
ajp14-secret = value;
+} else if( strcmp( name, tomcatId )==0 ) {
+ajp14-route=value;
+} else if( strcmp( name, group )==0 ) {
+ajp14-groups-add( env, ajp14-groups, value, ajp14 );
} else if( strcmp( name, cachesize )==0 ) {
ajp14-cache_sz=atoi( value );
} else if( strcmp( name, lb_factor )==0 ) {
@@ -567,6 +588,8 @@
jk2_worker_ajp14_init(jk_env_t *env, jk_worker_t *ajp14)
{
int rc;
+int size;
+int i;
if( ajp14-cache_sz == -1 )
ajp14-cache_sz=JK_OBJCACHE_DEFAULT_SZ;
@@ -585,70 +608,55 @@
ajp14-endpointCache=NULL;
}
-if( ajp14-channelName == NULL ) {
-/* No channel was specified. Default to a channel, using
- the local part of the worker name to construct it. The type
- of the channel will be unix socket if a / is found, jni if
- the name is jni, and socket otherwise.
-
- If the channle is not found, create one.
-*/
-char *localName=strchr( ajp14-mbean-name, ':' );
-if( localName==NULL || localName[1]=='\0' ) {
-/* No local part, use the defaults */
-ajp14-channelName=channel.socket;
-} else {
-char *prefix;
-localName++;
-if( strcmp( localName, jni ) == 0 ) {
-/* Easy one */
-ajp14-channelName=channel.jni;
-} else {
-if( strchr( localName, '/' )) {
-prefix=channel.apr:;
-} else {
-/* We could do more - if other channels are defined and
- we can guess it */
-prefix=channel.socket:;
-}
-ajp14-channelName=ajp14-pool-calloc( env, ajp14-pool, strlen(
localName )+
-strlen( prefix ) + 2 );
-strcpy( ajp14-channelName, prefix );
-strcat( ajp14-channelName, localName );
-}
-}
-}
-
if( ajp14-channel == NULL ) {
-ajp14-channel= env-getByName( env, ajp14-channelName );
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ ajp14.init(): No channel %s\n, ajp14-mbean-localName);
+return JK_ERR;
}
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_lb.c
costin 02/05/03 10:49:05
Modified:jk/native2/common jk_worker_lb.c
Log:
Try to fix the 'default worker' case.
An lbfactor of 0 means the worker is used exclusively ( as long as it's alive).
Revision ChangesPath
1.5 +65 -27jakarta-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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_worker_lb.c25 Apr 2002 19:21:58 - 1.4
+++ jk_worker_lb.c3 May 2002 17:49:04 - 1.5
@@ -60,7 +60,7 @@
* several workers. *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Based on: *
- * Version: $Revision: 1.4 $ *
+ * Version: $Revision: 1.5 $ *
***/
#include jk_pool.h
@@ -114,17 +114,18 @@
double lb_min = 0.0;
int i;
char *session_route;
+time_t now = 0;
session_route = jk2_requtil_getSessionRoute(env, s);
if(session_route) {
for(i = 0 ; i lb-num_of_workers ; i++) {
-if(0 == strcmp(session_route, lb-lb_workers[i]-mbean-name)) {
+if(0 == strcmp(session_route, lb-lb_workers[i]-route)) {
if(attempt 0 lb-lb_workers[i]-in_error_state) {
break;
} else {
return lb-lb_workers[i];
-}
+ }
}
}
}
@@ -133,7 +134,8 @@
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==0 )
+now = time(NULL);
if((now - lb-lb_workers[i]-error_time) WAIT_BEFORE_RECOVER) {
@@ -146,14 +148,25 @@
}
}
} else {
-if(lb-lb_workers[i]-lb_value lb_min || !rc) {
+if(lb-lb_workers[i]-lb_value == 0 ) {
+/* That's the 'default' worker, it'll take all requests.
+ * All other workers are not used unless this is in error state.
+ *
+ * The 'break' will disable checking for recovery on other
+ * workers - but that doesn't matter as long as the default is
alive.
+ */
+rc=lb-lb_workers[i];
+break;
+}
+if(lb-lb_workers[i]-lb_value lb_min ||
+ ( rc==NULL ) ) {
lb_min = lb-lb_workers[i]-lb_value;
rc = lb-lb_workers[i];
}
}
}
-if ( !rc ) {
+if ( rc==NULL ) {
/* 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 lb-num_of_workers ; i++) {
@@ -164,7 +177,7 @@
not continue to be retried over and over again.
*/
if ( lb-lb_workers[i]-retry_count == 0 ) {
-if ( rc ) {
+if ( rc != NULL ) {
/* pick the oldest failed worker */
if ( lb-lb_workers[i]-error_time rc-error_time ) {
rc = lb-lb_workers[i];
@@ -185,7 +198,8 @@
}
if ( rc rc-in_error_state ) {
-time_t now = time(0);
+if(now==0)
+now = time(0);
rc-in_recovering = JK_TRUE;
rc-error_time = now;
rc-retry_count++;
@@ -193,7 +207,12 @@
}
if(rc) {
-rc-lb_value += rc-lb_factor;
+if( rc-lb_value != 0 ) {
+/* It it's the default, it'll remain the default - we don't
+ increase the factor
+*/
+rc-lb_value += rc-lb_factor;
+}
}
return rc;
@@ -232,7 +251,22 @@
/* */
char *instanceId=slot-name+7;
char *data=slot-data;
+jk_msg_t *msg;
+int chCnt;
+
+msg=jk2_msg_ajp_create2( env, env-tmpPool, slot-data, slot-size);
+chCnt=msg-getInt(env, msg );
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_jni.c
costin 02/05/03 10:49:12 Modified:jk/native2/common jk_worker_jni.c Log: Updates Revision ChangesPath 1.12 +2 -0 jakarta-tomcat-connectors/jk/native2/common/jk_worker_jni.c Index: jk_worker_jni.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_jni.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- jk_worker_jni.c 25 Apr 2002 19:22:19 - 1.11 +++ jk_worker_jni.c 3 May 2002 17:49:12 - 1.12 @@ -257,6 +257,8 @@ jargs); vm-detach(env, vm); + +/* XXX create a jni channel */ 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/server/apache2 jk_logger_apache2.c mod_jk2.c
costin 02/05/03 10:49:53
Modified:jk/native2/server/apache2 jk_logger_apache2.c mod_jk2.c
Log:
More updates, return the correct result from setProperty ( or
an message will be displayed )
Revision ChangesPath
1.21 +2 -0
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_logger_apache2.c
Index: jk_logger_apache2.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_logger_apache2.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_logger_apache2.c 25 Apr 2002 19:25:11 - 1.20
+++ jk_logger_apache2.c 3 May 2002 17:49:53 - 1.21
@@ -191,7 +191,9 @@
_this-jkLog( env, _this, JK_LOG_ERROR,
Level %s %d \n, value, _this-level );
}
+return JK_OK;
}
+return JK_ERR;
}
1.15 +2 -2 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mod_jk2.c 30 Apr 2002 06:53:34 - 1.14
+++ mod_jk2.c 3 May 2002 17:49:53 - 1.15
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.14 $ *
+ * Version: $Revision: 1.15 $ *
***/
/*
@@ -553,7 +553,7 @@
be shared with other server adapters */
rPool= worker-rPoolCache-get( env, worker-rPoolCache );
if( rPool == NULL ) {
-rPool=worker-pool-create( env, worker-pool, HUGE_POOL_SIZE );
+rPool=worker-mbean-pool-create( env, worker-mbean-pool,
HUGE_POOL_SIZE );
env-l-jkLog(env, env-l, JK_LOG_INFO,
mod_jk.handler(): new rpool\n);
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp/apache-2.0 Makefile.in
pier02/05/03 11:05:25 Modified:webapp Makedefs.in Makefile.in webapp/apache-1.3 Makefile.in webapp/apache-2.0 Makefile.in Log: Changes required to start integration with ANT (let's keep things all together, right?) Revision ChangesPath 1.17 +4 -3 jakarta-tomcat-connectors/webapp/Makedefs.in Index: Makedefs.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makedefs.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Makedefs.in 3 May 2002 16:16:23 - 1.16 +++ Makedefs.in 3 May 2002 18:05:24 - 1.17 @@ -56,7 +56,7 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makedefs.in,v 1.16 2002/05/03 16:16:23 pier Exp $ +# @version $Id: Makedefs.in,v 1.17 2002/05/03 18:05:24 pier Exp $ .SUFFIXES: .c .o .lo @@ -87,9 +87,10 @@ APR_DIR = @APR_DIR@ SRC_DIR = @SRC_DIR@ TGT_DIR = @TGT_DIR@ -OBJ_DIR = @TGT_DIR@/objects -DST_DIR = @TGT_DIR@/distrib +OBJ_DIR = @TGT_DIR@/build +DST_DIR = @TGT_DIR@/distribution TARBALL = webapp-module-$(WEBAPP_VERSION) +MODFILE = mod_webapp.so # Versions APACHE_VERSION = @APACHE_VERSION@ 1.31 +8 -11 jakarta-tomcat-connectors/webapp/Makefile.in Index: Makefile.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- Makefile.in 3 May 2002 16:16:23 - 1.30 +++ Makefile.in 3 May 2002 18:05:24 - 1.31 @@ -56,11 +56,11 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.30 2002/05/03 16:16:23 pier Exp $ +# @version $Id: Makefile.in,v 1.31 2002/05/03 18:05:24 pier Exp $ include @TGT_DIR@/Makedefs -all: dist +all: build distclean: extra-clean rm -f $(MODULE)/Makefile @@ -70,21 +70,18 @@ rm -f DETAILS.txt rm -fr $(DST_DIR) -extra-build: $(OBJ_DIR) @EXTRA_BUILD@ build +build: $(OBJ_DIR) @EXTRA_BUILD@ lib-build $(MODULE)-build extra-clean: @EXTRA_CLEAN@ clean -build: $(OBJ_DIR) lib-build $(MODULE)-build - clean: lib-clean $(MODULE)-clean rm -rf $(OBJ_DIR) -dist: $(DST_DIR) extra-build - cp $(SRC_DIR)/LICENSE.txt $(DST_DIR) - cp $(SRC_DIR)/README.txt $(DST_DIR) - cp $(SRC_DIR)/INSTALL.txt $(DST_DIR) - cp $(TGT_DIR)/DETAILS.txt $(DST_DIR) - @$(MAKE) SUBF=$(MAKEFLAGS) SUBD=$(TGT_DIR)/$(MODULE) SUBT=dist subdir +dist: $(DST_DIR) build + $(INSTALL) $(SRC_DIR)/LICENSE.txt $(DST_DIR) + $(INSTALL) $(SRC_DIR)/INSTALL.txt $(DST_DIR) + $(INSTALL) $(TGT_DIR)/DETAILS.txt $(DST_DIR) + $(INSTALL) $(TGT_DIR)/$(MODULE)/$(MODFILE) $(DST_DIR) tarball: dist cd $(TGT_DIR) 1.27 +6 -13 jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in Index: Makefile.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- Makefile.in 3 May 2002 16:13:40 - 1.26 +++ Makefile.in 3 May 2002 18:05:25 - 1.27 @@ -56,7 +56,7 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.26 2002/05/03 16:13:40 pier Exp $ +# @version $Id: Makefile.in,v 1.27 2002/05/03 18:05:25 pier Exp $ LOCAL_TGT_DIR = @TGT_DIR@/apache-1.3 LOCAL_SRC_DIR = @SRC_DIR@/apache-1.3 @@ -64,29 +64,23 @@ SOURCE = mod_webapp.c OBJECT = mod_webapp.o -TARGET = libwebapp.so -.PHONY: build clean dist +.PHONY: build clean -build: $(TARGET) +build: $(MODFILE) clean: - rm -f $(TARGET) + rm -f $(MODFILE) rm -f $(OBJECT) @if test -h $(SOURCE) ; then \ echo rm -f $(SOURCE) ; \ rm -f $(SOURCE) ; \ fi -dist: - $(INSTALL) \ - $(LOCAL_TGT_DIR)/libwebapp.so \ - $(DST_DIR)/mod_webapp.so - $(SOURCE): $(LOCAL_SRC_DIR)/$(SOURCE) ln -s $ $@ -$(TARGET): $(SOURCE) +$(MODFILE): $(SOURCE) $(APXS) -c -o $@ \ $(INCLUDES) $(LOCAL_INCLUDES) \ -Wc,$(CPPFLAGS) $(CFLAGS) \ @@ -97,7 +91,6 @@ # +++ EXPERIMENTAL +++ LIBTOOL COMPILE, APXS LINK +++ # SOURCE = mod_webapp.c # OBJECT = mod_webapp.lo -# TARGET = libwebapp.so # # $(OBJECT): $(LOCAL_SRC_DIR)/$(SOURCE) #
Re: Admin webapp save-to-XML
Remy Maucherat wrote: The save-to-XML feature of the admin webapp appears to be working good (of course, I only tried the default configuration ;-) ). I don't know what is the policy that will be used for ovewiting the existing server.xml, but I would do: - rename existing server.xml to server.xml.timestamp.old - write the new one to server.xml +1 :-) Amy Is this what was planned ? 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]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_apr_socket.c jk_worker_lb.c jk_worker_status.c
costin 02/05/03 11:10:58
Modified:jk/native2/common jk_channel_apr_socket.c jk_worker_lb.c
jk_worker_status.c
Log:
Few fixes. Check errno after using unix socket
Revision ChangesPath
1.12 +9 -2
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_channel_apr_socket.c 3 May 2002 17:39:40 - 1.11
+++ jk_channel_apr_socket.c 3 May 2002 18:10:58 - 1.12
@@ -444,8 +444,15 @@
while(sent len) {
this_time = send(unixsock, (char *)b + sent , len - sent, 0);
-env-l-jkLog(env, env-l, JK_LOG_ERROR,
- channel.apr:send() send() %d %d\n, this_time, errno);
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ channel.apr:send() send() %d %d %s\n, this_time, errno,
+ strerror( errno));
+if( errno != 0 ) {
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ channel.apr:send() send() %d %d %s\n, this_time, errno,
+ strerror( errno));
+return -2;
+}
if(0 == this_time) {
return -2;
}
1.6 +2 -1 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_worker_lb.c3 May 2002 17:49:04 - 1.5
+++ jk_worker_lb.c3 May 2002 18:10:58 - 1.6
@@ -60,7 +60,7 @@
* several workers. *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Based on: *
- * Version: $Revision: 1.5 $ *
+ * Version: $Revision: 1.6 $ *
***/
#include jk_pool.h
@@ -361,6 +361,7 @@
rec-in_recovering = JK_FALSE;
rec-retry_count= 0;
rec-error_time = 0;
+rc-errCnt++;
/* the endpoint that succeeded is saved for done() */
s-realWorker = rec;
return JK_OK;
1.17 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c
Index: jk_worker_status.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jk_worker_status.c3 May 2002 17:37:35 - 1.16
+++ jk_worker_status.c3 May 2002 18:10:58 - 1.17
@@ -138,7 +138,7 @@
s-jkprintf(env, s, /trtrtd%s/td\n, mbean-localName);
for( j=0; mbean-getAttributeInfo[j] != NULL; j++ ) {
char *pname=mbean-getAttributeInfo[j];
-
+
s-jkprintf(env, s, td%s/td,
mbean-getAttribute( env, mbean, pname));
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Building the Java part of WebApp...
Ok, I'm about to tackle *my disgrace* build.xml. When building Tomcat, what properties does it supply me, and what targets does it execute? And (last but not least) where the heck does it want the warp.jar? (I assume this: it passes catalina.home and expects warp.jar in build/warp.jar, calling the compile target, right? I want to get rid of all the crap and come out with a clean *SMALL* build.xml, and I'd relly wouldn't want to break the whole kit... Pier -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_uriMap.c jk_worker_lb.c
costin 02/05/03 11:23:26 Modified:jk/native2/common jk_uriMap.c jk_worker_lb.c Log: Ops :-) Disabled debugging on uriMap ( can be enabled by setting debug property ) Revision ChangesPath 1.30 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c Index: jk_uriMap.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- jk_uriMap.c 3 May 2002 17:45:06 - 1.29 +++ jk_uriMap.c 3 May 2002 18:23:26 - 1.30 @@ -717,7 +717,7 @@ uriMap-addUriEnv=jk2_uriMap_addUriEnv; uriMap-checkUri=jk2_uriMap_checkUri; uriMap-mapUri=jk2_uriMap_mapUri; -uriMap-debug= 1; +uriMap-debug= 0; result-object=uriMap; result-setAttribute=jk2_uriMap_setProperty; 1.7 +2 -3 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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jk_worker_lb.c3 May 2002 18:10:58 - 1.6 +++ jk_worker_lb.c3 May 2002 18:23:26 - 1.7 @@ -59,8 +59,7 @@ * Description: Load balancer worker, knows how to load balance among * * several workers. * * Author: Gal Shachor [EMAIL PROTECTED] * - * Based on: * - * Version: $Revision: 1.6 $ * + * Author: Costin Manolache ***/ #include jk_pool.h @@ -361,7 +360,7 @@ rec-in_recovering = JK_FALSE; rec-retry_count= 0; rec-error_time = 0; -rc-errCnt++; +rec-errCnt++; /* the endpoint that succeeded is saved for done() */ s-realWorker = rec; return JK_OK; -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Admin webapp save-to-XML
On Fri, 3 May 2002 [EMAIL PROTECTED] wrote: Date: Fri, 3 May 2002 09:51:51 -0700 (PDT) From: [EMAIL PROTECTED] Reply-To: Tomcat Developers List [EMAIL PROTECTED] To: Tomcat Developers List [EMAIL PROTECTED] Subject: Re: Admin webapp save-to-XML Ok, I don't want to start a flame war or anything - but I really don't like the current solution. For short term - we can live with it, and I can accept that as long as we are commited to replace it with something better. I spent a lot of time on this issue - there are many solutions around - Mozilla, gnome, KDE, linuxconf, win32 registry, etc. There one essential requirement: the manager should preserve all elements and config that he doesn't understand. The current implementation is, AFAIK, saving 100% of what can be recognized at startup time in server.xml, with one remaining bug (resource definitions nested inside DefaultContext). This is true whether or not the administration webapp can actually manage those resources, and includes all custom Valves/Loggers/etc. that you might have edited in to server.xml by hand. What do you see that is still missing? (NOTE: I agree with you that the admin app's capabilities are limited to only the standard Tomcat-supplied components, but that's orthagonal to whether or not the entire current configuration can be faithfully saved or not.) The best solution IMHO is to have a layer between the config file and the configuration. Right now we have XmlMapper ( or however it's called now ) pushing the config info directly into the components, and the components generating config fragments. That will loose information and makes the xml too hardcoded in. In the head branch it uses commons-digester now, but functionally this is very similar to XmlMapper -- it's a rules-based wrapper around a SAX parser. In jk we have a jk_config object that reads the properties and sits between config changer and the components. Any change in config ( by wire protocol, shm, etc ) can be registered by jk_config and he can persist it. And it's trivial to later change the format and interface to the config file ( to use LDAP or registry or xml ). A similar thing can be done in java - it is obviously harder with XML, but it can be done. The simplest implementation would be to read the XML as DOM, use the DOM-SAX transformer to get things configured ( while preserving the DOM ), and have the MBeans make calls to the Config object to make the aproriate config changes. I'm not sure that having the config data represented as a DOM tree (or a tree of JavaBeans, or any such structure) really helps decoupling all that much. On the way in (i.e. as Tomcat starts up), there still needs to be some logic that understands what components must be instantiated, and This would eventually allow replacing the XML with an LDAP ( which would be nice for clustering and farming ), it would preserve comments and all unmanaged elements, and I believe it would be cleaner and easier. Just MHO. Costin Craig -- 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/realm RealmForm.java JDBCRealmForm.java JNDIRealmForm.java MemoryRealmForm.java UserDatabaseRealmForm.java
manveen 02/05/03 11:34:14
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
JDBCRealmForm.java JNDIRealmForm.java
MemoryRealmForm.java UserDatabaseRealmForm.java
Added: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
RealmForm.java
Log:
Created a generic realm base form.
Refactored Realms to reuse code between them.
Revision ChangesPath
1.5 +14 -227
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java
Index: JDBCRealmForm.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JDBCRealmForm.java3 May 2002 07:19:23 - 1.4
+++ JDBCRealmForm.java3 May 2002 18:34:14 - 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java,v
1.4 2002/05/03 07:19:23 manveen Exp $
- * $Revision: 1.4 $
- * $Date: 2002/05/03 07:19:23 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java,v
1.5 2002/05/03 18:34:14 manveen Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/05/03 18:34:14 $
*
*
*
@@ -76,45 +76,19 @@
* Form bean for the jdbc realm page.
*
* @author Manveen Kaur
- * @version $Revision: 1.4 $ $Date: 2002/05/03 07:19:23 $
+ * @version $Revision: 1.5 $ $Date: 2002/05/03 18:34:14 $
*/
-public final class JDBCRealmForm extends ActionForm {
+public final class JDBCRealmForm extends RealmForm {
// - Instance Variables
- /**
- * The administrative action represented by this form.
- */
-private String adminAction = Edit;
-
-/**
- * The object name of the Realm this bean refers to.
- */
-private String objectName = null;
-
-/**
- * The text for the debug level.
- */
-private String debugLvl = 0;
-
/**
* The text for the realm name, used to retrieve
* the corresponding realm mBean.
*/
private String realmName = null;
-
-/**
- * The text for the realm type.
- * Specifies if it is a JNDI, JDBC or MemoryRealm.
- */
-private String realmType = null;
-
-/**
- * Set of valid values for debug level.
- */
-private List debugLvlVals = null;
-
+
/**
* The text for the digest.
*/
@@ -134,12 +108,7 @@
* The text for the driver.
*/
private String driver = null;
-
-/**
- * The text for the node label.
- */
-private String nodeLabel = null;
-
+
/**
* The text for the role table.
*/
@@ -165,113 +134,8 @@
*/
private String connectionURL = null;
-/**
- * The object name of the parent of this Realm.
- */
-private String parentObjectName = null;
-
-/**
- * Set of valid values for realms.
- */
-private List realmTypeVals = null;
-
-/**
- * The text for whether delete this realm operation is allowed
- * on the realm or not.
- */
-private String allowDeletion = null;
-
// - Properties
-
- /**
- * Return the administrative action represented by this form.
- */
-public String getAdminAction() {
-
-return this.adminAction;
-
-}
-
-/**
- * Set the administrative action represented by this form.
- */
-public void setAdminAction(String adminAction) {
-
-this.adminAction = adminAction;
-
-}
-
-/**
- * Return the Object Name.
- */
-public String getObjectName() {
-
-return this.objectName;
-
-}
-
-/**
- * Set the Object Name.
- */
-public void setObjectName(String objectName) {
-
-this.objectName = objectName;
-
-}
-
-/**
- * Return the Realm type.
- */
-public String getRealmType() {
-
-return this.realmType;
-
-}
-
-/**
- * Set the Realm type.
- */
-public void setRealmType(String realmType) {
-
-this.realmType = realmType;
-
-}
-
-/**
- * Return the debugVals.
- */
-public List getDebugLvlVals()
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.c
costin 02/05/03 11:44:03
Modified:jk/native2/common jk_channel_apr_socket.c jk_requtil.c
jk/native2/include jk_service.h
jk/native2/server/apache13 mod_jk2.c
jk/native2/server/apache2 mod_jk2.c
Log:
Even less debugging.
Replace 'send' with 'write' - JFC, do you remember why we used send ??
Revision ChangesPath
1.13 +8 -7
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_channel_apr_socket.c 3 May 2002 18:10:58 - 1.12
+++ jk_channel_apr_socket.c 3 May 2002 18:44:03 - 1.13
@@ -442,17 +442,18 @@
}
#ifdef HAVE_UNIXSOCKETS
while(sent len) {
-this_time = send(unixsock, (char *)b + sent , len - sent, 0);
+/* this_time = send(unixsock, (char *)b + sent , len - sent, 0); */
+this_time = write(unixsock, (char *)b + sent , len - sent);
env-l-jkLog(env, env-l, JK_LOG_INFO,
channel.apr:send() send() %d %d %s\n, this_time, errno,
strerror( errno));
-if( errno != 0 ) {
-env-l-jkLog(env, env-l, JK_LOG_ERROR,
- channel.apr:send() send() %d %d %s\n, this_time, errno,
- strerror( errno));
-return -2;
-}
+/* if( errno != 0 ) { */
+/* env-l-jkLog(env, env-l, JK_LOG_ERROR, */
+/* channel.apr:send() send() %d %d %s\n, this_time,
errno, */
+/* strerror( errno)); */
+/* return -2; */
+/* } */
if(0 == this_time) {
return -2;
}
1.13 +13 -7 jakarta-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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_requtil.c 25 Apr 2002 19:22:19 - 1.12
+++ jk_requtil.c 3 May 2002 18:44:03 - 1.13
@@ -529,7 +529,12 @@
int i;
int headerCount;
int rc;
+int debug=0;
+if( s-uriEnv != NULL ) {
+debug=s-uriEnv-debug;
+}
+
rc=jk2_requtil_getMethodId(env, s-method, method);
if (rc!=JK_OK) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
@@ -570,8 +575,9 @@
return JK_ERR;
}
} else {
-env-l-jkLog(env, env-l, JK_LOG_INFO,
- serialize.request() Add headerName %s\n, name);
+if( debug 0 )
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ serialize.request() Add headerName %s\n, name);
if (msg-appendString(env, msg, name)) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
serialize.request() Error serializing header
name\n);
@@ -579,9 +585,6 @@
}
}
-/* env-l-jkLog(env, env-l, JK_LOG_INFO, */
-/*serialize.request() Add headerValue %s\n, */
-/* s-headers_in-valueAt( env, s-headers_in, i)); */
if (msg-appendString(env, msg,
s-headers_in-valueAt( env, s-headers_in, i))) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
@@ -695,9 +698,11 @@
handle.request() Error serializing end marker\n);
return JK_ERR;
}
+
-env-l-jkLog(env, env-l, JK_LOG_INFO,
- serialize.request() serialized %s\n, s-req_uri);
+if( debug 0 )
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ serialize.request() serialized %s\n, s-req_uri);
/* msg-dump( env, msg, Dump: ); */
return JK_OK;
@@ -1017,6 +1022,7 @@
s-ssl_cipher = NULL;
s-ssl_session = NULL;
s-jvm_route= NULL;
+s-uriEnv = NULL;
s-outBuf=NULL;
s-jkprintf=jk2_requtil_printf;
1.13 +5 -1 jakarta-tomcat-connectors/jk/native2/include/jk_service.h
Index: jk_service.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_service.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_service.h 24 Apr 2002 23:12:50 - 1.12
+++ jk_service.h 3 May 2002 18:44:03 -
[PATCH] mbean patch
Removes redundant code Minor JLS formatting. -jon mbean.patch Description: Binary data -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Building the Java part of WebApp...
Pier Fumagalli [EMAIL PROTECTED] wrote: Ok, I'm about to tackle *my disgrace* build.xml. When building Tomcat, what properties does it supply me, and what targets does it execute? And (last but not least) where the heck does it want the warp.jar? (I assume this: it passes catalina.home and expects warp.jar in build/warp.jar, calling the compile target, right? I want to get rid of all the crap and come out with a clean *SMALL* build.xml, and I'd relly wouldn't want to break the whole kit... Okkk... AFAICS, in tomcat 4.1 WARP is _NOT_ there (there's no whatsoever concept of warp.jar in any whatsoever xml file, while in 4.0 it's still there in the repo in /catalina/src/share/org/connectors/warp. Kewl, that means that I can basically do whatever I want with it (I _like_ this!) 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]
