You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2019/05/01 20:14:20 UTC
[commons-daemon] branch master updated: Use the "Apache" prefix for
most strings.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
The following commit(s) were added to refs/heads/master by this push:
new 69f616b Use the "Apache" prefix for most strings.
69f616b is described below
commit 69f616b1ef522166f546de49837468e3e258f1ea
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed May 1 16:14:16 2019 -0400
Use the "Apache" prefix for most strings.
---
.gitignore | 1 +
src/native/unix/support/mkdist.sh | 2 +-
src/native/windows/README | 6 +++---
src/native/windows/apps/prunmgr/prunmgr.rc | 4 ++--
src/native/windows/apps/prunsrv/prunsrv.c | 14 +++++++-------
src/native/windows/apps/prunsrv/prunsrv.rc | 2 +-
src/native/windows/src/rprocess.c | 2 +-
src/site/site.xml | 2 +-
src/site/xdoc/issue-tracking.xml | 8 ++++----
src/site/xdoc/mail-lists.xml | 2 +-
10 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/.gitignore b/.gitignore
index 8e540a5..2e2ba72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/.settings/
/.classpath
/.project
+/target/
diff --git a/src/native/unix/support/mkdist.sh b/src/native/unix/support/mkdist.sh
index 855d473..37c325b 100755
--- a/src/native/unix/support/mkdist.sh
+++ b/src/native/unix/support/mkdist.sh
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# Create Commons Daemon native package distribution on UNIX systems.
+# Create Apache Commons Daemon native package distribution on UNIX systems.
# You should execute this script from the src/native/unix directory
#
# support/mkdist.sh <arch> [os]
diff --git a/src/native/windows/README b/src/native/windows/README
index e1e7c64..c7e7616 100644
--- a/src/native/windows/README
+++ b/src/native/windows/README
@@ -1,7 +1,7 @@
-Configuring and Building Commons Daemon on Windows
-==================================================
+Configuring and Building Apache Commons Daemon on Windows
+=========================================================
-Using Visual Studio, you can build the Commons Daemon.
+Using Visual Studio, you can build Apache Commons Daemon.
The Makefile make file has a bunch of documentation about its
options, but a trivial build is simply;
diff --git a/src/native/windows/apps/prunmgr/prunmgr.rc b/src/native/windows/apps/prunmgr/prunmgr.rc
index cd3370b..5dbecff 100644
--- a/src/native/windows/apps/prunmgr/prunmgr.rc
+++ b/src/native/windows/apps/prunmgr/prunmgr.rc
@@ -17,7 +17,7 @@
#include "apxwin.h"
#include "prunmgr.h"
-#define RSTR_PSM "Commons Daemon Service Manager"
+#define RSTR_PSM "Apache Commons Daemon Service Manager"
#define RSTR_SCMATS "Service Manager is attempting to "
IDI_MAINICON ICON "../../resources/procrunw.ico"
@@ -274,7 +274,7 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "Commons Daemon Service Management Tool\0"
+ VALUE "Comments", "Apache Commons Daemon Service Management Tool\0"
VALUE "CompanyName", "Apache Software Foundation\0"
VALUE "FileDescription", RSTR_PSM "\0"
VALUE "FileVersion", PRG_VERSION
diff --git a/src/native/windows/apps/prunsrv/prunsrv.c b/src/native/windows/apps/prunsrv/prunsrv.c
index 1fb6de3..f2fc4d2 100644
--- a/src/native/windows/apps/prunsrv/prunsrv.c
+++ b/src/native/windows/apps/prunsrv/prunsrv.c
@@ -386,7 +386,7 @@ static void printUsage(LPAPXCMDLINE lpCmdline, BOOL isHelp)
static void printVersion(void)
{
- fwprintf(stderr, L"Commons Daemon Service Runner version %S/Win%d (%S)\n",
+ fwprintf(stderr, L"Apache Commons Daemon Service Runner version %S/Win%d (%S)\n",
PRG_VERSION, PRG_BITS, __DATE__);
fwprintf(stderr, L"Copyright (c) 2000-2017 The Apache Software Foundation.\n\n"
L"For bug reporting instructions, please see:\n"
@@ -1734,11 +1734,11 @@ void __cdecl main(int argc, char **argv)
apxLogOpen(gPool, SO_LOGPATH, SO_LOGPREFIX, SO_LOGROTATE);
apxLogLevelSetW(NULL, SO_LOGLEVEL);
- apxLogWrite(APXLOG_MARK_DEBUG "Commons Daemon procrun log initialized");
+ apxLogWrite(APXLOG_MARK_DEBUG "Apache Commons Daemon procrun log initialized");
if (SO_LOGROTATE)
apxLogWrite(APXLOG_MARK_DEBUG "Log will rotate each %d seconds.", SO_LOGROTATE);
- apxLogWrite(APXLOG_MARK_INFO "Commons Daemon procrun (%s %d-bit) started",
+ apxLogWrite(APXLOG_MARK_INFO "Apache Commons Daemon procrun (%s %d-bit) started",
PRG_VERSION, PRG_BITS);
AplZeroMemory(&gStdwrap, sizeof(APX_STDWRAP));
@@ -1754,11 +1754,11 @@ void __cdecl main(int argc, char **argv)
SYSTEMTIME t;
GetLocalTime(&t);
fprintf(stdout, "\n%d-%02d-%02d %02d:%02d:%02d "
- "Commons Daemon procrun stdout initialized\n",
+ "Apache Commons Daemon procrun stdout initialized\n",
t.wYear, t.wMonth, t.wDay,
t.wHour, t.wMinute, t.wSecond);
fprintf(stderr, "\n%d-%02d-%02d %02d:%02d:%02d "
- "Commons Daemon procrun stderr initialized\n",
+ "Apache Commons Daemon procrun stderr initialized\n",
t.wYear, t.wMonth, t.wDay,
t.wHour, t.wMinute, t.wSecond);
}
@@ -1810,7 +1810,7 @@ cleanup:
int ix = 0;
if (rv > 0 && rv < 10)
ix = rv;
- apxLogWrite(APXLOG_MARK_ERROR "Commons Daemon procrun failed "
+ apxLogWrite(APXLOG_MARK_ERROR "Apache Commons Daemon procrun failed "
"with exit value: %d (Failed to %s)",
rv, gSzProc[ix]);
if (ix > 2 && !_service_mode) {
@@ -1819,7 +1819,7 @@ cleanup:
}
}
else
- apxLogWrite(APXLOG_MARK_INFO "Commons Daemon procrun finished");
+ apxLogWrite(APXLOG_MARK_INFO "Apache Commons Daemon procrun finished");
if (lpCmdline)
apxCmdlineFree(lpCmdline);
_service_status_handle = NULL;
diff --git a/src/native/windows/apps/prunsrv/prunsrv.rc b/src/native/windows/apps/prunsrv/prunsrv.rc
index 6c72a0b..f29d6f6 100644
--- a/src/native/windows/apps/prunsrv/prunsrv.rc
+++ b/src/native/windows/apps/prunsrv/prunsrv.rc
@@ -17,7 +17,7 @@
#include "apxwin.h"
#include "prunsrv.h"
-#define RSTR_PRUNSRV "Commons Daemon Service Runner"
+#define RSTR_PRUNSRV "Apache Commons Daemon Service Runner"
IDI_MAINICON ICON "../../resources/procrunw.ico"
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "prunsrv.manifest"
diff --git a/src/native/windows/src/rprocess.c b/src/native/windows/src/rprocess.c
index abaae19..1b58bfe 100644
--- a/src/native/windows/src/rprocess.c
+++ b/src/native/windows/src/rprocess.c
@@ -255,7 +255,7 @@ static BOOL __apxProcCreateChildPipes(LPAPXPROCESS lpProc)
{
BOOL rv = FALSE;
- apxLogWrite(APXLOG_MARK_DEBUG "Commons Daemon procrun __apxProcCreateChildPipes()");
+ apxLogWrite(APXLOG_MARK_DEBUG "Apache Commons Daemon procrun __apxProcCreateChildPipes()");
if (!CreatePipe(&(lpProc->hChildStdInp),
&(lpProc->hChildInpWr),
diff --git a/src/site/site.xml b/src/site/site.xml
index b6e5172..3cc4695 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -17,7 +17,7 @@
-->
<project name="Daemon">
<bannerRight>
- <name>Commons Daemon</name>
+ <name>Apache Commons Daemon</name>
<src>/images/logo.png</src>
<href>/index.html</href>
</bannerRight>
diff --git a/src/site/xdoc/issue-tracking.xml b/src/site/xdoc/issue-tracking.xml
index 2ad9465..58b3f8b 100644
--- a/src/site/xdoc/issue-tracking.xml
+++ b/src/site/xdoc/issue-tracking.xml
@@ -43,14 +43,14 @@ limitations under the License.
-->
<document>
<properties>
- <title>Commons Daemon Issue tracking</title>
+ <title>Apache Commons Daemon Issue tracking</title>
<author email="dev@commons.apache.org">Commons Documentation Team</author>
</properties>
<body>
<section name="Commons Daemon Issue tracking">
<p>
- Commons Daemon uses <a href="http://issues.apache.org/jira/">ASF JIRA</a> for tracking issues.
+ Apache Commons Daemon uses <a href="http://issues.apache.org/jira/">ASF JIRA</a> for tracking issues.
See the <a href="http://issues.apache.org/jira/browse/DAEMON">Commons Daemon JIRA project page</a>.
</p>
@@ -63,7 +63,7 @@ limitations under the License.
<p>
If you would like to report a bug, or raise an enhancement request with
- Commons Daemon please do the following:
+ Apache Commons Daemon please do the following:
<ol>
<li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310468&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4">Search existing open bugs</a>.
If you find your issue listed then please add a comment with your details.</li>
@@ -80,7 +80,7 @@ limitations under the License.
<ul>
<li>the more information you provide, the better we can help you</li>
<li>test cases are vital, particularly for any proposed enhancements</li>
- <li>the developers of Commons Daemon are all unpaid volunteers</li>
+ <li>the developers of Apache Commons Daemon are all unpaid volunteers</li>
</ul>
</p>
diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml
index 8ba0706..36a9ab7 100644
--- a/src/site/xdoc/mail-lists.xml
+++ b/src/site/xdoc/mail-lists.xml
@@ -41,7 +41,7 @@ limitations under the License.
-->
<document>
<properties>
- <title>Commons Daemon Mailing Lists</title>
+ <title>Apache Commons Daemon Mailing Lists</title>
<author email="dev@commons.apache.org">Commons Documentation Team</author>
</properties>
<body>