cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_vm_default.c

[costin]

costin      02/01/25 23:10:30

  Modified:    jk/native2/common jk_vm_default.c
  Log:
  Fixes, get it to work right.
  
  Revision  Changes    Path
  1.2       +9 -2      jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c
  
  Index: jk_vm_default.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jk_vm_default.c   12 Jan 2002 04:48:20 -0000      1.1
  +++ jk_vm_default.c   26 Jan 2002 07:10:30 -0000      1.2
  @@ -121,8 +121,10 @@
   
   /** Where to try to find jk jars ( if user doesn't specify it explicitely ) */
   static const char *defaultJK_PATH[]={
  -    "$(tomcat.home)$(fs)modules$(fs)jk$(fs)WEB-INF$(fs)lib$(fs)ajp.jar",
  +    "$(tomcat.home)$(fs)modules$(fs)jk$(fs)WEB-INF$(fs)lib$(fs)jk2.jar",
  + "$(tomcat.home)$(fs)modules$(fs)jk$(fs)WEB-INF$(fs)lib$(fs)tomcat-utils.jar",
       "$(tomcat.home)$(fs)webapps(fs)jk$(fs)WEB-INF$(fs)lib$(fs)ajp.jar",
  + "$(tomcat.home)$(fs)webapps(fs)jk$(fs)WEB-INF$(fs)lib$(fs)tomcat-utils.jar",
       NULL
   };
   
  @@ -254,7 +256,7 @@
       /*     linux_signal_hack(); */
   #endif
   
  -    err= (*jvm)->GetEnv( jvm, (void **)&rc, 0 );
  +    err= (*jvm)->GetEnv( jvm, (void **)&rc, JNI_VERSION_1_2 );
       if( err != 0 ) {
           env->l->jkLog(env, env->l, JK_LOG_INFO,
                         "vm.attach() GetEnv failed %d\n", err);
  @@ -654,6 +656,9 @@
           return NULL;
       }
   
  +    env->l->jkLog(env, env->l, JK_LOG_INFO,
  +                  "jni.guessTomcatHome() %s\n", tomcat_home);
  +    
       props->put(env, props, "tomcat.home",
                  props->pool->pstrdup( env, props->pool, tomcat_home ), NULL);
       
  @@ -666,6 +671,8 @@
       char *jkJar;
       jk_pool_t *p=props->pool;
       const char **current=defaultJK_PATH;
  +
  +    guessTomcatHome( env, props );
       
       while( *current != NULL ) {
           jkJar = jk_map_replaceProperties(env, props, p,
  
  
  

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