You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2002/07/08 15:35:53 UTC

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

mturk       2002/07/08 06:35:53

  Modified:    jk/native2/common jk_uriMap.c
  Log:
  no message
  
  Revision  Changes    Path
  1.35      +18 -18    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.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- jk_uriMap.c	10 Jun 2002 21:55:06 -0000	1.34
  +++ jk_uriMap.c	8 Jul 2002 13:35:53 -0000	1.35
  @@ -144,7 +144,7 @@
   {
       uriMap->maps->put( env, uriMap->maps, uriEnv->name, uriEnv, NULL );
       if( uriMap->mbean->debug > 0 ) 
  -        env->l->jkLog(env, env->l, JK_LOG_INFO,
  +        env->l->jkLog(env, env->l, JK_LOG_DEBUG,
                         "uriMap.addUriEnv() %s %s %s\n", uriEnv->name, uriEnv->virtual, uriEnv->uri);
       return JK_OK;
   }
  @@ -211,7 +211,7 @@
               if(0 == strcmp(suffix, uwr->suffix)) {
   #endif
                   if( uriMap->mbean->debug > 0 ) {
  -                    env->l->jkLog(env, env->l,JK_LOG_INFO,
  +                    env->l->jkLog(env, env->l,JK_LOG_DEBUG,
                                     "uriMap.mapUri() suffix match %s\n",
                                     uwr->suffix );
                   }
  @@ -336,7 +336,7 @@
       uriMap->defaultVhost=mbean->object;
       
       if( uriMap->mbean->debug > 5 ) 
  -        env->l->jkLog(env, env->l, JK_LOG_INFO, "uriMap.init() set default host\n"); 
  +        env->l->jkLog(env, env->l, JK_LOG_DEBUG, "uriMap.init() set default host\n"); 
   
       /* Initialize the vhosts table */
       for(i = 0 ; i < uriMap->maps->size( env, uriMap->maps ) ; i++) {
  @@ -350,7 +350,7 @@
                                        uriEnv->virtual, uriEnv, NULL );
               }
               if( uriMap->mbean->debug > 5 ) 
  -                env->l->jkLog(env, env->l, JK_LOG_INFO,
  +                env->l->jkLog(env, env->l, JK_LOG_DEBUG,
                                 "uriMap.init() loaded host %s\n",uriEnv->virtual); 
           }
       }        
  @@ -390,7 +390,7 @@
               env->createBean2( env, uriMap->mbean->pool, "uri", uriPath );
               rootCtx=env->getByName2( env, "uri", uriPath );
               if( uriMap->mbean->debug > 0 ) 
  -                env->l->jkLog(env, env->l, JK_LOG_INFO,
  +                env->l->jkLog(env, env->l, JK_LOG_DEBUG,
                                 "uriMap.init() Create default context %s\n", uriPath );
               rootCtx->mbean->setAttribute( env, rootCtx->mbean, "context", "/" );
           }
  @@ -401,7 +401,7 @@
           env->createBean2( env, uriMap->mbean->pool, "uri", "/" );
           uriEnv=env->getByName2( env, "uri", "/" );
           if( uriMap->mbean->debug > 0 ) 
  -            env->l->jkLog(env, env->l, JK_LOG_INFO,
  +            env->l->jkLog(env, env->l, JK_LOG_DEBUG,
                             "uriMap.init() Create default context / ( for default host )\n" );
           uriEnv->mbean->setAttribute( env, uriEnv->mbean, "context", "/" );
       }
  @@ -413,7 +413,7 @@
           char *uri;
           char *context;
           if( uriEnv==NULL ) {
  -            env->l->jkLog(env, env->l, JK_LOG_ERROR,
  +            env->l->jkLog(env, env->l, JK_LOG_INFO,
                             "uriMap.init() NPE\n");
           }
           uri=uriEnv->uri;
  @@ -424,7 +424,7 @@
               jk_uriEnv_t *hostEnv=jk2_uriMap_hostMap( env, uriMap, vhost );
   
               if( uriMap->mbean->debug > 5 ) 
  -                env->l->jkLog(env, env->l, JK_LOG_INFO,
  +                env->l->jkLog(env, env->l, JK_LOG_DEBUG,
                                 "uriMap.init() loaded context %s %s %#lx %#lx %#lx\n",
                                 uriEnv->virtual, context, hostEnv, hostEnv->webapps,
                                 uriMap->pool); 
  @@ -442,7 +442,7 @@
       }
   
       if( uriMap->mbean->debug > 5 ) 
  -        env->l->jkLog(env, env->l, JK_LOG_INFO,
  +        env->l->jkLog(env, env->l, JK_LOG_DEBUG,
                         "uriMap.init() processing mappings\n");
   
       /* All other mappings are added in the right context leaf.
  @@ -487,7 +487,7 @@
   {
   
       if( uriMap->mbean->debug > 0 ) 
  -        env->l->jkLog(env, env->l, JK_LOG_INFO, "uriMap.destroy()\n"); 
  +        env->l->jkLog(env, env->l, JK_LOG_DEBUG, "uriMap.destroy()\n"); 
   
       /* this can't be null ( or a NPE would have been generated */
       uriMap->pool->close(env, uriMap->pool);
  @@ -562,7 +562,7 @@
   	return NULL;
       
       if( uriMap->mbean->debug > 1 )
  -        env->l->jkLog(env, env->l, JK_LOG_INFO,
  +        env->l->jkLog(env, env->l, JK_LOG_DEBUG,
                         "uriMap.mapUri() %s %s\n", vhost, uri);    
   
       if( '/' != uri[0]) {
  @@ -574,7 +574,7 @@
       hostEnv=jk2_uriMap_hostMap( env, uriMap, vhost );
   
       if( uriMap->mbean->debug > 1 )
  -        env->l->jkLog(env, env->l, JK_LOG_INFO,
  +        env->l->jkLog(env, env->l, JK_LOG_DEBUG,
                         "uriMap.mapUri() found host %s\n", hostEnv->virtual);    
   
       url_rewrite = strstr(uri, JK_PATH_SESSION_IDENTIFIER);
  @@ -583,7 +583,7 @@
           origChar=*url_rewrite;
           *url_rewrite = '\0';
           if( uriMap->mbean->debug > 0 )
  -            env->l->jkLog(env, env->l, JK_LOG_INFO,
  +            env->l->jkLog(env, env->l, JK_LOG_DEBUG,
                             "uriMap.mapUri() rewrote uri %s \n",uri );
       }
   
  @@ -599,7 +599,7 @@
       }
       
       if( uriMap->mbean->debug > 1 )
  -        env->l->jkLog(env, env->l, JK_LOG_INFO,
  +        env->l->jkLog(env, env->l, JK_LOG_DEBUG,
                         "uriMap.mapUri() found ctx %s\n", ctxEnv->uri);    
   
       /* As per Servlet spec, do exact match first */
  @@ -608,7 +608,7 @@
           /* restore */
           if( url_rewrite ) *url_rewrite=origChar;
           if( uriMap->mbean->debug > 0 )
  -            env->l->jkLog(env, env->l, JK_LOG_INFO,
  +            env->l->jkLog(env, env->l, JK_LOG_DEBUG,
                             "uriMap.mapUri() exact match %s %s\n",
                             uri, match->workerName ); 
           return match;
  @@ -620,7 +620,7 @@
           /* restore */
           if( url_rewrite ) *url_rewrite=origChar;
           if( uriMap->mbean->debug > 0 )
  -            env->l->jkLog(env, env->l, JK_LOG_INFO,
  +            env->l->jkLog(env, env->l, JK_LOG_DEBUG,
                             "uriMap.mapUri() prefix match %s %s\n",
                             uri, match->workerName ); 
           return match;
  @@ -636,7 +636,7 @@
               /* restore */
               if( url_rewrite ) *url_rewrite=origChar;
               if( uriMap->mbean->debug > 0 )
  -                env->l->jkLog(env, env->l, JK_LOG_INFO,
  +                env->l->jkLog(env, env->l, JK_LOG_DEBUG,
                                 "uriMap.mapUri() extension match %s %s\n",
                                 uri, match->workerName ); 
               return match;
  @@ -680,7 +680,7 @@
           *url_rewrite=origChar;
           
       if( uriMap->mbean->debug > 1 )
  -        env->l->jkLog(env, env->l, JK_LOG_INFO,
  +        env->l->jkLog(env, env->l, JK_LOG_DEBUG,
                         "uriMap.mapUri() no match found\n"); 
   
       return NULL;
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>