You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2012/02/01 15:08:45 UTC

svn commit: r1239137 - in /commons/proper/daemon/branches/1.0.x: NOTICE.txt src/native/windows/apps/prunmgr/prunmgr.rc src/native/windows/apps/prunsrv/prunsrv.c src/native/windows/apps/prunsrv/prunsrv.h src/native/windows/apps/prunsrv/prunsrv.rc

Author: mturk
Date: Wed Feb  1 14:08:44 2012
New Revision: 1239137

URL: http://svn.apache.org/viewvc?rev=1239137&view=rev
Log:
Update version,year and backport typo fix from trunk

Modified:
    commons/proper/daemon/branches/1.0.x/NOTICE.txt
    commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.rc
    commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c
    commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.h
    commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.rc

Modified: commons/proper/daemon/branches/1.0.x/NOTICE.txt
URL: http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/NOTICE.txt?rev=1239137&r1=1239136&r2=1239137&view=diff
==============================================================================
--- commons/proper/daemon/branches/1.0.x/NOTICE.txt (original)
+++ commons/proper/daemon/branches/1.0.x/NOTICE.txt Wed Feb  1 14:08:44 2012
@@ -1,5 +1,5 @@
 Apache Commons Daemon
-Copyright 1999-2011 The Apache Software Foundation
+Copyright 1999-2012 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

Modified: commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.rc
URL: http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.rc?rev=1239137&r1=1239136&r2=1239137&view=diff
==============================================================================
--- commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.rc (original)
+++ commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.rc Wed Feb  1 14:08:44 2012
@@ -228,9 +228,9 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPLICATION     RSTR_PSM
-    IDS_APPVERSION      "Version 1.0.8"
+    IDS_APPVERSION      "Version 1.0.9"
     IDS_APPFULLNAME     RSTR_PSM " Version " PRG_VERSION
-    IDS_APPCOPYRIGHT    "Copyright (c) 2000-2011 The Apache Software Foundation"
+    IDS_APPCOPYRIGHT    "Copyright (c) 2000-2012 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."
@@ -259,8 +259,8 @@ BEGIN
 END
 
 1 VERSIONINFO
- FILEVERSION 1,0,8,0
- PRODUCTVERSION 1,0,8,0
+ FILEVERSION 1,0,9,0
+ PRODUCTVERSION 1,0,9,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 (c) 2000-2011 The Apache Software Foundation.\0"
+      VALUE "LegalCopyright", "Copyright (c) 2000-2012 The Apache Software Foundation.\0"
       VALUE "OriginalFilename", "prunmgr.exe\0"
       VALUE "ProductName", RSTR_PSM "\0"
       VALUE "ProductVersion", PRG_VERSION

Modified: commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c?rev=1239137&r1=1239136&r2=1239137&view=diff
==============================================================================
--- commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c (original)
+++ commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c Wed Feb  1 14:08:44 2012
@@ -87,7 +87,7 @@ static LPCWSTR _commands[] = {
 static LPCWSTR _altcmds[] = {
     L"run",         /* 1 Run Service as console application (default)*/
     L"service",     /* 2 Run Service */
-    L"start",       /* 3 Version */
+    L"start",       /* 3 Start Service */
     L"stop",        /* 4 Stop Service */
     L"update",      /* 5 Update Service parameters */
     L"install",     /* 6 Install Service */
@@ -382,7 +382,7 @@ static void printVersion(void)
 {
     fwprintf(stderr, L"Commons Daemon Service Runner version %S/Win%d (%S)\n",
             PRG_VERSION, PRG_BITS, __DATE__);
-    fwprintf(stderr, L"Copyright (c) 2000-2011 The Apache Software Foundation.\n\n"
+    fwprintf(stderr, L"Copyright (c) 2000-2012 The Apache Software Foundation.\n\n"
                      L"For bug reporting instructions, please see:\n"
                      L"<URL:https://issues.apache.org/jira/browse/DAEMON>.");
 }

Modified: commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.h
URL: http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.h?rev=1239137&r1=1239136&r2=1239137&view=diff
==============================================================================
--- commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.h (original)
+++ commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.h Wed Feb  1 14:08:44 2012
@@ -25,7 +25,7 @@
 #define _PRUNSRV_H
 
 #undef  PRG_VERSION
-#define PRG_VERSION    "1.0.8.0"
+#define PRG_VERSION    "1.0.9.0"
 #define PRG_REGROOT   L"Apache Software Foundation\\Procrun 2.0"
 
 #endif /* _PRUNSRV_H */

Modified: commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.rc
URL: http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.rc?rev=1239137&r1=1239136&r2=1239137&view=diff
==============================================================================
--- commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.rc (original)
+++ commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.rc Wed Feb  1 14:08:44 2012
@@ -22,8 +22,8 @@
 IDI_MAINICON         ICON                   "../../resources/procrunw.ico"
 
 1 VERSIONINFO
- FILEVERSION 1,0,8,0
- PRODUCTVERSION 1,0,8,0
+ FILEVERSION 1,0,9,0
+ PRODUCTVERSION 1,0,9,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 (c) 2000-2011 The Apache Software Foundation.\0"
+      VALUE "LegalCopyright", "Copyright (c) 2000-2012 The Apache Software Foundation.\0"
       VALUE "OriginalFilename", "prunsrv.exe\0"
       VALUE "ProductName", RSTR_PRUNSRV "\0"
       VALUE "ProductVersion", PRG_VERSION