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 2017/07/08 02:01:43 UTC
svn commit: r1801256 - in /commons/proper/daemon/trunk/src/native/windows:
apps/prunsrv/prunsrv.c src/javajni.c src/registry.c
Author: ggregory
Date: Sat Jul 8 02:01:43 2017
New Revision: 1801256
URL: http://svn.apache.org/viewvc?rev=1801256&view=rev
Log:
Update "java" to "Java" in log messages and Javadoc comments.
Modified:
commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.c
commons/proper/daemon/trunk/src/native/windows/src/javajni.c
commons/proper/daemon/trunk/src/native/windows/src/registry.c
Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.c?rev=1801256&r1=1801255&r2=1801256&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.c (original)
+++ commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.c Sat Jul 8 02:01:43 2017
@@ -278,7 +278,7 @@ DWORD WINAPI eventThread(LPVOID lpParam)
}
/* redirect console stdout/stderr to files
- * so that java messages can get logged
+ * so that Java messages can get logged
* If stderrfile is not specified it will
* go to stdoutfile.
*/
@@ -955,7 +955,7 @@ static DWORD WINAPI serviceStop(LPVOID l
}
hWorker = apxCreateJava(gPool, _jni_jvmpath);
if (IS_INVALID_HANDLE(hWorker)) {
- apxLogWrite(APXLOG_MARK_ERROR "Failed creating java %S", _jni_jvmpath);
+ apxLogWrite(APXLOG_MARK_ERROR "Failed creating Java %S", _jni_jvmpath);
return 1;
}
gSargs.hJava = hWorker;
@@ -983,11 +983,11 @@ static DWORD WINAPI serviceStop(LPVOID l
else {
if (lstrcmpA(_jni_sclass, "java/lang/System") == 0) {
reportServiceStatus(SERVICE_STOP_PENDING, NO_ERROR, 20 * 1000);
- apxLogWrite(APXLOG_MARK_DEBUG "Forcing java JNI System.exit worker to finish...");
+ apxLogWrite(APXLOG_MARK_DEBUG "Forcing Java JNI System.exit worker to finish...");
return 0;
}
else {
- apxLogWrite(APXLOG_MARK_DEBUG "Waiting for java JNI stop worker to finish...");
+ apxLogWrite(APXLOG_MARK_DEBUG "Waiting for Java JNI stop worker to finish...");
apxJavaWait(hWorker, INFINITE, FALSE);
apxLogWrite(APXLOG_MARK_DEBUG "Java JNI stop worker finished.");
}
@@ -1159,7 +1159,7 @@ static DWORD serviceStart()
/* Create the JVM global worker */
gWorker = apxCreateJava(gPool, _jni_jvmpath);
if (IS_INVALID_HANDLE(gWorker)) {
- apxLogWrite(APXLOG_MARK_ERROR "Failed creating java %S", _jni_jvmpath);
+ apxLogWrite(APXLOG_MARK_ERROR "Failed creating Java %S", _jni_jvmpath);
return 1;
}
gRargs.hJava = gWorker;
Modified: commons/proper/daemon/trunk/src/native/windows/src/javajni.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/src/javajni.c?rev=1801256&r1=1801255&r2=1801256&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/src/javajni.c (original)
+++ commons/proper/daemon/trunk/src/native/windows/src/javajni.c Sat Jul 8 02:01:43 2017
@@ -120,7 +120,7 @@ typedef struct APXJAVAVM {
} APXJAVAVM, *LPAPXJAVAVM;
/* This is no longer exported in jni.h
- * However java uses it internally to get
+ * However Java uses it internally to get
* the default stack size
*/
typedef struct APX_JDK1_1InitArgs {
@@ -893,7 +893,7 @@ apxJavaLoadMainClass(APXHANDLE hJava, LP
return TRUE;
}
-/* Main java application worker thread
+/* Main Java application worker thread
* It will launch Java main and wait until
* it finishes.
*/
Modified: commons/proper/daemon/trunk/src/native/windows/src/registry.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/src/registry.c?rev=1801256&r1=1801255&r2=1801256&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/src/registry.c (original)
+++ commons/proper/daemon/trunk/src/native/windows/src/registry.c Sat Jul 8 02:01:43 2017
@@ -25,7 +25,7 @@ static LPCWSTR REGPARAMS = L"Para
static LPCWSTR REGDESCRIPTION = L"Description";
static LPCWSTR REGSEPARATOR = L"\\";
static LPCWSTR REGAPACHE_ROOT = L"Apache Software Foundation";
-/* predefined java keys */
+/* predefined Java keys */
static LPCWSTR JRE_REGKEY = L"SOFTWARE\\JavaSoft\\Java Runtime Environment\\";
static LPCWSTR JDK_REGKEY = L"SOFTWARE\\JavaSoft\\Java Development Kit\\";
static LPCWSTR JAVA_CURRENT = L"CurrentVersion";