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 2003/09/29 11:01:40 UTC

cvs commit: jakarta-tomcat-connectors/procrun extend.h icoi.ico icos.ico icow.ico splash.bmp tomcat.c tomcat.dsp tomcat.dsw tomcat.rc tomcatp.ico tomcatr.ico tomcats.ico

mturk       2003/09/29 02:01:40

  Added:       procrun  extend.h icoi.ico icos.ico icow.ico splash.bmp
                        tomcat.c tomcat.dsp tomcat.dsw tomcat.rc
                        tomcatp.ico tomcatr.ico tomcats.ico
  Log:
  Add the procrun tomcat extension to the j-t-c.
  
  Revision  Changes    Path
  1.1                  jakarta-tomcat-connectors/procrun/extend.h
  
  Index: extend.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   * Portions of this software are based upon public domain software
   * originally written at the National Center for Supercomputing Applications,
   * University of Illinois, Urbana-Champaign.
   */
  
  /* ====================================================================
   * procrun
   *
   * Contributed by Mladen Turk <mt...@apache.org>
   *
   * 05 Aug 2002
   * ==================================================================== 
   */
  
  
  #define IDB_BMPSPLASH         201
  #define IDI_ICOI              202
  #define IDI_ICOS              203
  #define IDI_ICOW              204
  #define IDD_DLGSPLASH         205
  #define IDL_INFO              206
  
  
  #define PROCRUN_REGKEY_ROOT         "SOFTWARE\\Apache Software Foundation\\Tomcat Service Manager"
  #define PROCRUN_GUI_DISPLAY         "Tomcat Service Manager"
  
  
  
  1.1                  jakarta-tomcat-connectors/procrun/icoi.ico
  
  	<<Binary file>>
  
  
  1.1                  jakarta-tomcat-connectors/procrun/icos.ico
  
  	<<Binary file>>
  
  
  1.1                  jakarta-tomcat-connectors/procrun/icow.ico
  
  	<<Binary file>>
  
  
  1.1                  jakarta-tomcat-connectors/procrun/splash.bmp
  
  	<<Binary file>>
  
  
  1.1                  jakarta-tomcat-connectors/procrun/tomcat.c
  
  Index: tomcat.c
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   * Portions of this software are based upon public domain software
   * originally written at the National Center for Supercomputing Applications,
   * University of Illinois, Urbana-Champaign.
   */
  
  /* ====================================================================
   * procrun tomcat gui extensions
   *
   * Contributed by Mladen Turk <mt...@apache.org>
   *
   * 05 Aug 2002
   * ==================================================================== 
   */
  
  #if defined(PROCRUN_WINAPP)
  
  #ifndef STRICT
  #define STRICT
  #endif
  #ifndef OEMRESOURCE
  #define OEMRESOURCE
  #endif
  
  #include <windows.h>
  #include <windowsx.h>
  #include <commctrl.h>
  #include <objbase.h>
  #include <shlobj.h>
  #include <stdlib.h>
  #include <stdio.h>
  
  #include <Shlwapi.h>
  #include <io.h>
  #include <fcntl.h>
  #include <process.h>
  #include <time.h>
  #include <stdarg.h>
  #include <jni.h>
   
  #include "procrun.h"
  
  
  int                    ac_lview_current = 0;
  static struct {
      char *  label;
      DWORD   width;
  } ac_columns[] = {
      {   "Status",   140     },
      {   "Class",    172     },
      {   "Message",  300     },
  };
  
  static char *ac_lv_stat = NULL;
  static char ac_lv_clbuf[1024] = {0};
  static char *ac_lv_class = NULL;
  static char *ac_lv_clmsg = NULL;
  static int  ac_lv_iicon = 0;
  /* splash window handle */
  static HWND ac_splash_hwnd = NULL;
  static HWND ac_splist_hwnd;
  
  #define STR_NOT_NULL(s) { if((s) == NULL) (s) = ""; }
  
  
  LRESULT CALLBACK ac_splash_dlg_proc(HWND hdlg, UINT message, WPARAM wparam, LPARAM lparam)
  {
  
      switch (message) {
          case WM_INITDIALOG:
             ac_splash_hwnd = hdlg;
             ac_center_window(hdlg);
             ac_splist_hwnd = GetDlgItem(hdlg, IDL_INFO); 
             break;
      }
  
      return FALSE;
  }
  
  void acx_create_view(HWND hdlg, LPRECT pr, LPRECT pw)
  {
      LV_COLUMN lvc;
      int i;
      HIMAGELIST  imlist;
      HICON hicon; 
      imlist = ImageList_Create(16, 16, ILC_COLORDDB | ILC_MASK, 3, 0);
      hicon = LoadImage(ac_instance, MAKEINTRESOURCE(IDI_ICOI),
                        IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
      ImageList_AddIcon(imlist, hicon);
      hicon = LoadImage(ac_instance, MAKEINTRESOURCE(IDI_ICOW),
                        IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
      ImageList_AddIcon(imlist, hicon);
      hicon = LoadImage(ac_instance, MAKEINTRESOURCE(IDI_ICOS),
                        IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
      ImageList_AddIcon(imlist, hicon);
      
      ac_list_hwnd = CreateWindowEx(0L, WC_LISTVIEW, "", 
                                    WS_VISIBLE | WS_CHILD |
                                    LVS_REPORT | WS_EX_CLIENTEDGE,
                                    0, 0, pr->right - pr->left,
                                    pr->bottom - abs((pw->top - pw->bottom)),
                                    hdlg, NULL, ac_instance, NULL);
      lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;
      lvc.fmt  = LVCFMT_LEFT;
      
      ListView_SetImageList(ac_list_hwnd,imlist, LVSIL_SMALL);
      
      for (i = 0; i < sizeof(ac_columns) / sizeof(ac_columns[0]); ++i)  {
          lvc.iSubItem    = i;
          lvc.cx          = ac_columns[i].width;
          lvc.pszText     = ac_columns[i].label;
          ListView_InsertColumn(ac_list_hwnd, i, &lvc );
      }
  #ifdef LVS_EX_FULLROWSELECT
      ListView_SetExtendedListViewStyleEx(ac_list_hwnd, 0,
          LVS_EX_FULLROWSELECT |
          LVS_EX_INFOTIP);
  #endif
      
  }
  
  void acx_parse_list_string(const char *str)
  {
      int row = 0x7FFFFFFF;
      LV_ITEM lvi;
      int off = 0;
  
      if (isdigit(*str)) {
          char *p;
                  
          strncpy(ac_lv_clbuf, str, 1023);
          ac_lv_stat = p = &ac_lv_clbuf[0];
  
          while (*p && !isspace(*p))
              ++p;
          ++p;
          while (*p && !isspace(*p))
              ++p;
          *(p++) = 0;
          while (*p && isspace(*p))
              ++p;
          ac_lv_class = p;
  
          while (*p && !isspace(*p))
              ++p;
          *(p++) = 0;
          ac_lv_clmsg = p;
          
      }
      else {
          if (STRN_COMPARE(str, "INFO:")) {
              ac_lv_iicon = 0;
              off = STRN_SIZE("INFO:") + 1;
          }
          else if (STRN_COMPARE(str, "WARNING:")) {
              ac_lv_iicon = 1;
              off = STRN_SIZE("WARNING:") + 1;
          }
          else if (STRN_COMPARE(str, "ERROR:")) {
              ac_lv_iicon = 2;
              off = STRN_SIZE("ERROR:") + 1;
          }
          else if (STRN_COMPARE(str, "SEVERE:")) {
              ac_lv_iicon = 2;
              off = STRN_SIZE("SEVERE:") + 1;
          }
          ac_lv_clmsg = (char *)str + off;
  
          /* skip leading spaces */
          while (*ac_lv_clmsg && isspace(*ac_lv_clmsg))
              ++ac_lv_clmsg;
      }
  
      STR_NOT_NULL(ac_lv_class);
      STR_NOT_NULL(ac_lv_clmsg);
      STR_NOT_NULL(ac_lv_stat);
  
      memset(&lvi, 0, sizeof(LV_ITEM));
      lvi.mask        = LVIF_IMAGE | LVIF_TEXT;
      lvi.iItem       = ac_lview_current;
      lvi.iImage      = ac_lv_iicon;
      lvi.pszText     = ac_lv_stat;
      lvi.cchTextMax  = strlen(ac_lv_stat) + 1;
      row = ListView_InsertItem(ac_list_hwnd, &lvi);
      if (row == -1)
          return;
      ListView_SetItemText(ac_list_hwnd, row, 1, ac_lv_class); 
      ListView_SetItemText(ac_list_hwnd, row, 2, ac_lv_clmsg);
      ListView_EnsureVisible(ac_list_hwnd,
                                 ListView_GetItemCount(ac_list_hwnd) - 1,
                                 FALSE); 
  
      ac_lview_current++;
  }
  
  
  void acx_process_splash(const char *str)
  {
     /* set the status to 'green' when received Jk running 
      * and close the spash window if present
      */
      if (STRN_COMPARE(str, "INFO: Jk running")) {
          ac_show_try_icon(ac_main_hwnd, NIM_MODIFY, ac_cmdname, 0);
          /* kill the splash window if present */
          if (ac_splash_hwnd)
              EndDialog(ac_splash_hwnd, TRUE);
          ac_splash_hwnd = NULL;
      }
      else if (ac_splash_hwnd) {
          SendMessage(ac_splist_hwnd, LB_INSERTSTRING, 0, (LPARAM)str);
      }
  
  }
  
  void acx_create_spash(HWND hwnd)
  {
  
      if (ac_use_try) {
          DialogBox(ac_instance, MAKEINTRESOURCE(IDD_DLGSPLASH),
              hwnd, (DLGPROC)ac_splash_dlg_proc);
      }
  
  }
  
  void acx_close_spash()
  {
      if (ac_use_try && ac_splash_hwnd)
          EndDialog(ac_splash_hwnd, TRUE);
  }
  
  void acx_init_extended()
  {
      ac_use_lview = 1;
  }
  
  #endif
  
  
  
  1.1                  jakarta-tomcat-connectors/procrun/tomcat.dsp
  
  Index: tomcat.dsp
  ===================================================================
  # Microsoft Developer Studio Project File - Name="tomcat" - Package Owner=<4>
  # Microsoft Developer Studio Generated Build File, Format Version 6.00
  # ** DO NOT EDIT **
  
  # TARGTYPE "Win32 (x86) Application" 0x0101
  
  CFG=tomcat - Win32 Debug
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
  !MESSAGE 
  !MESSAGE NMAKE /f "tomcat.mak".
  !MESSAGE 
  !MESSAGE You can specify a configuration when running NMAKE
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
  !MESSAGE NMAKE /f "tomcat.mak" CFG="tomcat - Win32 Debug"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
  !MESSAGE "tomcat - Win32 Debug" (based on "Win32 (x86) Application")
  !MESSAGE "tomcat - Win32 Release" (based on "Win32 (x86) Application")
  !MESSAGE "tomcat - Win32 Debug CONSOLE" (based on "Win32 (x86) Application")
  !MESSAGE "tomcat - Win32 Release CONSOLE" (based on "Win32 (x86) Application")
  !MESSAGE "tomcat - Win32 DebugDLL" (based on "Win32 (x86) Application")
  !MESSAGE "tomcat - Win32 ReleaseDLL" (based on "Win32 (x86) Application")
  !MESSAGE 
  
  # Begin Project
  # PROP AllowPerConfigDependencies 0
  # PROP Scc_ProjName ""
  # PROP Scc_LocalPath ""
  CPP=cl.exe
  MTL=midl.exe
  RSC=rc.exe
  
  !IF  "$(CFG)" == "tomcat - Win32 Debug"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 1
  # PROP BASE Output_Dir "Debug"
  # PROP BASE Intermediate_Dir "Debug"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
  # PROP Output_Dir "Debug"
  # PROP Intermediate_Dir "Debug"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_WIN32" /D "WIN32" /D "_DEBUG" /D "_DEBUG_TRACE" /D "_WINDOWS" /D "STRICT" /D _WIN32_WINNT=0x0400 /D "PROCRUN_WINAPP" /D "_MBCS" /GZ PRECOMP_VC7_TOBEREMOVED /c
  # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_WIN32" /D "WIN32" /D "_DEBUG" /D "_DEBUG_TRACE" /D "_WINDOWS" /D "STRICT" /D _WIN32_WINNT=0x0400 /D "PROCRUN_WINAPP" /D "_MBCS" /D "PROCRUN_EXTENDED" /GZ /c
  # ADD BASE MTL /nologo /win32
  # ADD MTL /nologo /win32
  # ADD BASE RSC /l 0x409 /d "_MSC_VER"
  # ADD RSC /l 0x409 /d "_MSC_VER" /d "PROCRUN_EXTENDED"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"Debug\tomcatw.exe" /pdbtype:sept
  # SUBTRACT BASE LINK32 /pdb:none
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"Debug\tomcatw.exe" /pdbtype:sept
  # SUBTRACT LINK32 /pdb:none
  
  !ELSEIF  "$(CFG)" == "tomcat - Win32 Release"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "Release"
  # PROP BASE Intermediate_Dir "Release"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "Release"
  # PROP Intermediate_Dir "Release"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MT /W3 /GX /Zi /O2 /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_WIN32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "STRICT" /D _WIN32_WINNT=0x0400 /D "PROCRUN_WINAPP" /D "_MBCS" /GF PRECOMP_VC7_TOBEREMOVED /c
  # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_WIN32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "STRICT" /D _WIN32_WINNT=0x0400 /D "PROCRUN_WINAPP" /D "_MBCS" /D "PROCRUN_EXTENDED" /GF /c
  # ADD BASE MTL /nologo /win32
  # ADD MTL /nologo /win32
  # ADD BASE RSC /l 0x409 /d "_MSC_VER"
  # ADD RSC /l 0x409 /d "_MSC_VER" /d "PROCRUN_EXTENDED"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"bin\tomcatw.exe" /pdbtype:sept /opt:ref /opt:icf
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"bin\tomcatw.exe" /pdbtype:sept /opt:ref /opt:icf
  
  !ELSEIF  "$(CFG)" == "tomcat - Win32 Debug CONSOLE"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 1
  # PROP BASE Output_Dir "DebugCONSOLE"
  # PROP BASE Intermediate_Dir "DebugCONSOLE"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
  # PROP Output_Dir "DebugCONSOLE"
  # PROP Intermediate_Dir "DebugCONSOLE"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_WIN32" /D "WIN32" /D "_DEBUG" /D "_DEBUG_TRACE" /D "_CONSOLE" /D "STRICT" /D _WIN32_WINNT=0x0400 /D "PROCRUN_CONSOLE" /D "_MBCS" /GZ PRECOMP_VC7_TOBEREMOVED /c
  # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_WIN32" /D "WIN32" /D "_DEBUG" /D "_DEBUG_TRACE" /D "_CONSOLE" /D "STRICT" /D _WIN32_WINNT=0x0400 /D "PROCRUN_CONSOLE" /D "_MBCS" /GZ /c
  # ADD BASE MTL /nologo /win32
  # ADD MTL /nologo /win32
  # ADD BASE RSC /l 0x409
  # ADD RSC /l 0x409 /d "PROCRUN_EXTENDED"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept
  # SUBTRACT BASE LINK32 /pdb:none
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept
  # SUBTRACT LINK32 /pdb:none
  
  !ELSEIF  "$(CFG)" == "tomcat - Win32 Release CONSOLE"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "ReleaseCONSOLE"
  # PROP BASE Intermediate_Dir "ReleaseCONSOLE"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "ReleaseCONSOLE"
  # PROP Intermediate_Dir "ReleaseCONSOLE"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MT /W3 /GX /Zi /O2 /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_WIN32" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "STRICT" /D _WIN32_WINNT=0x0400 /D "PROCRUN_CONSOLE" /D "_MBCS" /GF PRECOMP_VC7_TOBEREMOVED /c
  # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_WIN32" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "STRICT" /D _WIN32_WINNT=0x0400 /D "PROCRUN_CONSOLE" /D "_MBCS" /D "PROCRUN_EXTEND" /GF /c
  # ADD BASE MTL /nologo /win32
  # ADD MTL /nologo /win32
  # ADD BASE RSC /l 0x409
  # ADD RSC /l 0x409 /d "PROCRUN_EXTENDED"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:console /debug /machine:IX86 /out:"bin\tomcat.exe" /pdbtype:sept /opt:ref /opt:icf
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:console /debug /machine:IX86 /out:"bin\tomcat.exe" /pdbtype:sept /opt:ref /opt:icf
  
  !ELSEIF  "$(CFG)" == "tomcat - Win32 DebugDLL"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 1
  # PROP BASE Output_Dir "DebugDLL"
  # PROP BASE Intermediate_Dir "DebugDLL"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
  # PROP Output_Dir "DebugDLL"
  # PROP Intermediate_Dir "DebugDLL"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_WIN32" /D "WIN32" /D "_DEBUG" /D "_DEBUG_TRACE" /D "_WINDOWS" /D "STRICT" /D _WIN32_WINNT=0x0400 /D "PROCRUN_WINDLL" /D "_MBCS" /GZ PRECOMP_VC7_TOBEREMOVED /c
  # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_WIN32" /D "WIN32" /D "_DEBUG" /D "_DEBUG_TRACE" /D "_WINDOWS" /D "STRICT" /D _WIN32_WINNT=0x0400 /D "PROCRUN_WINDLL" /D "_MBCS" /GZ /c
  # ADD BASE MTL /nologo /win32
  # ADD MTL /nologo /win32
  # ADD BASE RSC /l 0x409
  # ADD RSC /l 0x409 /d "PROCRUN_EXTENDED"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /pdbtype:sept
  # SUBTRACT BASE LINK32 /pdb:none
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /out:"DebugDLL/tomcat.cpl" /pdbtype:sept
  # SUBTRACT LINK32 /pdb:none
  
  !ELSEIF  "$(CFG)" == "tomcat - Win32 ReleaseDLL"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "ReleaseDLL"
  # PROP BASE Intermediate_Dir "ReleaseDLL"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "ReleaseDLL"
  # PROP Intermediate_Dir "ReleaseDLL"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MT /W3 /GX /Zi /O2 /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_WIN32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "STRICT" /D _WIN32_WINNT=0x0400 /D "PROCRUN_WINDLL" /D "_MBCS" /GF PRECOMP_VC7_TOBEREMOVED /c
  # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_WIN32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "STRICT" /D _WIN32_WINNT=0x0400 /D "PROCRUN_WINDLL" /D "_MBCS" /GF /c
  # ADD BASE MTL /nologo /win32
  # ADD MTL /nologo /win32
  # ADD BASE RSC /l 0x409
  # ADD RSC /l 0x409 /d "PROCRUN_EXTENDED"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /out:"bin\tomcat.dll" /pdbtype:sept /opt:ref /opt:icf
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /out:"bin\tomcat.cpl" /pdbtype:sept /opt:ref /opt:icf
  
  !ENDIF 
  
  # Begin Target
  
  # Name "tomcat - Win32 Debug"
  # Name "tomcat - Win32 Release"
  # Name "tomcat - Win32 Debug CONSOLE"
  # Name "tomcat - Win32 Release CONSOLE"
  # Name "tomcat - Win32 DebugDLL"
  # Name "tomcat - Win32 ReleaseDLL"
  # Begin Group "Source Files"
  
  # PROP Default_Filter "cpp;c;cxx;def;odl;idl;hpj;bat;asm"
  # Begin Source File
  
  SOURCE=procgui.c
  DEP_CPP_PROCG=\
  	".\extend.h"\
  	".\procrun.h"\
  	"C:\DEVTOOLS\JAVA\142\include\jni.h"\
  	"C:\DEVTOOLS\JAVA\142\include\win32\jni_md.h"\
  	
  # End Source File
  # Begin Source File
  
  SOURCE=.\procrun.c
  DEP_CPP_PROCR=\
  	".\extend.h"\
  	".\procrun.h"\
  	"C:\DEVTOOLS\JAVA\142\include\jni.h"\
  	"C:\DEVTOOLS\JAVA\142\include\win32\jni_md.h"\
  	
  # End Source File
  # Begin Source File
  
  SOURCE=tomcat.c
  DEP_CPP_TOMCA=\
  	".\extend.h"\
  	".\procrun.h"\
  	"C:\DEVTOOLS\JAVA\142\include\jni.h"\
  	"C:\DEVTOOLS\JAVA\142\include\win32\jni_md.h"\
  	
  # End Source File
  # End Group
  # Begin Group "Header Files"
  
  # PROP Default_Filter "h;hpp;hxx;hm;inl;inc"
  # Begin Source File
  
  SOURCE=.\extend.h
  # End Source File
  # Begin Source File
  
  SOURCE=.\procrun.h
  # End Source File
  # End Group
  # Begin Group "Resource Files"
  
  # PROP Default_Filter "rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
  # Begin Source File
  
  SOURCE=.\icoi.ico
  # End Source File
  # Begin Source File
  
  SOURCE=.\icos.ico
  # End Source File
  # Begin Source File
  
  SOURCE=.\icow.ico
  # End Source File
  # Begin Source File
  
  SOURCE="jakarta-banner.bmp"
  # End Source File
  # Begin Source File
  
  SOURCE=proctry.ico
  # End Source File
  # Begin Source File
  
  SOURCE=.\tomcat.rc
  # End Source File
  # Begin Source File
  
  SOURCE=tomcatp.ico
  # End Source File
  # Begin Source File
  
  SOURCE=tomcatr.ico
  # End Source File
  # Begin Source File
  
  SOURCE=.\tomcats.ico
  # End Source File
  # End Group
  # Begin Source File
  
  SOURCE=License.rtf
  # End Source File
  # End Target
  # End Project
  
  
  
  1.1                  jakarta-tomcat-connectors/procrun/tomcat.dsw
  
  Index: tomcat.dsw
  ===================================================================
  Microsoft Developer Studio Workspace File, Format Version 6.00
  # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
  
  ###############################################################################
  
  Project: "tomcat"=.\tomcat.dsp - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
  }}}
  
  ###############################################################################
  
  Global:
  
  Package=<5>
  {{{
  }}}
  
  Package=<3>
  {{{
  }}}
  
  ###############################################################################
  
  
  
  
  1.1                  jakarta-tomcat-connectors/procrun/tomcat.rc
  
  Index: tomcat.rc
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   * Portions of this software are based upon public domain software
   * originally written at the National Center for Supercomputing Applications,
   * University of Illinois, Urbana-Champaign.
   */
   
  #include "procrun.h"
  #include "windows.h"
  
  IDI_ICOI               ICON                    "icoi.ico"
  IDI_ICOS               ICON                    "icos.ico"
  IDI_ICOW               ICON                    "icow.ico"
  
  IDI_ICOCONWRAP         ICON                    "tomcatp.ico"
  IDI_ICOCONTRY          ICON                    "tomcatr.ico"
  IDI_ICOCONTRYSTOP      ICON                    "tomcats.ico"
  
  #ifdef _MSC_VER
  IDB_BMPSPLASH          BITMAP   DISCARDABLE    "splash.bmp"
  #endif
  
  #include "procrun.rc"
  
  IDD_DLGSPLASH DIALOGEX 0, 0, 322, 151
  STYLE DS_SYSMODAL | DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | 
      WS_BORDER
  EXSTYLE WS_EX_TOPMOST
  FONT 8, "Microsoft Sans Serif", 400, 0, 0x0
  BEGIN
      LISTBOX         IDL_INFO,7,126,217,9, LBS_NOINTEGRALHEIGHT | 
                      LBS_NOSEL | NOT WS_BORDER | NOT LBS_USETABSTOPS
      CONTROL         IDB_BMPSPLASH,IDC_STATIC,"Static",SS_BITMAP |
                      SS_CENTERIMAGE,0,0,322,151
  END
  
  
  
  1.1                  jakarta-tomcat-connectors/procrun/tomcatp.ico
  
  	<<Binary file>>
  
  
  1.1                  jakarta-tomcat-connectors/procrun/tomcatr.ico
  
  	<<Binary file>>
  
  
  1.1                  jakarta-tomcat-connectors/procrun/tomcats.ico
  
  	<<Binary file>>
  
  

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