Author: mturk
Date: Fri Feb 19 08:23:02 2010
New Revision: 911737
URL: http://svn.apache.org/viewvc?rev=911737&view=rev
Log:
Sync the procrun version with commons daemon version and use Commons Daemon
name prefix
Modified:
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.c
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/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/pom.xml?rev=911737&r1=911736&r2=911737&view=diff
==============================================================================
--- commons/proper/daemon/trunk/pom.xml (original)
+++ commons/proper/daemon/trunk/pom.xml Fri Feb 19 08:23:02 2010
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>commons-daemon</groupId>
<artifactId>commons-daemon</artifactId>
- <version>1.0.2-RC1</version>
+ <version>1.0.2</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
-->
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=911737&r1=911736&r2=911737&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
Fri Feb 19 08:23:02 2010
@@ -24,7 +24,7 @@
#define _PRUNMGR_H
#undef PRG_VERSION
-#define PRG_VERSION "2.0.6.0"
+#define PRG_VERSION "1.0.2.0"
#define PRG_REGROOT L"Apache Software Foundation\\Procrun 2.0"
#define IDM_TM_EXIT 2000
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=911737&r1=911736&r2=911737&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
Fri Feb 19 08:23:02 2010
@@ -17,7 +17,7 @@
#include "apxwin.h"
#include "prunmgr.h"
-#define RSTR_PSM "Procrun Service Manager"
+#define RSTR_PSM "Commons Daemon Service Manager"
#define RSTR_SCMATS "Service Manager is attempting to "
IDI_MAINICON ICON "../../resources/procrunw.ico"
@@ -42,7 +42,7 @@
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-2009 The Apache Software
Foundation.",IDC_STATIC,2,160,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
@@ -51,7 +51,7 @@
STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP |
WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_TOPMOST
-CAPTION "Apache Service Manager"
+CAPTION "Apache Commons Daemon Service Manager"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "Cl&ose",IDOK,261,73,50,14
@@ -225,10 +225,10 @@
STRINGTABLE
BEGIN
IDS_APPLICATION RSTR_PSM
- IDS_APPVERSION "Version 2.0.7"
+ IDS_APPVERSION "Version 1.0.2"
IDS_APPFULLNAME RSTR_PSM " Version " PRG_VERSION
IDS_APPCOPYRIGHT "Copyright © 2000-2010 The Apache Software Foundation"
- IDS_APPDESCRIPTION "Apache Procrun Service Management Tool"
+ 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."
IDS_HSSTART RSTR_SCMATS "start the following service ..."
@@ -256,8 +256,8 @@
END
1 VERSIONINFO
- FILEVERSION 2,0,7,0
- PRODUCTVERSION 2,0,7,0
+ FILEVERSION 1,0,2,0
+ PRODUCTVERSION 1,0,2,0
FILEFLAGSMASK 0x3fL
#if defined(_DEBUG)
FILEFLAGS 0x03L
@@ -272,7 +272,7 @@
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "Procrun Service Management Tool\0"
+ VALUE "Comments", "Commons Daemon Service Management Tool\0"
VALUE "CompanyName", "Apache Software Foundation\0"
VALUE "FileDescription", RSTR_PSM "\0"
VALUE "FileVersion", PRG_VERSION
Modified:
commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.c
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.c?rev=911737&r1=911736&r2=911737&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.c
(original)
+++ commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.c
Fri Feb 19 08:23:02 2010
@@ -341,7 +341,6 @@
/* Debugging functions */
static void printUsage(LPAPXCMDLINE lpCmdline)
{
-#ifdef _DEBUG
int i = 0;
fwprintf(stderr, L"Usage: %s //CMD//Servce [--options]\n",
lpCmdline->szExecutable);
@@ -351,15 +350,14 @@
fwprintf(stderr, L" //DS//ServiceName Delete Service\n");
fwprintf(stderr, L" //RS//ServiceName Run Service\n");
fwprintf(stderr, L" //SS//ServiceName Stop Service\n");
- fwprintf(stderr,
- L" //TS//ServiceName Run Service as console application\n");
+ fwprintf(stderr, L" //TS//ServiceName Run Service as console
application\n");
fwprintf(stderr, L" Options:\n");
while (_options[i].szName) {
fwprintf(stderr, L" --%s\n", _options[i].szName);
++i;
}
-#endif
}
+
/* Display configuration parameters */
static void dumpCmdline()
{
@@ -1380,8 +1378,8 @@
apxLogOpen(gPool, SO_LOGPATH, SO_LOGPREFIX);
apxLogLevelSetW(NULL, SO_LOGLEVEL);
- apxLogWrite(APXLOG_MARK_DEBUG "Procrun log initialized");
- apxLogWrite(APXLOG_MARK_INFO "Procrun (%s) started", PRG_VERSION);
+ apxLogWrite(APXLOG_MARK_DEBUG "Commons Daemon procrun log initialized");
+ apxLogWrite(APXLOG_MARK_INFO "Commons Daemon procrun (%s) started",
PRG_VERSION);
AplZeroMemory(&gStdwrap, sizeof(APX_STDWRAP));
@@ -1426,7 +1424,7 @@
}
cleanup:
- apxLogWrite(APXLOG_MARK_INFO "Procrun finished.");
+ apxLogWrite(APXLOG_MARK_INFO "Commons Daemon procrun finished.");
if (lpCmdline)
apxCmdlineFree(lpCmdline);
if (_service_status_handle)
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=911737&r1=911736&r2=911737&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
Fri Feb 19 08:23:02 2010
@@ -25,7 +25,7 @@
#define _PRUNSRV_H
#undef PRG_VERSION
-#define PRG_VERSION "2.0.7.0"
+#define PRG_VERSION "1.0.2.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=911737&r1=911736&r2=911737&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
Fri Feb 19 08:23:02 2010
@@ -17,13 +17,13 @@
#include "apxwin.h"
#include "prunsrv.h"
-#define RSTR_PRUNSRV "Service Runner"
+#define RSTR_PRUNSRV "Commons Daemon Service Runner"
IDI_MAINICON ICON "../../resources/procrunw.ico"
1 VERSIONINFO
- FILEVERSION 2,0,7,0
- PRODUCTVERSION 2,0,7,0
+ FILEVERSION 1,0,2,0
+ PRODUCTVERSION 1,0,2,0
FILEFLAGSMASK 0x3fL
#if defined(_DEBUG)
FILEFLAGS 0x03L
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=911737&r1=911736&r2=911737&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/native/version.h (original)
+++ commons/proper/daemon/trunk/src/native/unix/native/version.h Fri Feb 19
08:23:02 2010
@@ -37,7 +37,7 @@
* This symbol is defined for internal, "development" copies of JSVC.
* This symbol will be #undef'd for releases.
*/
-#define JSVC_IS_DEV_VERSION 1
+#define JSVC_IS_DEV_VERSION 0
/** Properly quote a value as a string in the C preprocessor */
#define JSVC_STRINGIFY(n) JSVC_STRINGIFY_HELPER(n)
