tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_service.h
Date Mon, 26 Aug 2002 09:54:35 GMT
remm        2002/08/26 02:54:35

  Modified:    jk/java/org/apache/ajp RequestHandler.java
               jk/java/org/apache/jk/common HandlerRequest.java
               jk/native/common jk_ajp_common.c jk_ajp_common.h
               jk/native2/common jk_requtil.c
               jk/native2/include jk_service.h
  Log:
  - Add JK and JK 2 support for advanced Delta V methods (no logic change, but
    let me know if it causes problems) needed for Slide 2.0.
  - Patch submitted by Peter Nevermann <Peter.Nevermann at softwareag.com>
  
  Revision  Changes    Path
  1.16      +7 -1      jakarta-tomcat-connectors/jk/java/org/apache/ajp/RequestHandler.java
  
  Index: RequestHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/RequestHandler.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- RequestHandler.java	15 Jun 2002 01:52:47 -0000	1.15
  +++ RequestHandler.java	26 Aug 2002 09:54:34 -0000	1.16
  @@ -154,7 +154,13 @@
           "CHECKIN",
           "CHECKOUT",
           "UNCHECKOUT",
  -        "SEARCH"
  +        "SEARCH",
  +        "MKWORKSPACE",
  +        "UPDATE",
  +        "LABEL",
  +        "MERGE",
  +        "BASELINE-CONTROL",
  +        "MKACTIVITY"
       };
       
       // id's for common request headers
  
  
  
  1.15      +7 -1      jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java
  
  Index: HandlerRequest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- HandlerRequest.java	1 Jun 2002 08:29:34 -0000	1.14
  +++ HandlerRequest.java	26 Aug 2002 09:54:34 -0000	1.15
  @@ -165,7 +165,13 @@
           "CHECKIN",
           "CHECKOUT",
           "UNCHECKOUT",
  -        "SEARCH"
  +        "SEARCH",
  +        "MKWORKSPACE",
  +        "UPDATE",
  +        "LABEL",
  +        "MERGE",
  +        "BASELINE-CONTROL",
  +        "MKACTIVITY"
       };
       
       // id's for common request headers
  
  
  
  1.28      +13 -1     jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
  
  Index: jk_ajp_common.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- jk_ajp_common.c	2 Jul 2002 16:51:08 -0000	1.27
  +++ jk_ajp_common.c	26 Aug 2002 09:54:34 -0000	1.28
  @@ -142,6 +142,18 @@
           *sc = SC_M_UNCHECKOUT;
       } else if(0 == strcmp(method, "SEARCH")) {
           *sc = SC_M_SEARCH;
  +    } else if(0 == strcmp(method, "MKWORKSPACE")) {
  +        *sc = SC_M_MKWORKSPACE;
  +    } else if(0 == strcmp(method, "UPDATE")) {
  +        *sc = SC_M_UPDATE;
  +    } else if(0 == strcmp(method, "LABEL")) {
  +        *sc = SC_M_LABEL;
  +    } else if(0 == strcmp(method, "MERGE")) {
  +        *sc = SC_M_MERGE;
  +    } else if(0 == strcmp(method, "BASELINE-CONTROL")) {
  +        *sc = SC_M_BASELINE_CONTROL;
  +    } else if(0 == strcmp(method, "MKACTIVITY")) {
  +        *sc = SC_M_MKACTIVITY;
       } else {
           rc = JK_FALSE;
       }
  
  
  
  1.16      +14 -2     jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.h
  
  Index: jk_ajp_common.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.h,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- jk_ajp_common.h	25 Jun 2002 07:07:31 -0000	1.15
  +++ jk_ajp_common.h	26 Aug 2002 09:54:34 -0000	1.16
  @@ -116,6 +116,12 @@
    *                        | "CHECKOUT"
    *                        | "UNCHECKOUT"
    *                        | "SEARCH"
  + *                        | "MKWORKSPACE"
  + *                        | "UPDATE"
  + *                        | "LABEL"
  + *                        | "MERGE"
  + *                        | "BASELINE-CONTROL"
  + *                        | "MKACTIVITY"
    * 
    */
   #define SC_M_OPTIONS            (unsigned char)1
  @@ -132,13 +138,19 @@
   #define SC_M_MOVE               (unsigned char)12
   #define SC_M_LOCK               (unsigned char)13
   #define SC_M_UNLOCK             (unsigned char)14
  -#define SC_M_ACL        (unsigned char)15
  +#define SC_M_ACL                (unsigned char)15
   #define SC_M_REPORT             (unsigned char)16
   #define SC_M_VERSION_CONTROL    (unsigned char)17
   #define SC_M_CHECKIN            (unsigned char)18
   #define SC_M_CHECKOUT           (unsigned char)19
   #define SC_M_UNCHECKOUT         (unsigned char)20
   #define SC_M_SEARCH             (unsigned char)21
  +#define SC_M_MKWORKSPACE        (unsigned char)22
  +#define SC_M_UPDATE             (unsigned char)23
  +#define SC_M_LABEL              (unsigned char)24
  +#define SC_M_MERGE              (unsigned char)25
  +#define SC_M_BASELINE_CONTROL   (unsigned char)26
  +#define SC_M_MKACTIVITY         (unsigned char)27
   
   
   /*
  
  
  
  1.24      +12 -0     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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- jk_requtil.c	8 Jul 2002 13:37:54 -0000	1.23
  +++ jk_requtil.c	26 Aug 2002 09:54:34 -0000	1.24
  @@ -186,6 +186,18 @@
           *sc = SC_M_UNCHECKOUT;
       } else if(0 == strcmp(method, "SEARCH")) {
           *sc = SC_M_SEARCH;
  +    } else if(0 == strcmp(method, "MKWORKSPACE")) {
  +        *sc = SC_M_MKWORKSPACE;
  +    } else if(0 == strcmp(method, "UPDATE")) {
  +        *sc = SC_M_UPDATE;
  +    } else if(0 == strcmp(method, "LABEL")) {
  +        *sc = SC_M_LABEL;
  +    } else if(0 == strcmp(method, "MERGE")) {
  +        *sc = SC_M_MERGE;
  +    } else if(0 == strcmp(method, "BASELINE-CONTROL")) {
  +        *sc = SC_M_BASELINE_CONTROL;
  +    } else if(0 == strcmp(method, "MKACTIVITY")) {
  +        *sc = SC_M_MKACTIVITY;
       } else {
           rc = JK_ERR;
       }
  
  
  
  1.17      +8 -2      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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- jk_service.h	8 Jul 2002 00:26:07 -0000	1.16
  +++ jk_service.h	26 Aug 2002 09:54:34 -0000	1.17
  @@ -111,13 +111,19 @@
   #define SC_M_MOVE               (unsigned char)12
   #define SC_M_LOCK               (unsigned char)13
   #define SC_M_UNLOCK             (unsigned char)14
  -#define SC_M_ACL		(unsigned char)15
  +#define SC_M_ACL		        (unsigned char)15
   #define SC_M_REPORT             (unsigned char)16
   #define SC_M_VERSION_CONTROL    (unsigned char)17
   #define SC_M_CHECKIN            (unsigned char)18
   #define SC_M_CHECKOUT           (unsigned char)19
   #define SC_M_UNCHECKOUT         (unsigned char)20
   #define SC_M_SEARCH             (unsigned char)21
  +#define SC_M_MKWORKSPACE        (unsigned char)22
  +#define SC_M_UPDATE             (unsigned char)23
  +#define SC_M_LABEL              (unsigned char)24
  +#define SC_M_MERGE              (unsigned char)25
  +#define SC_M_BASELINE_CONTROL   (unsigned char)26
  +#define SC_M_MKACTIVITY         (unsigned char)27
   
   
       
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message