Problems Building tc3.3 from CVS
Hola a todos: I'm failing to build tc3.3 from cvs, with the latest commits about ant jsp compiler task., which ant version is needed to compile them? Saludos , Ignacio J. Ortega -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: tomcat-dev compile failure
I'm using ant 1.4.1 , just deleted tomcat-ant dependency from target
tomcat-jars, as a woraround, but if tomcat-ant depends on beta software
i should be commented by default
tomcat-ant:
[javac] Compiling 2 source files to
E:\tomcat\jakarta-tomcat\build\tomcat\cl
asses
[javac]
E:\tomcat\jakarta-tomcat\src\share\org\apache\tomcat\ant\Tomcat3Prec
ompiler.java:61: cannot resolve symbol
[javac] symbol : class JspC
[javac] location: package jsp
[javac] import org.apache.tools.ant.taskdefs.optional.jsp.JspC;
[javac] ^
[javac]
E:\tomcat\jakarta-tomcat\src\share\org\apache\tomcat\ant\Tomcat3Prec
ompiler.java:62: cannot resolve symbol
[javac] symbol : class JspMangler
[javac] location: package jsp
[javac] import
org.apache.tools.ant.taskdefs.optional.jsp.JspMangler;
[javac] ^
[javac]
E:\tomcat\jakarta-tomcat\src\share\org\apache\tomcat\ant\Tomcat3Prec
ompiler.java:63: cannot resolve symbol
[javac] symbol : class JspNameMangler
[javac] location: package jsp
[javac] import
org.apache.tools.ant.taskdefs.optional.jsp.JspNameMangler;
[javac] ^
[javac]
E:\tomcat\jakarta-tomcat\src\share\org\apache\tomcat\ant\Tomcat3Prec
ompiler.java:64: cannot resolve symbol
[javac] symbol : class DefaultJspCompilerAdapter
[javac] location: package compilers
[javac] import
org.apache.tools.ant.taskdefs.optional.jsp.compilers.DefaultJ
spCompilerAdapter;
[javac]
^
[javac]
E:\tomcat\jakarta-tomcat\src\share\org\apache\tomcat\ant\Tomcat3Prec
ompiler.java:82: cannot resolve symbol
[javac] symbol : class DefaultJspCompilerAdapter
[javac] location: class org.apache.tomcat.ant.Tomcat3Precompiler
[javac] public class Tomcat3Precompiler extends
DefaultJspCompilerAdapter {
[javac] ^
[javac]
E:\tomcat\jakarta-tomcat\src\share\org\apache\tomcat\ant\Tomcat3Prec
ompiler.java:181: cannot resolve symbol
[javac] symbol : class JspMangler
[javac] location: class org.apache.tomcat.ant.Tomcat3Precompiler
[javac] public JspMangler createMangler() {
[javac]^
[javac]
E:\tomcat\jakarta-tomcat\src\share\org\apache\tomcat\ant\Tomcat3Prec
ompiler.java:188: cannot resolve symbol
[javac] symbol : class JspMangler
[javac] location: class
org.apache.tomcat.ant.Tomcat3Precompiler.TomcatJSPMa
ngler
[javac] private class TomcatJSPMangler implements JspMangler {
[javac] ^
[javac]
E:\tomcat\jakarta-tomcat\src\share\org\apache\tomcat\ant\Tomcat3Prec
ompiler.java:206: cannot resolve symbol
[javac] symbol : class JspMangler
[javac] location: class
org.apache.tomcat.ant.Tomcat3Precompiler.TomcatJSPMa
ngler
[javac] private JspMangler mangler;
[javac] ^
[javac]
E:\tomcat\jakarta-tomcat\src\share\org\apache\tomcat\ant\Tomcat3Prec
ompiler.java:88: cannot resolve symbol
[javac] symbol : method getJspc ()
[javac] location: class org.apache.tomcat.ant.Tomcat3Precompiler
[javac] getJspc().log(Using Tomcat 3 precompiler,
Project.MSG_VERB
OSE);
[javac] ^
[javac]
E:\tomcat\jakarta-tomcat\src\share\org\apache\tomcat\ant\Tomcat3Prec
ompiler.java:90: cannot resolve symbol
[javac] symbol : method getJspc ()
[javac] location: class org.apache.tomcat.ant.Tomcat3Precompiler
[javac] Vector sources = getJspc().getCompileList();
[javac] ^
[javac]
E:\tomcat\jakarta-tomcat\src\share\org\apache\tomcat\ant\Tomcat3Prec
ompiler.java:96: cannot resolve symbol
[javac] symbol : method addArg
(org.apache.tools.ant.types.Commandline,jav
a.lang.String,java.lang.String)
[javac] location: class org.apache.tomcat.ant.Tomcat3Precompiler
[javac] addArg(cmd, -c, base + _1);
[javac] ^
[javac]
E:\tomcat\jakarta-tomcat\src\share\org\apache\tomcat\ant\Tomcat3Prec
ompiler.java:109: cannot resolve symbol
[javac] symbol : method getJspc ()
[javac] location: class org.apache.tomcat.ant.Tomcat3Precompiler
[javac] Java java = (Java)
(getJspc().getProject()).createTask(
java);
[javac] ^
[javac]
E:\tomcat\jakarta-tomcat\src\share\org\apache\tomcat\ant\Tomcat3Prec
ompiler.java:110: cannot resolve symbol
[javac] symbol : method getJspc ()
[javac] location: class org.apache.tomcat.ant.Tomcat3Precompiler
[javac] if (getJspc().getClasspath() != null) {
[javac] ^
[javac]
E:\tomcat\jakarta-tomcat\src\share\org\apache\tomcat\ant\Tomcat3Prec
ompiler.java:111: cannot resolve symbol
[javac] symbol : method getJspc ()
[javac] location: class org.apache.tomcat.ant.Tomcat3Precompiler
[javac]
cvs commit: jakarta-tomcat build.xml
keith 02/05/18 10:17:13
Modified:.build.xml
Log:
Tomcat-ant task depends on JspC task in Ant, which
isn't in latest release build, 1.4.1. To build this
task use the 1.5 beta or head.
Revision ChangesPath
1.179 +4 -2 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- build.xml 16 May 2002 03:15:13 - 1.178
+++ build.xml 18 May 2002 17:17:13 - 1.179
@@ -90,6 +90,8 @@
target name=detect
available property=jsse.present.runtime
classname=javax.net.ssl.SSLServerSocket/
+available property=ant15-present
+ classname=org.apache.tools.ant.taskdefs.optional.jsp.JspC /
available property=jsse.present
file=${jsse.jar}/
available property=puretls.present
@@ -603,14 +605,14 @@
!-- Ant utilities == --
- target name=tomcat-ant
+ target name=tomcat-ant depends=detect if=ant15-present
javac srcdir=src/share
destdir=${tomcat.build}/classes
include name=org/apache/tomcat/ant/*.java /
classpath
pathelement path=${ant.lib}/ant.jar /
- pathelement path=${ant.lib}/ant-optional.jar /
pathelement path=${ant.lib}/optional.jar /
+ pathelement path=${ant.lib}/ant-optional.jar /
/classpath
/javac
mkdir dir=${tomcat.build}/ant /
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: tomcat-dev compile failure
Ah, I thought the JspC task had been around longer. I agree. The build should now ignore that task unless an appropriate version of Ant is installed. Keith | -Original Message- | From: Ignacio J. Ortega [mailto:[EMAIL PROTECTED]] | Sent: Saturday, May 18, 2002 12:03 PM | To: 'Keith Wannamaker'; 'tomcat-dev' | Subject: RE: tomcat-dev compile failure | | | I'm using ant 1.4.1 , just deleted tomcat-ant dependency from target | tomcat-jars, as a woraround, but if tomcat-ant depends on beta software | i should be commented by default | -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Switching javac for jasper 2
On Fri, 17 May 2002, Remy Maucherat wrote: Date: Fri, 17 May 2002 10:59:00 -0700 From: Remy Maucherat [EMAIL PROTECTED] Reply-To: Tomcat Developers List [EMAIL PROTECTED] To: Tomcat Developers List [EMAIL PROTECTED] Subject: Re: Switching javac for jasper 2 On Fri, 17 May 2002, Kin-Man Chung wrote: I think the best solution for javac is to just bundle ant.jar and use it programmatically ( i.e. new Javac(), etc ). The introspection and hacks required to support multiple compilers are just too ugly - and they already have good solutions in ant. I'll look into that. But even if ant.jar is used programmatically, eventually it still start another process to invoke javac, right? Plus it's yet another jar to be bundled with tomcat; do we really want that? Ant doesn't start another process to invoke javac unless you explicitely ask for it ( by fork=true ) or use jikes or another native compiler. Between including 'another jar' that supports most javac compilers and changing the code to support only JDK1.3.1 and JDK1.4 compilers - I think the choice is pretty simple. I like Costin's solution. Using an abstraction layer for the compiler looks to me like a really good idea, as it would allow maximum platform support while removing a good chunk of the complexity in Jasper. It's an elegant design idea ... I just hope that having to synchronize the compiles doesn't cause too many complaints (especially in a development environment where you are doing this a lot). Remy Craig -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
[PATCH] Documentation for JNDI Realm
I submitted some major changes to the JNDI Realm earlier this year, which Craig committed in March. I also sent updates for the realm how-to and realm configuration docs to this list shortly afterwards, but those have not yet been committed. The current how-to doc in particular does not cover any of the new features. So, I'm sending the revised realm-howto.xml and config/realm.xml documents again. Because the revisions are extensive I've sent the actual documents rather than diffs - but if anyone is prepared to commit them and would prefer diffs I can certainly send those instead. I'll also report this as a bug in the hope it will act as a reminder. Thanks, John. realm-howto.xml Description: application/xml config-realm.xml Description: application/xml -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 9224] New: - JNDI realm documentation not up to date
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=9224. 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=9224 JNDI realm documentation not up to date Summary: JNDI realm documentation not up to date Product: Tomcat 4 Version: Nightly Build Platform: All OS/Version: All Status: NEW Severity: Normal Priority: Other Component: Webapps:Documentation AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] I submitted major changes to the JNDI Realm earlier in the year which Craig committed in March. However the documentation, especially the realm how-to document, still does not cover the new features. I sent revised versions of the config/realm.xml and realm-howto.xml documents to the tomcat-dev list back in March, and resent them today. Could someone please have a look and hopefully commit them? Thanks. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6185] - JNDIRealm working with IPlanet 5.1
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=6185. 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=6185 JNDIRealm working with IPlanet 5.1 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6185] - JNDIRealm working with IPlanet 5.1
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=6185. 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=6185 JNDIRealm working with IPlanet 5.1 --- Additional Comments From [EMAIL PROTECTED] 2002-05-18 17:51 --- Current version of JNDI Realm supports authentication by binding to the directory with the username and password supplied by the user. This should enable it to be used with IPlanet 5.1. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6431] - JNDIRealm.getRoles() should return more than a single role attribute
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=6431. 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=6431 JNDIRealm.getRoles() should return more than a single role attribute [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2002-05-18 18:03 --- The current JNDI Realm has a new configuration attribute userRoleName which names an attribute in the user's entry that containing the names of roles assigned to that user. This is equivalent to the proposed change. (This configuration attribute can be used in conjunction with roleName for greater flexibility by the way). -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [PATCH] Documentation for JNDI Realm
John, I need to apologize. I've had a responsibility change that I see hasn't been announced yet (see subsequent email). Remy, the revised version of JNDIRealm that John proposed has been included in 4.1, but the corresponding docco updates haven't -- could you please take care of these? Craig On Sat, 18 May 2002, John Holman wrote: Date: Sat, 18 May 2002 18:33:54 +0100 From: John Holman [EMAIL PROTECTED] Reply-To: Tomcat Developers List [EMAIL PROTECTED] To: [EMAIL PROTECTED] Subject: [PATCH] Documentation for JNDI Realm I submitted some major changes to the JNDI Realm earlier this year, which Craig committed in March. I also sent updates for the realm how-to and realm configuration docs to this list shortly afterwards, but those have not yet been committed. The current how-to doc in particular does not cover any of the new features. So, I'm sending the revised realm-howto.xml and config/realm.xml documents again. Because the revisions are extensive I've sent the actual documents rather than diffs - but if anyone is prepared to commit them and would prefer diffs I can certainly send those instead. I'll also report this as a bug in the hope it will act as a reminder. Thanks, John. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Role Change
Many of you have probably noticed that my level of CVS commits to Tomcat has been reduced over the last few weeks. Primarily, this is because I have undertaken two new responsibilities at Sun: * Web Layer Architect for the J2EE Platform * Spec Lead for JavaServer Faces (JSR-127) In my architect role, I will be watching over how all of the web-layer technologies (including servlet and JSP) fit together into an integrated whole. As spec lead, I have the usual responsibilities of coordinating the expert group that is creating version 1.0 of JavaServer Faces. As you can imagine, this combination of tasks is not going to leave me a lot of time to work on Tomcat code ... You will continue to see Remy and Kin-Man doing the great jobs they have started in helping to bring Tomcat 4.1 to completion (and Remy's additional willingness to play release manager), along with the valuable efforts of everyone else who is contributing to Tomcat's successful development. I'm confident that the continued development of an incredibly popular servlet and JSP container is in good hands. Craig McClanahan -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Role Change
Congratulations! and.. You can always take a day of to work om Tomcat ;)) Mvgr, Martin van den Bemt On Sat, 2002-05-18 at 20:20, Craig R. McClanahan wrote: Many of you have probably noticed that my level of CVS commits to Tomcat has been reduced over the last few weeks. Primarily, this is because I have undertaken two new responsibilities at Sun: * Web Layer Architect for the J2EE Platform * Spec Lead for JavaServer Faces (JSR-127) In my architect role, I will be watching over how all of the web-layer technologies (including servlet and JSP) fit together into an integrated whole. As spec lead, I have the usual responsibilities of coordinating the expert group that is creating version 1.0 of JavaServer Faces. As you can imagine, this combination of tasks is not going to leave me a lot of time to work on Tomcat code ... You will continue to see Remy and Kin-Man doing the great jobs they have started in helping to bring Tomcat 4.1 to completion (and Remy's additional willingness to play release manager), along with the valuable efforts of everyone else who is contributing to Tomcat's successful development. I'm confident that the continued development of an incredibly popular servlet and JSP container is in good hands. Craig McClanahan -- 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]
[JK2] Reading arbitrary maps
I need to read arbitrary files as maps, to reproduce a capability from i_r.dll in jk1, I just need to get rid of the cfg dependency , to solve it I'm about to refactor the reader code to the map object in jk2, looking at the code, what should i do with sections? i fail to understand the use of cfg-section, it seems a temporary placeholder for names of sections when reading ? right ? if the section name is null i will simply put the value at the top map, rest will be more or less the same, i will translate ( for completeness ) jk2_config_queryRead too.. Any comment? i'm overlooking anything? Saludos , Ignacio J. Ortega -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_map.h
nacho 02/05/18 15:34:01
Modified:jk/native2/common jk_config.c jk_map.c
jk/native2/include jk_map.h
Log:
* Refactored reading of properties files into map object, this way arbitrary
properties files can be read, need for i_r2.dll
Revision ChangesPath
1.19 +2 -141jakarta-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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_config.c 16 May 2002 21:03:44 - 1.18
+++ jk_config.c 18 May 2002 22:34:01 - 1.19
@@ -58,7 +58,7 @@
/***
* Description: General purpose config object *
* Author: Gal Shachor [EMAIL PROTECTED] *
- * Version: $Revision: 1.18 $ *
+ * Version: $Revision: 1.19 $ *
***/
#include jk_global.h
@@ -69,11 +69,6 @@
#define CAPACITY_INC_SIZE (50)
#define LENGTH_OF_LINE(1024)
-int jk2_config_read(struct jk_env *env, struct jk_config *cfg,
-struct jk_map *map);
-static void jk2_trim_prp_comment(char *prp);
-static int jk2_trim(char *s);
-
static int jk2_config_readFile(jk_env_t *env,
jk_config_t *cfg,
int *didReload, int firstTime);
@@ -359,113 +354,6 @@
-/* */
-/* Reading / parsing.
- */
-int jk2_config_parseProperty(jk_env_t *env, jk_config_t *cfg, jk_map_t *m, char
*prp )
-{
-int rc = JK_ERR;
-char *v;
-jk_map_t *prefNode=NULL;
-
-jk2_trim_prp_comment(prp);
-
-if( jk2_trim(prp)==0 )
-return JK_OK;
-
-/* Support windows-style 'sections' - for cleaner config
- */
-if( prp[0] == '[' ) {
-v=strchr(prp, ']' );
-*v='\0';
-jk2_trim( v );
-prp++;
-
-cfg-section=cfg-pool-pstrdup(env, m-pool, prp);
-
-jk2_map_default_create( env, prefNode, m-pool );
-
-m-add( env, m, cfg-section, prefNode);
-
-return JK_OK;
-}
-
-v = strchr(prp, '=');
-if(v==NULL)
-return JK_OK;
-
-*v = '\0';
-v++;
-
-if(strlen(v)==0 || strlen(prp)==0)
-return JK_OK;
-
-prefNode=m-get( env, m, cfg-section);
-
-if( prefNode==NULL )
-return JK_ERR;
-
-/* fprintf(stderr, Adding [%s] %s=%s\n, cfg-section, prp, v ); */
-prefNode-add( env, prefNode, m-pool-pstrdup(env, m-pool, prp),
- m-pool-pstrdup(env, m-pool, v));
-
-return JK_OK;
-}
-
-/** Read a query string into the map
- */
-int jk2_config_queryRead(jk_env_t *env, jk_config_t *cfg, jk_map_t *m, const char
*query)
-{
-char *sep;
-char *value;
-char *qry=cfg-pool-pstrdup( env, cfg-pool, query );
-
-while( qry != NULL ) {
-sep=strchr( qry, '');
-if( sep !=NULL ) {
-*sep='\0';
-sep++;
-}
-
-value = strchr(qry, '=');
-if(value==NULL) {
-value=;
-} else {
-*value = '\0';
-value++;
-}
-m-add( env, m, cfg-pool-pstrdup( env, cfg-pool, qry ),
-cfg-pool-pstrdup( env, cfg-pool, value ));
-qry=sep;
-}
-return JK_OK;
-}
-
-/** Read the config file
- */
-int jk2_config_read(jk_env_t *env, jk_config_t *cfg, jk_map_t *m)
-{
-FILE *fp;
-char buf[LENGTH_OF_LINE + 1];
-char *prp;
-char *f=cfg-file;
-
-if(m==NULL || f==NULL )
-return JK_ERR;
-
-fp= fopen(f, r);
-
-if(fp==NULL)
-return JK_ERR;
-
-cfg-section=NULL;
-while(NULL != (prp = fgets(buf, LENGTH_OF_LINE, fp))) {
-jk2_config_parseProperty( env, cfg, m, prp );
-}
-
-fclose(fp);
-return JK_OK;
-}
@@ -667,7 +555,7 @@
jk2_map_default_create(env, cfgData, env-tmpPool);
-rc=jk2_config_read(env, cfg, cfgData );
+rc=jk2_map_read(env, cfgData , cfg-file );
if( rc==JK_OK ) {
env-l-jkLog(env, env-l, JK_LOG_INFO,
@@ -722,33 +610,6 @@
return JK_OK;
}
-
-static void jk2_trim_prp_comment(char *prp)
-{
-char *comment = strchr(prp, '#');
-if(comment) {
-*comment = '\0';
-}
-}
-
-static int jk2_trim(char
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_requtil.c
nacho 02/05/18 15:35:36 Modified:jk/native2/common jk_requtil.c Log: * Reset msg too Revision ChangesPath 1.18 +2 -1 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.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- jk_requtil.c 14 May 2002 17:17:23 - 1.17 +++ jk_requtil.c 18 May 2002 22:35:36 - 1.18 @@ -1022,7 +1022,8 @@ s-ssl_session = NULL; s-jvm_route= NULL; s-uriEnv = NULL; -s-outBuf=NULL; +s-outBuf = NULL; +s-msg = NULL; s-jkprintf=jk2_requtil_printf; } -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
nacho 02/05/18 15:38:11
Modified:jk/native2/server/isapi jk_isapi_plugin.c
Log:
* Better messages
* Adding some more checks when allocating maps
Revision ChangesPath
1.16 +94 -104
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_isapi_plugin.c 11 May 2002 01:44:13 - 1.15
+++ jk_isapi_plugin.c 18 May 2002 22:38:11 - 1.16
@@ -60,7 +60,7 @@
* Author: Gal Shachor [EMAIL PROTECTED] *
* Author: Larry Isaacs [EMAIL PROTECTED] *
* Author: Ignacio J. Ortega [EMAIL PROTECTED] *
- * Version: $Revision: 1.15 $ *
+ * Version: $Revision: 1.16 $ *
***/
// This define is needed to include wincrypt,h, needed to get client certificates
@@ -82,10 +82,10 @@
#include jk_iis.h
//#include jk_uri_worker_map.h
-#define WORKERS_FILE_TAG (worker_file)
-#define SERVER_ROOT_TAG (server_root)
-#define URI_SELECT_TAG (uri_select)
-#define EXTENSION_URI_TAG (extension_uri)
+#define SERVER_ROOT_TAG (serverRoot)
+#define URI_SELECT_TAG (uriSelect)
+#define EXTENSION_URI_TAG (extensionUri)
+#define WORKERS_FILE_TAG (workersFile)
#define URI_SELECT_PARSED_VERB (parsed)
#define URI_SELECT_UNPARSED_VERB(unparsed)
@@ -116,9 +116,9 @@
static int init_jk(char *serverName);
-static int initialize_extension(void);
+static int initialize_extension();
-static int read_registry_init_data(void);
+static int read_registry_init_data(jk_env_t *env);
static int get_registry_config_parameter(HKEY hkey,
const char *tag,
@@ -556,12 +556,11 @@
{
int rc = JK_FALSE;
-jk_env_t *env=jk2_create_config();
-
-rc=(JK_OK == workerEnv-config-setPropertyString( env, workerEnv-config,
config.file, worker_file ));
-
+jk_env_t *env = workerEnv-globalEnv-getEnv( workerEnv-globalEnv );
/* Logging the initialization type: registry or properties file in virtual dir
*/
+//rc=(JK_OK == workerEnv-config-update( env, workerEnv-config, NULL));
+rc=(JK_OK == workerEnv-config-setPropertyString( env, workerEnv-config,
config.file, worker_file ));
if (using_ini_file) {
env-l-jkLog(env, env-l, JK_LOG_DEBUG, Using ini file %s.\n,
ini_file_name);
} else {
@@ -577,9 +576,13 @@
return rc;
}
-static int initialize_extension(void)
+static int initialize_extension()
{
-if (read_registry_init_data()) {
+jk_env_t *env=jk2_create_config();
+if (read_registry_init_data(env)) {
+workerEnv-initData-add( env, workerEnv-initData, serverRoot,
+ workerEnv-pool-pstrdup( env, workerEnv-pool,
server_root));
+env-l-jkLog(env, env-l, JK_LOG_ERROR, Set serverRoot %s\n,
server_root);
is_inited = JK_TRUE;
}
return is_inited;
@@ -602,106 +605,99 @@
return -1;
}
-static int read_registry_init_data(void)
+static int read_registry_init_data(jk_env_t *env)
{
char tmpbuf[INTERNET_MAX_URL_LENGTH];
HKEY hkey;
long rc;
int ok = JK_TRUE;
-/*
char *tmp;
jk_map_t *map;
-
-if (map_alloc(map)) {
-if (map_read_properties(map, ini_file_name)) {
-using_ini_file = JK_TRUE;
- }
-}
-if (using_ini_file) {
-tmp = map_get_string(map, JK_LOG_FILE_TAG, NULL);
-if (tmp) {
-strcpy(log_file, tmp);
-} else {
-ok = JK_FALSE;
-}
-tmp = map_get_string(map, JK_LOG_LEVEL_TAG, NULL);
-if (tmp) {
-log_level = jk2_logger_file_parseLogLevel(tmp);
-} else {
-ok = JK_FALSE;
-}
-tmp = map_get_string(map, EXTENSION_URI_TAG, NULL);
-if (tmp) {
-strcpy(extension_uri, tmp);
-} else {
-ok = JK_FALSE;
-}
-tmp = map_get_string(map, SERVER_ROOT_TAG, NULL);
-if (tmp) {
-strcpy(server_root, tmp);
-} else {
-ok = JK_FALSE;
-}
-tmp = map_get_string(map, URI_SELECT_TAG, NULL);
-if (tmp) {
-int opt = parse_uri_select(tmp);
-if (opt = 0) {
-uri_select_option = opt;
+
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c
nacho 02/05/18 15:40:48
Modified:jk/native2/server/isapi jk_service_iis.c
Log:
* Now i_r2.dll starts jk when the filter is first loaded, and later when first used
reads the config file and continues..
* Added properies file config in addition to Rehistry one
* Changed names of Regitry and properties init settings to match wk2.p file ones
server_root-serverRoot and so on..
Revision ChangesPath
1.16 +21 -7
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
Index: jk_service_iis.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_service_iis.c 10 May 2002 23:15:35 - 1.15
+++ jk_service_iis.c 18 May 2002 22:40:47 - 1.16
@@ -90,7 +90,7 @@
int headerCount;
env-l-jkLog(env,env-l, JK_LOG_DEBUG,
- Into jk_ws_service_t::start_response\n);
+ Into jk_ws_service_t::head\n);
if (s-status 100 || s-status 1000) {
env-l-jkLog(env,env-l, JK_LOG_ERROR,
@@ -100,7 +100,7 @@
if( lpEcb == NULL ) {
env-l-jkLog(env,env-l, JK_LOG_ERROR,
- jk_ws_service_t::start_response, no lpEcp\n);
+ jk_ws_service_t::head, no lpEcp\n);
return JK_ERR;
}
@@ -109,7 +109,7 @@
/*
* Create the status line
*/
-if (!s-msg) {
+if (s-msg==NULL) {
reason = ;
} else {
reason = s-msg;
@@ -154,7 +154,7 @@
(LPDWORD)len_of_status,
(LPDWORD)headers_str)) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
- jk_ws_service_t::start_response, ServerSupportFunction
failed\n);
+ jk_ws_service_t::head, ServerSupportFunction failed\n);
return JK_ERR;
}
@@ -317,9 +317,23 @@
s-ssl_session = NULL;
s-ssl_key_size = -1;
-jk2_map_default_create(env, s-headers_out, s-pool );
-jk2_map_default_create(env, s-attributes, s-pool );
-jk2_map_default_create(env, s-headers_in, s-pool );
+if (JK_OK!=jk2_map_default_create(env, s-headers_out, s-pool )){
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ jk_ws_service_t::init, Failed to create headers_out map \n);
+return JK_ERR;
+
+}
+if (JK_OK!=jk2_map_default_create(env, s-attributes, s-pool )){
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ jk_ws_service_t::init, Failed to create attributes map \n);
+return JK_ERR;
+
+}
+if (JK_OK!=jk2_map_default_create(env, s-headers_in, s-pool )){
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ jk_ws_service_t::init, Failed to create headers_in map \n);
+return JK_ERR;
+}
//s-headers_values = NULL;
// s-num_headers = 0;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_ajp13.c
nacho 02/05/18 15:43:27
Modified:jk/native2/common jk_worker_ajp13.c
Log:
* Added check for a null uriEnv, IIS 2 phase process couldnt put a uriEnv in the
service struct so was issuing a NPE
Revision ChangesPath
1.24 +2 -2 jakarta-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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jk_worker_ajp13.c 16 May 2002 23:46:01 - 1.23
+++ jk_worker_ajp13.c 18 May 2002 22:43:27 - 1.24
@@ -621,7 +621,7 @@
jk2_worker_ajp13_getEndpoint( env, w, e );
#ifdef HAS_APR
-if( s-uriEnv-timing == JK_TRUE ) {
+if( s-uriEnv!=NULL s-uriEnv-timing == JK_TRUE ) {
e-stats-startTime=s-startTime;
e-stats-jkStartTime=e-stats-connectedTime=apr_time_now();
if(e-stats-startTime==0)
@@ -641,7 +641,7 @@
}
#ifdef HAS_APR
-if( s-uriEnv-timing == JK_TRUE ) {
+if( s-uriEnv!=NULL s-uriEnv-timing == JK_TRUE ) {
apr_time_t reqTime;
e-stats-endTime=apr_time_now();
--
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_service_apache2.c
nacho 02/05/18 15:45:04 Modified:jk/native2/server/apache2 jk_service_apache2.c Log: * EOL problems Revision ChangesPath 1.23 +3 -2 jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c Index: jk_service_apache2.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- jk_service_apache2.c 17 May 2002 00:31:55 - 1.22 +++ jk_service_apache2.c 18 May 2002 22:45:04 - 1.23 @@ -59,7 +59,7 @@ * Description: Apache 2 plugin for Jakarta/Tomcat * Author: Gal Shachor [EMAIL PROTECTED] * Henri Gomez [EMAIL PROTECTED] - * Version: $Revision: 1.22 $ + * Version: $Revision: 1.23 $ */ #include apu_compat.h @@ -74,7 +74,8 @@ #include http_core.h #include http_protocol.h #include http_main.h -#include http_log.h +#include http_log.h + #include scoreboard.h #include util_script.h -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 8813] - welcome file list doesn't work
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8813. 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=8813 welcome file list doesn't work [EMAIL PROTECTED] changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|WORKSFORME | --- Additional Comments From [EMAIL PROTECTED] 2002-05-19 01:56 --- yes, it really works for static files and JSPs but does not work for servlets (ie if http://localhost:8080/magazin/home.html is mapped to a servlet) the servlet 2.3 spec is talking about resources mapped to URIs it does not exclude servlets -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 8813] - welcome file list doesn't work
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8813. 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=8813 welcome file list doesn't work [EMAIL PROTECTED] changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||DUPLICATE --- Additional Comments From [EMAIL PROTECTED] 2002-05-19 02:33 --- *** This bug has been marked as a duplicate of 9016 *** -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 9016] - welcome-files don't map to servlet without disk file
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=9016. 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=9016 welcome-files don't map to servlet without disk file [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2002-05-19 02:33 --- *** Bug 8813 has been marked as a duplicate of this bug. *** -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 9227] New: - Allow an empty value of a pathname in the StandardManager to disable the restart persistent sessions
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=9227. 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=9227 Allow an empty value of a pathname in the StandardManager to disable the restart persistent sessions Summary: Allow an empty value of a pathname in the StandardManager to disable the restart persistent sessions Product: Tomcat 4 Version: 4.0.3 Final Platform: Other OS/Version: Other Status: NEW Severity: Enhancement Priority: Other Component: Catalina:Modules AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Allow pathname= to disable persistence in the StandardManager as in this example: Manager className=org.apache.catalina.session.StandardManager pathname= / The source code for the StandardManager states that if the pathname is null, it will not use persistence. Not knowing how to set it to null from server.xml, I tried setting the pathname to an empty value (vs. the default SESSIONS.ser) and that seems to have disabled it. It didn't really disable it, but it couldn't create the relative file in the web application's work directory since it existed as the directory itself. I see exceptions in my log file...but at least my sessions are no longer persistent for this one application. You could probably put a bad file name with characters that are invalid for files of your O/S and get the same results. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Patterns in tOmcat 4 design
All, Knowing the popularity of Tomcat and the stability of the system I'm sure a lot of thought on design must have gone into this great peice of Java software. I'm interesting in the various design strategies, Patterns that have been used in the process of developing Catalina. It would server a great case study. I was briefly looking at it and there seems to be a whole lot of information on good design strategies that Java developers can use to architect their applications to be scalable and extensible. Regards, Anand -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
