tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@locus.apache.org
Subject cvs commit: jakarta-tomcat/src/native/netscape Makefile.nw
Date Wed, 13 Sep 2000 23:06:30 GMT
pier        00/09/13 16:06:30

  Modified:    src/native/apache1.3 Tag: tomcat_32 mod_jk.c
               src/native/jk Tag: tomcat_32 jk_ajp13.c jk_ajp13_worker.c
                        jk_connect.c jk_global.h jk_jni_worker.c
                        jk_msg_buff.c jk_pool.h jk_sockbuf.c jk_util.c
  Added:       src/native/apache1.3 Tag: tomcat_32 Makefile.nw
               src/native/jk Tag: tomcat_32 jk_nwmain.c
               src/native/jni_connect Tag: tomcat_32 Makefile.nw
                        jk_jnicb.exp
               src/native/netscape Tag: tomcat_32 Makefile.nw
  Log:
  Patches for building native connectors for NetWare.
  Thanks to Mike Anderson <mmanders@novell.com>.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.1   +8 -0      jakarta-tomcat/src/native/apache1.3/Attic/mod_jk.c
  
  Index: mod_jk.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/native/apache1.3/Attic/mod_jk.c,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- mod_jk.c	2000/06/30 08:10:46	1.7
  +++ mod_jk.c	2000/09/13 23:06:21	1.7.2.1
  @@ -78,6 +78,14 @@
   /*
    * Jakarta (jk_) include files
    */
  +#ifdef NETWARE
  +#define _SYS_TYPES_H_
  +#define _NETDB_H_INCLUDED
  +#define _IN_
  +#define _INET_
  +#define _SYS_TIMEVAL_H_
  +#define _SYS_SOCKET_H_
  +#endif
   #include "jk_global.h"
   #include "jk_util.h"
   #include "jk_map.h"
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +103 -0    jakarta-tomcat/src/native/apache1.3/Attic/Makefile.nw
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.1   +4 -4      jakarta-tomcat/src/native/jk/Attic/jk_ajp13.c
  
  Index: jk_ajp13.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/native/jk/Attic/jk_ajp13.c,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- jk_ajp13.c	2000/06/23 10:33:13	1.5
  +++ jk_ajp13.c	2000/09/13 23:06:25	1.5.2.1
  @@ -56,7 +56,7 @@
   /***************************************************************************
    * Description: Experimental bi-directionl protocol handler.               *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
  - * Version:     $Revision: 1.5 $                                           *
  + * Version:     $Revision: 1.5.2.1 $                                           *
    ***************************************************************************/
   
   
  @@ -522,7 +522,7 @@
           return JK_FALSE;
       }
   
  -    d->msg = jk_b_get_string(msg);
  +    d->msg = (char *)jk_b_get_string(msg);
   
       jk_log(l, JK_LOG_DEBUG, 
              "ajp13_unmarshal_response: status = %d\n",
  @@ -556,7 +556,7 @@
                           return JK_FALSE;
                       }
                   } else {
  -                    d->header_names[i] = jk_b_get_string(msg);
  +                    d->header_names[i] = (char *)jk_b_get_string(msg);
                       if(!d->header_names[i]) {
                           jk_log(l, JK_LOG_ERROR, 
                                  "Error ajp13_unmarshal_response - Null header name\n");
  @@ -565,7 +565,7 @@
                       }
                   }
   
  -                d->header_values[i] = jk_b_get_string(msg);
  +                d->header_values[i] = (char *)jk_b_get_string(msg);
                   if(!d->header_values[i]) {
                       jk_log(l, JK_LOG_ERROR, 
                              "Error ajp13_unmarshal_response - Null header value\n");
  
  
  
  1.3.2.1   +2 -2      jakarta-tomcat/src/native/jk/Attic/jk_ajp13_worker.c
  
  Index: jk_ajp13_worker.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/native/jk/Attic/jk_ajp13_worker.c,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- jk_ajp13_worker.c	2000/06/16 07:03:21	1.3
  +++ jk_ajp13_worker.c	2000/09/13 23:06:25	1.3.2.1
  @@ -57,7 +57,7 @@
    * Description: Experimental bi-directionl protocol.                       *
    * Author:      Costin <costin@costin.dnt.ro>                              *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
  - * Version:     $Revision: 1.3 $                                           *
  + * Version:     $Revision: 1.3.2.1 $                                           *
    ***************************************************************************/
   
   #include "jk_pool.h"
  @@ -193,7 +193,7 @@
                                         jk_msg_buf_t *msg, 
                                         jk_logger_t *l) 
   {
  -    char head[4];
  +    unsigned char head[4];
       int rc;
       int msglen;
   
  
  
  
  1.2.2.1   +3 -3      jakarta-tomcat/src/native/jk/Attic/jk_connect.c
  
  Index: jk_connect.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/native/jk/Attic/jk_connect.c,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- jk_connect.c	2000/05/19 06:58:59	1.2
  +++ jk_connect.c	2000/09/13 23:06:25	1.2.2.1
  @@ -57,7 +57,7 @@
    * Description: Socket/Naming manipulation functions                       *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
    * Based on:    Various Jserv files                                        *
  - * Version:     $Revision: 1.2 $                                               *
  + * Version:     $Revision: 1.2.2.1 $                                               *
    ***************************************************************************/
   
   
  @@ -175,7 +175,7 @@
   
       while(sent < len) {
           int this_time = send(sd, 
  -                             b + sent , 
  +                             (char *)b + sent , 
                                len - sent, 
                                0);
   	    
  @@ -199,7 +199,7 @@
   
       while(rdlen < len) {
   	    int this_time = recv(sd, 
  -                             b + rdlen, 
  +                             (char *)b + rdlen, 
                                len - rdlen, 
                                0);	
   	    if(-1 == this_time) {
  
  
  
  1.2.2.1   +10 -8     jakarta-tomcat/src/native/jk/Attic/jk_global.h
  
  Index: jk_global.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/native/jk/Attic/jk_global.h,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- jk_global.h	2000/05/19 06:59:00	1.2
  +++ jk_global.h	2000/09/13 23:06:25	1.2.2.1
  @@ -57,7 +57,7 @@
    * Description: Global definitions and include files that should exist     *
    *              anywhere                                                   *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
  - * Version:     $Revision: 1.2 $                                               *
  + * Version:     $Revision: 1.2.2.1 $                                               *
    ***************************************************************************/
   
   #ifndef JK_GLOBAL_H
  @@ -82,14 +82,16 @@
       #include <netdb.h>
   
       #include <netinet/in.h>
  -    #include <netinet/tcp.h>
  -    #include <arpa/inet.h>
  -
  -    #include <sys/un.h>
  +    #ifndef NETWARE
  +        #include <netinet/tcp.h>
  +        #include <arpa/inet.h>
  +        #include <sys/un.h>
  +        #include <sys/socketvar.h>
  +        #include <sys/select.h>
  +    #endif
  +        
       #include <sys/socket.h>
       #include <sys/time.h>
  -    #include <sys/socketvar.h>
  -    #include <sys/select.h>
       #include <sys/ioctl.h>
   #endif
   
  @@ -115,7 +117,7 @@
   #define JK_SESSION_IDENTIFIER "JSESSIONID"
   #define JK_PATH_SESSION_IDENTIFIER ";jsessionid"
   
  -#ifdef WIN32
  +#if defined(WIN32) || defined(NETWARE)
       #define JK_METHOD __stdcall
       #define C_LEVEL_TRY_START       __try {
       #define C_LEVEL_TRY_END         }
  
  
  
  1.7.2.2   +28 -4     jakarta-tomcat/src/native/jk/Attic/jk_jni_worker.c
  
  Index: jk_jni_worker.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/native/jk/Attic/jk_jni_worker.c,v
  retrieving revision 1.7.2.1
  retrieving revision 1.7.2.2
  diff -u -r1.7.2.1 -r1.7.2.2
  --- jk_jni_worker.c	2000/07/25 20:42:21	1.7.2.1
  +++ jk_jni_worker.c	2000/09/13 23:06:25	1.7.2.2
  @@ -57,10 +57,10 @@
    * Description: In process JNI worker                                      *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
    * Based on:                                                               *
  - * Version:     $Revision: 1.7.2.1 $                                           *
  + * Version:     $Revision: 1.7.2.2 $                                           *
    ***************************************************************************/
   
  -#ifndef WIN32
  +#if !defined(WIN32) && !defined(NETWARE)
   #include <dlfcn.h>
   #endif
   
  @@ -76,6 +76,11 @@
   #include <bits/signum.h>
   #endif
   
  +#ifdef NETWARE
  +#include <nwthread.h>
  +#include <nwadv.h>
  +#endif
  +
   #ifndef JNI_VERSION_1_1
   #define JNI_VERSION_1_1 0x00010001
   #endif
  @@ -353,11 +358,11 @@
           return JK_TRUE;
       }
   
  -    if(jk_get_worker_mx(props, p->name, &mem_config)) {
  +    if(jk_get_worker_mx(props, p->name, (unsigned int *)&mem_config)) {
           p->tomcat_mx = mem_config;
       }
   
  -    if(jk_get_worker_ms(props, p->name, &mem_config)) {
  +    if(jk_get_worker_ms(props, p->name, (unsigned int *)&mem_config)) {
           p->tomcat_ms = mem_config;
       }
   
  @@ -691,6 +696,25 @@
           }
   
           FreeLibrary(hInst);
  +    }
  +#elif defined(NETWARE)
  +    int javaNlmHandle = FindNLMHandle("JVM");
  +    if (0 == javaNlmHandle) {
  +        /* if we didn't get a handle, try to load java and retry getting the */
  +        /* handle */
  +        spawnlp(P_NOWAIT, "JVM.NLM", NULL);
  +        ThreadSwitchWithDelay();
  +        javaNlmHandle = FindNLMHandle("JVM");
  +        if (0 == javaNlmHandle)
  +            printf("Error loading Java.");
  +
  +    }
  +    if (0 != javaNlmHandle) {
  +        jni_create_java_vm = ImportSymbol(GetNLMHandle(), "JNI_CreateJavaVM");
  +        jni_get_default_java_vm_init_args = ImportSymbol(GetNLMHandle(), "JNI_GetDefaultJavaVMInitArgs");
  +    }
  +    if(jni_create_java_vm && jni_get_default_java_vm_init_args) {
  +        return JK_TRUE;
       }
   #else 
       void *handle;
  
  
  
  1.2.2.1   +5 -5      jakarta-tomcat/src/native/jk/Attic/jk_msg_buff.c
  
  Index: jk_msg_buff.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/native/jk/Attic/jk_msg_buff.c,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- jk_msg_buff.c	2000/05/19 06:59:00	1.2
  +++ jk_msg_buff.c	2000/09/13 23:06:26	1.2.2.1
  @@ -57,7 +57,7 @@
    * Description: Data marshaling. XDR like                                  *
    * Author:      Costin <costin@costin.dnt.ro>                              *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
  - * Version:     $Revision: 1.2 $                                           *
  + * Version:     $Revision: 1.2.2.1 $                                           *
    ***************************************************************************/
   
   #include "jk_pool.h"
  @@ -189,7 +189,7 @@
       }
   
       msg->len = 0;
  -    msg->buf = data;
  +    msg->buf = (unsigned char *)data;
       msg->maxlen = buffSize;
       
       return 0;
  @@ -205,7 +205,7 @@
   	    return -1;
       }
   
  -    jk_b_set_buffer(msg, data, buffSize);
  +    jk_b_set_buffer(msg, (char *)data, buffSize);
       return 0;
   }
   
  @@ -260,7 +260,7 @@
       jk_b_append_int(msg, (unsigned short )len);
   
       /* We checked for space !!  */
  -    strncpy(msg->buf + msg->len , param, len+1); /* including \0 */
  +    strncpy((char *)msg->buf + msg->len , param, len+1); /* including \0 */
       msg->len += len + 1;
   
       return 0;
  @@ -313,7 +313,7 @@
       if((size < 0 ) || (size + start > msg->maxlen)) { 
   	    jk_b_dump(msg, "After get int"); 
   	    printf("ERROR\n" );
  -	    return "ERROR"; /* XXX */
  +	    return (unsigned char *)"ERROR"; /* XXX */
       }
   
       msg->pos += size;
  
  
  
  1.2.2.2   +3 -1      jakarta-tomcat/src/native/jk/Attic/jk_pool.h
  
  Index: jk_pool.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/native/jk/Attic/jk_pool.h,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- jk_pool.h	2000/07/25 20:42:23	1.2.2.1
  +++ jk_pool.h	2000/09/13 23:06:27	1.2.2.2
  @@ -56,7 +56,7 @@
   /***************************************************************************
    * Description: Memory Pool object header file                             *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
  - * Version:     $Revision: 1.2.2.1 $                                               *
  + * Version:     $Revision: 1.2.2.2 $                                               *
    ***************************************************************************/
   #ifndef _JK_POOL_H
   #define _JK_POOL_H
  @@ -88,6 +88,8 @@
   #elif defined(FREEBSD)
       typedef long long   jk_pool_atom_t;
   #elif defined(OS2)
  +    typedef long long   jk_pool_atom_t;
  +#elif defined(NETWARE)
       typedef long long   jk_pool_atom_t;
   #endif
   
  
  
  
  1.1.2.1   +2 -2      jakarta-tomcat/src/native/jk/Attic/jk_sockbuf.c
  
  Index: jk_sockbuf.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/native/jk/Attic/jk_sockbuf.c,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- jk_sockbuf.c	2000/04/17 09:47:22	1.1
  +++ jk_sockbuf.c	2000/09/13 23:06:27	1.1.2.1
  @@ -56,7 +56,7 @@
   /***************************************************************************
    * Description: Simple buffer object to handle buffered socket IO          *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
  - * Version:     $Revision: 1.1 $                                               *
  + * Version:     $Revision: 1.1.2.1 $                                               *
    ***************************************************************************/
   
   #include "jk_global.h"
  @@ -90,7 +90,7 @@
                   return JK_FALSE;
               }
               if(sz > SOCKBUF_SIZE) {
  -                return (send(sb->sd, buf, sz, 0) == (int)sz);
  +                return (send(sb->sd, (char *)buf, sz, 0) == (int)sz);
               } 
               
               memcpy(sb->buf + sb->end, buf, sz);
  
  
  
  1.6.2.2   +7 -1      jakarta-tomcat/src/native/jk/Attic/jk_util.c
  
  Index: jk_util.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/native/jk/Attic/jk_util.c,v
  retrieving revision 1.6.2.1
  retrieving revision 1.6.2.2
  diff -u -r1.6.2.1 -r1.6.2.2
  --- jk_util.c	2000/07/25 20:42:24	1.6.2.1
  +++ jk_util.c	2000/09/13 23:06:27	1.6.2.2
  @@ -56,7 +56,7 @@
   /***************************************************************************
    * Description: Utility functions (mainly configuration)                   *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
  - * Version:     $Revision: 1.6.2.1 $                                               *
  + * Version:     $Revision: 1.6.2.2 $                                               *
    ***************************************************************************/
   
   
  @@ -108,9 +108,11 @@
   	    fflush(p->logfile);
   #ifndef WIN32
   #ifndef FREEBSD
  +#ifndef NETWARE
   	    fdatasync(fileno(p->logfile));
   #endif
   #endif
  +#endif
           }
   
           return JK_TRUE;
  @@ -206,6 +208,8 @@
                          
   #ifdef WIN32
           used = _snprintf(buf, HUGE_BUFFER_SIZE, "[%s (%d)]: ", f, line);        
  +#elif defined(NETWARE) // until we get a snprintf function
  +        used = sprintf(buf, "[%s (%d)]: ", f, line);
   #else 
           used = snprintf(buf, HUGE_BUFFER_SIZE, "[%s (%d)]: ", f, line);        
   #endif
  @@ -216,6 +220,8 @@
           va_start(args, fmt);
   #ifdef WIN32
           rc = _vsnprintf(buf + used, HUGE_BUFFER_SIZE - used, fmt, args);
  +#elif defined(NETWARE) // until we get a vsnprintf function
  +        rc = vsprintf(buf + used, fmt, args);
   #else 
           rc = vsnprintf(buf + used, HUGE_BUFFER_SIZE - used, fmt, args);
   #endif
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +29 -0     jakarta-tomcat/src/native/jk/Attic/jk_nwmain.c
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +88 -0     jakarta-tomcat/src/native/jni_connect/Attic/Makefile.nw
  
  
  
  
  1.1.2.1   +7 -0      jakarta-tomcat/src/native/jni_connect/Attic/jk_jnicb.exp
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +101 -0    jakarta-tomcat/src/native/netscape/Attic/Makefile.nw
  
  
  
  

Mime
View raw message