commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r981469 - in /commons/proper/daemon/trunk: ./ src/native/nt/procrun/apps/prunmgr/ src/native/nt/procrun/apps/prunsrv/ src/native/unix/native/
Date Mon, 02 Aug 2010 12:04:08 GMT
Author: mturk
Date: Mon Aug  2 12:04:07 2010
New Revision: 981469

URL: http://svn.apache.org/viewvc?rev=981469&view=rev
Log:
Promote trunk to 1.0.4-dev

Modified:
    commons/proper/daemon/trunk/RELEASE-NOTES.txt
    commons/proper/daemon/trunk/build.xml
    commons/proper/daemon/trunk/pom.xml
    commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.h
    commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.rc
    commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.h
    commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.rc
    commons/proper/daemon/trunk/src/native/unix/native/version.h

Modified: commons/proper/daemon/trunk/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/RELEASE-NOTES.txt?rev=981469&r1=981468&r2=981469&view=diff
==============================================================================
--- commons/proper/daemon/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/trunk/RELEASE-NOTES.txt Mon Aug  2 12:04:07 2010
@@ -1,7 +1,7 @@
 $Id$
 
             Commons Daemon Package
-               Version 1.0.3
+               Version 1.0.4
                 Release Notes
 
 
@@ -41,6 +41,8 @@ NEW FEATURES:
 
 BUG FIXES:
 
+1.0.4:
+
 1.0.3: DAEMON-108, DAEMON-128, DAEMON-139, DAEMON-143, DAEMON-148,
        DAEMON-135, DAEMON-155, DAEMON-159, DAEMON-161, DAEMON-145, DAEMON-146,
        DAEMON-167, DAEMON-168

Modified: commons/proper/daemon/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/build.xml?rev=981469&r1=981468&r2=981469&view=diff
==============================================================================
--- commons/proper/daemon/trunk/build.xml (original)
+++ commons/proper/daemon/trunk/build.xml Mon Aug  2 12:04:07 2010
@@ -59,7 +59,7 @@
   <property name="component.title"         value="Java Daemons"/>
 
   <!-- The current version number of this component -->
-  <property name="component.version"       value="1.0.3"/>
+  <property name="component.version"       value="1.0.4-dev"/>
 
   <!-- The base directory for compilation targets -->
   <property name="build.home"              value="target"/>

Modified: commons/proper/daemon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/pom.xml?rev=981469&r1=981468&r2=981469&view=diff
==============================================================================
--- commons/proper/daemon/trunk/pom.xml (original)
+++ commons/proper/daemon/trunk/pom.xml Mon Aug  2 12:04:07 2010
@@ -27,7 +27,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.commons</groupId>
   <artifactId>commons-daemon</artifactId>
-  <version>1.0.3</version>
+  <version>1.0.4-dev</version>
   <name>Commons Daemon</name>
   <!-- Daemon started in Commons in 2002 with an import of code from Tomcat,
        which is why the NOTICE file has an earlier date than the inceptionYear -->
@@ -92,10 +92,10 @@
     <maven.compile.source>1.3</maven.compile.source>
     <maven.compile.target>1.3</maven.compile.target>
     <commons.componentid>daemon</commons.componentid>
-    <commons.release.version>1.0.3</commons.release.version>
+    <commons.release.version>1.0.4-dev</commons.release.version>
     <commons.jira.id>DAEMON</commons.jira.id>
     <commons.jira.pid>12310468</commons.jira.pid>
-  </properties> 
+  </properties>
 
   <build>
     <sourceDirectory>src/java</sourceDirectory>

Modified: commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.h
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.h?rev=981469&r1=981468&r2=981469&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.h (original)
+++ commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.h Mon Aug  2 12:04:07
2010
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+
 /* ====================================================================
  * Contributed by Mladen Turk <mturk@apache.org>
  * 05 Aug 2003
- * ==================================================================== 
+ * ====================================================================
  */
 
 #ifndef _PRUNMGR_H
 #define _PRUNMGR_H
 
 #undef  PRG_VERSION
-#define PRG_VERSION    "1.0.3.0" 
+#define PRG_VERSION    "1.0.4.0"
 #define PRG_REGROOT   L"Apache Software Foundation\\Procrun 2.0"
 
 #define IDM_TM_EXIT                     2000
@@ -136,6 +136,6 @@
 #define IDS_ERRSREG                     3122
 
 #define IDS_NOTIMPLEMENTED              3199
- 
+
 #endif /* _PRUNMGR_H */
 

Modified: commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.rc
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.rc?rev=981469&r1=981468&r2=981469&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.rc (original)
+++ commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.rc Mon Aug  2 12:04:07
2010
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+
 #include "apxwin.h"
 #include "prunmgr.h"
 
 #define RSTR_PSM        "Commons Daemon Service Manager"
 #define RSTR_SCMATS     "Service Manager is attempting to "
- 
-IDI_MAINICON         ICON                   "../../resources/procrunw.ico" 
-IDI_ICONSTOP         ICON                   "../../resources/procruns.ico" 
-IDI_ICONRUN          ICON                   "../../resources/procrunr.ico" 
+
+IDI_MAINICON         ICON                   "../../resources/procrunw.ico"
+IDI_ICONSTOP         ICON                   "../../resources/procruns.ico"
+IDI_ICONRUN          ICON                   "../../resources/procrunr.ico"
 IDR_LICENSE          RTF                    "../../resources/license.rtf"
 BMP_JAKARTA          BITMAP                 "../../resources/commons.bmp"
 
-#if 0 
+#if 0
 BMP_APMNUHDR         BITMAP                 "../../resources/apmnuhdr.bmp"
 #endif
 
@@ -38,17 +38,17 @@ CAPTION "Apache Service Manager"
 FONT 8, "Microsoft Sans Serif", 400, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "&OK",IDOK,285,150,50,14
-    CONTROL         "",IDC_LICENSE,"RichEdit20A",ES_MULTILINE | 
+    CONTROL         "",IDC_LICENSE,"RichEdit20A",ES_MULTILINE |
                     ES_READONLY | WS_BORDER | WS_VSCROLL,0,31,335,115
     CONTROL         "BMP_JAKARTA",IDC_STATIC,"Static",SS_BITMAP|0x00000040L,0,0,337,30
     LTEXT           " ",IDC_ABOUTAPP,2,150,270,12
-    LTEXT           "Copyright © 2000-2010 The Apache Software Foundation.",IDC_STATIC,2,160,270,12
-    LTEXT           "http://commons.apache.org",IDC_STATIC,2,170,270,12 
+    LTEXT           "Copyright � 2000-2010 The Apache Software Foundation.",IDC_STATIC,2,160,270,12
+    LTEXT           "http://commons.apache.org",IDC_STATIC,2,170,270,12
     PUSHBUTTON      "&System Info",IAB_SYSINF,285,170,50,14
 END
 
 IDD_PROGRESS DIALOGEX 0, 0, 322, 92
-STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | 
+STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP |
     WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_TOPMOST
 CAPTION "Apache Commons Daemon Service Manager"
@@ -62,7 +62,7 @@ BEGIN
     CONTROL         "",IDDP_PROGRESS,"msctls_progress32",WS_BORDER,10,50,302,
                     14
     ICON            IDI_MAINICON,IDC_STATIC,10,4,20,20,0,WS_EX_TRANSPARENT
-END 
+END
 
 IDD_SELUSER DIALOGEX 0, 0, 410, 201
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU |
@@ -76,10 +76,10 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,292,180,50,14,WS_DISABLED
     PUSHBUTTON      "Cancel",IDCANCEL,348,180,50,14
     LTEXT           "Look In:",IDC_STATIC,10,9,27,8
-    CONTROL         "",IDSU_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | 
-                    LVS_SORTASCENDING | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | WS_BORDER |

+    CONTROL         "",IDSU_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL |
+                    LVS_SORTASCENDING | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | WS_BORDER |
                     WS_TABSTOP,0,26,410,149,WS_EX_CLIENTEDGE
-    CONTROL         "",IDSU_COMBO,"ComboBoxEx32",CBS_DROPDOWNLIST | 
+    CONTROL         "",IDSU_COMBO,"ComboBoxEx32",CBS_DROPDOWNLIST |
                     WS_VSCROLL | WS_TABSTOP,47,6,260,80
 END
 
@@ -96,9 +96,9 @@ BEGIN
     LTEXT           "Pat&h to executable:",IDC_STATIC,10,63,66,8
     EDITTEXT        IDC_PPSGDEXE,10,75,240,12,ES_AUTOHSCROLL | WS_DISABLED
     LTEXT           "Startup typ&e:",IDC_STATIC,10,94,46,8
-    COMBOBOX        IDC_PPSGCMBST,70,93,180,80,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    COMBOBOX        IDC_PPSGCMBST,70,93,180,80,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,10,128,240,1                   

+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,10,128,240,1
     LTEXT           "Service Status:",IDC_STATIC,10,138,52,8
     LTEXT           "  ",IDC_PPSGSTATUS,70,138,240,8
     PUSHBUTTON      "&Start",IDC_PPSGSTART,10,160,55,14,WS_DISABLED
@@ -131,23 +131,23 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHIL
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT           "&Level:",IDC_STATIC,10,18,46,8
-    COMBOBOX        IDC_PPLGLEVEL,70,17,180,80,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    COMBOBOX        IDC_PPLGLEVEL,70,17,180,80,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
     LTEXT           "Log &path: ",IDC_STATIC,10,33,50,8
     EDITTEXT        IDC_PPLGPATH,10,45,218,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_PPLGBPATH,232,44,18,14 
+    PUSHBUTTON      "...",IDC_PPLGBPATH,232,44,18,14
     LTEXT           "Log prefix: ",IDC_STATIC,10,63,50,8
     EDITTEXT        IDC_PPLGPREFIX,70,62,158,12,ES_AUTOHSCROLL
 
     LTEXT           "Pid file: ",IDC_STATIC,10,81,50,8
     EDITTEXT        IDC_PPLGPIDFILE,70,82,158,12,ES_AUTOHSCROLL
-    
+
     LTEXT           "Redirect Stdout: ",IDC_STATIC,10,105,80,8
     EDITTEXT        IDC_PPLGSTDOUT,10,117,218,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_PPLGBSTDOUT,232,116,18,14 
+    PUSHBUTTON      "...",IDC_PPLGBSTDOUT,232,116,18,14
     LTEXT           "Redirect Stderror: ",IDC_STATIC,10,135,80,8
     EDITTEXT        IDC_PPLGSTDERR,10,147,218,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_PPLGBSTDERR,232,146,18,14 
+    PUSHBUTTON      "...",IDC_PPLGBSTDERR,232,146,18,14
 END
 
 IDD_PROPPAGE_JVM DIALOGEX 0, 0, 260, 186
@@ -158,11 +158,11 @@ BEGIN
                     WS_TABSTOP,10,8,72,12
     LTEXT           "Java Virtual Machine: ",IDC_STATIC,10,23,80,8
     EDITTEXT        IDC_PPJJVM,10,35,218,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_PPJBJVM,232,34,18,14 
+    PUSHBUTTON      "...",IDC_PPJBJVM,232,34,18,14
     LTEXT           "Java Classpath:",IDC_STATIC,10,53,66,8
     EDITTEXT        IDC_PPJCLASSPATH,10,65,240,12,ES_AUTOHSCROLL
     LTEXT           "Java Options:",IDC_STATIC,10,83,66,8
-    EDITTEXT        IDC_PPJOPTIONS,10,95,240,40,ES_MULTILINE | ES_AUTOHSCROLL | 
+    EDITTEXT        IDC_PPJOPTIONS,10,95,240,40,ES_MULTILINE | ES_AUTOHSCROLL |
                     ES_WANTRETURN | WS_VSCROLL
     LTEXT           "Initial memory pool:",IDC_STATIC,10,140,80,8
     EDITTEXT        IDC_PPJMS,90,139,100,12,ES_AUTOHSCROLL | ES_NUMBER
@@ -183,20 +183,20 @@ BEGIN
     EDITTEXT        IDC_PPRCLASS,10,20,240,12,ES_AUTOHSCROLL
     LTEXT           "Image: ",IDC_STATIC,10,38,80,8
     EDITTEXT        IDC_PPRIMAGE,10,50,218,12,ES_AUTOHSCROLL | WS_DISABLED
-    PUSHBUTTON      "...",IDC_PPRBIMAGE,232,49,18,14,WS_DISABLED 
+    PUSHBUTTON      "...",IDC_PPRBIMAGE,232,49,18,14,WS_DISABLED
     LTEXT           "Working Path: ",IDC_STATIC,10,68,80,8
     EDITTEXT        IDC_PPRWPATH,10,80,218,12,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_PPRBWPATH,232,79,18,14
     LTEXT           "&Method: ",IDC_STATIC,10,98,50,8
     EDITTEXT        IDC_PPRMETHOD,70,97,180,12,ES_AUTOHSCROLL
     LTEXT           "&Arguments: ",IDC_STATIC,10,115,50,8
-    EDITTEXT        IDC_PPRARGS,70,114,180,30,ES_MULTILINE | ES_AUTOHSCROLL | 
+    EDITTEXT        IDC_PPRARGS,70,114,180,30,ES_MULTILINE | ES_AUTOHSCROLL |
                     ES_WANTRETURN | WS_VSCROLL
     LTEXT           "&Timeout: ",IDC_STATIC,10,150,50,8
     EDITTEXT        IDC_PPRTIMEOUT,70,149,100,12,ES_AUTOHSCROLL | WS_DISABLED
     LTEXT           "sec.",IDC_STATIC,175,150,25,8
     LTEXT           "&Mode: ",IDC_STATIC,10,168,50,8
-    COMBOBOX        IDC_PPRMODE,70,167,180,80,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    COMBOBOX        IDC_PPRMODE,70,167,180,80,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
 END
 
@@ -208,29 +208,29 @@ BEGIN
     EDITTEXT        IDC_PPSCLASS,10,20,240,12,ES_AUTOHSCROLL
     LTEXT           "Image: ",IDC_STATIC,10,38,80,8
     EDITTEXT        IDC_PPSIMAGE,10,50,218,12,ES_AUTOHSCROLL | WS_DISABLED
-    PUSHBUTTON      "...",IDC_PPSBIMAGE,232,49,18,14,WS_DISABLED 
+    PUSHBUTTON      "...",IDC_PPSBIMAGE,232,49,18,14,WS_DISABLED
     LTEXT           "Working Path: ",IDC_STATIC,10,68,80,8
     EDITTEXT        IDC_PPSWPATH,10,80,218,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_PPSBWPATH,232,79,18,14 
+    PUSHBUTTON      "...",IDC_PPSBWPATH,232,79,18,14
     LTEXT           "&Method: ",IDC_STATIC,10,98,50,8
     EDITTEXT        IDC_PPSMETHOD,70,97,180,12,ES_AUTOHSCROLL
     LTEXT           "&Arguments: ",IDC_STATIC,10,115,50,8
-    EDITTEXT        IDC_PPSARGS,70,114,180,30,ES_MULTILINE | ES_AUTOHSCROLL | 
+    EDITTEXT        IDC_PPSARGS,70,114,180,30,ES_MULTILINE | ES_AUTOHSCROLL |
                     ES_WANTRETURN | WS_VSCROLL
     LTEXT           "&Timeout: ",IDC_STATIC,10,150,50,8
     EDITTEXT        IDC_PPSTIMEOUT,70,149,100,12,ES_AUTOHSCROLL | ES_NUMBER
     LTEXT           "sec.",IDC_STATIC,175,150,25,8
     LTEXT           "&Mode: ",IDC_STATIC,10,168,50,8
-    COMBOBOX        IDC_PPSMODE,70,167,180,80,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    COMBOBOX        IDC_PPSMODE,70,167,180,80,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_APPLICATION     RSTR_PSM
-    IDS_APPVERSION      "Version 1.0.3"
+    IDS_APPVERSION      "Version 1.0.4"
     IDS_APPFULLNAME     RSTR_PSM " Version " PRG_VERSION
-    IDS_APPCOPYRIGHT    "Copyright © 2000-2010 The Apache Software Foundation"
+    IDS_APPCOPYRIGHT    "Copyright � 2000-2010 The Apache Software Foundation"
     IDS_APPDESCRIPTION  "Apache Commons Daemon Service Management Tool"
     IDS_ALREAY_RUNING   "An instance of '%S' application is already running"
     IDS_ERRORCMD        "Unknown command line option '%s'\nSee the manual for command line
usage."
@@ -238,29 +238,29 @@ BEGIN
     IDS_HSSTOP          RSTR_SCMATS "stop the following service ..."
     IDS_HSRESTART       RSTR_SCMATS "to restart the following service ..."
     IDS_HSPAUSE         RSTR_SCMATS "to pause the following service ..."
-    IDS_VALIDPASS       "Please enter a valid password"    
+    IDS_VALIDPASS       "Please enter a valid password"
     IDS_PPGENERAL       "General"
     IDS_PPLOGON         "Log On"
     IDS_PPLOGGING       "Logging"
     IDS_PPJAVAVM        "Java"
     IDS_PPSTART         "Startup"
     IDS_PPSTOP          "Shutdown"
-    IDS_NOTIMPLEMENTED  "Sorry, but this feature is not implemented yet"         
+    IDS_NOTIMPLEMENTED  "Sorry, but this feature is not implemented yet"
     IDS_LGPATHTITLE     "Select Log root folder"
     IDS_ALLFILES        "All Files (*.*)\0*.*\0"
     IDS_DLLFILES        "Dynamic Link Libraries (*.dll)\0*.dll\0"
     IDS_EXEFILES        "Executables (*.exe)\0*.exe\0"
     IDS_LGSTDOUT        "Select Stdoutput filename"
     IDS_LGSTDERR        "Select Stderror filename"
-    IDS_PPJBJVM         "Select Java Virtual Machine DLL"    
-    IDS_PPWPATH         "Select Working path"    
-    IDS_PPIMAGE         "Select Executable Image"    
+    IDS_PPJBJVM         "Select Java Virtual Machine DLL"
+    IDS_PPWPATH         "Select Working path"
+    IDS_PPIMAGE         "Select Executable Image"
     IDS_ERRSREG         "Unable to open the service registry key"
 END
 
 1 VERSIONINFO
- FILEVERSION 1,0,3,0
- PRODUCTVERSION 1,0,3,0
+ FILEVERSION 1,0,4,0
+ PRODUCTVERSION 1,0,4,0
  FILEFLAGSMASK 0x3fL
 #if defined(_DEBUG)
  FILEFLAGS 0x03L
@@ -280,7 +280,7 @@ BEGIN
       VALUE "FileDescription", RSTR_PSM "\0"
       VALUE "FileVersion", PRG_VERSION
       VALUE "InternalName", RSTR_PSM "\0"
-      VALUE "LegalCopyright", "Copyright © 2000-2010 The Apache Software Foundation.\0"
+      VALUE "LegalCopyright", "Copyright � 2000-2010 The Apache Software Foundation.\0"
       VALUE "OriginalFilename", "prunmgr.exe\0"
       VALUE "ProductName", RSTR_PSM "\0"
       VALUE "ProductVersion", PRG_VERSION

Modified: commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.h
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.h?rev=981469&r1=981468&r2=981469&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.h (original)
+++ commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.h Mon Aug  2 12:04:07
2010
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+
 /* ====================================================================
  * jar2exe -- convert .jar file to WIN32 executable.
  * Contributed by Mladen Turk <mturk@apache.org>
  * 05 Aug 2003
- * ==================================================================== 
+ * ====================================================================
  */
 
 #ifndef _PRUNSRV_H
 #define _PRUNSRV_H
 
 #undef  PRG_VERSION
-#define PRG_VERSION    "1.0.3.0" 
+#define PRG_VERSION    "1.0.4.0"
 #define PRG_REGROOT   L"Apache Software Foundation\\Procrun 2.0"
 
 #endif /* _PRUNSRV_H */

Modified: commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.rc
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.rc?rev=981469&r1=981468&r2=981469&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.rc (original)
+++ commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.rc Mon Aug  2 12:04:07
2010
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+
 #include "apxwin.h"
 #include "prunsrv.h"
 
 #define RSTR_PRUNSRV "Commons Daemon Service Runner"
 
-IDI_MAINICON         ICON                   "../../resources/procrunw.ico" 
+IDI_MAINICON         ICON                   "../../resources/procrunw.ico"
 
 1 VERSIONINFO
- FILEVERSION 1,0,3,0
- PRODUCTVERSION 1,0,3,0
+ FILEVERSION 1,0,4,0
+ PRODUCTVERSION 1,0,4,0
  FILEFLAGSMASK 0x3fL
 #if defined(_DEBUG)
  FILEFLAGS 0x03L
@@ -43,7 +43,7 @@ BEGIN
       VALUE "FileDescription", RSTR_PRUNSRV "\0"
       VALUE "FileVersion", PRG_VERSION
       VALUE "InternalName", RSTR_PRUNSRV "\0"
-      VALUE "LegalCopyright", "Copyright © 2000-2010 The Apache Software Foundation.\0"
+      VALUE "LegalCopyright", "Copyright � 2000-2010 The Apache Software Foundation.\0"
       VALUE "OriginalFilename", "prunsrv.exe\0"
       VALUE "ProductName", RSTR_PRUNSRV "\0"
       VALUE "ProductVersion", PRG_VERSION

Modified: commons/proper/daemon/trunk/src/native/unix/native/version.h
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/native/version.h?rev=981469&r1=981468&r2=981469&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/native/version.h (original)
+++ commons/proper/daemon/trunk/src/native/unix/native/version.h Mon Aug  2 12:04:07 2010
@@ -31,13 +31,13 @@
 #define JSVC_MINOR_VERSION      0
 
 /** patch level */
-#define JSVC_PATCH_VERSION      3
+#define JSVC_PATCH_VERSION      4
 
 /**
  *  This symbol is defined for internal, "development" copies of JSVC.
  *  This symbol will be #undef'd for releases.
  */
-#define JSVC_IS_DEV_VERSION     0
+#define JSVC_IS_DEV_VERSION     1
 
 /** Properly quote a value as a string in the C preprocessor */
 #define JSVC_STRINGIFY(n) JSVC_STRINGIFY_HELPER(n)



Mime
View raw message