[commons-daemon] branch master updated: Allow to have WINVER defined in hexadecimal version when calling nmake

2021-03-05 Thread mturk 
This is an automated email from the ASF dual-hosted git repository.

mturk 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 30aebfe  Allow to have WINVER defined in hexadecimal version when 
calling nmake
 new f4aeb3e  Merge pull request #26 from mturk/master
30aebfe is described below

commit 30aebfe5bdff25d51bf45cabcc88d78d009e7918
Author: Mladen Turk 
AuthorDate: Wed Mar 3 22:21:39 2021 +0100

Allow to have WINVER defined in hexadecimal version when calling nmake
---
 src/changes/changes.xml | 4 
 src/native/windows/include/Makefile.inc | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 640b4c7..e04349f 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -56,6 +56,10 @@
   
 Bump actions/cache from v2 to v2.1.4 #24.
   
+  
+Procrun. Minor improvement that allows to have WINVER nmake variable
+directly defined at compile time as ABI version in hexadecimal format.
+  
 
 
   
diff --git a/src/native/windows/include/Makefile.inc 
b/src/native/windows/include/Makefile.inc
index 17e813d..007dbce 100644
--- a/src/native/windows/include/Makefile.inc
+++ b/src/native/windows/include/Makefile.inc
@@ -155,7 +155,8 @@ _WIN32_IE = 0x0700
 NMAKE_WINVER = 0x0601
 _WIN32_IE = 0x0800
 !ELSE
-!ERROR Must specify WINVER environment variable (WINXP, WIN2003, VISTA, WIN7)
+NMAKE_WINVER = $(WINVER)
+_WIN32_IE = 0x0800
 !ENDIF
 
 NMAKE_WINNT = -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) 
-D_WIN32_IE=$(_WIN32_IE)

[commons-daemon] branch master updated: TAB police

2021-03-03 Thread mturk 
This is an automated email from the ASF dual-hosted git repository.

mturk 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 f3053c6  TAB police
f3053c6 is described below

commit f3053c6013158a082cd77f4cbc83109f4bd1f800
Author: Mladen Turk 
AuthorDate: Wed Mar 3 20:31:12 2021 +0100

TAB police
---
 src/native/windows/apps/prunsrv/prunsrv.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/native/windows/apps/prunsrv/prunsrv.c 
b/src/native/windows/apps/prunsrv/prunsrv.c
index 3590922..86fb9a0 100644
--- a/src/native/windows/apps/prunsrv/prunsrv.c
+++ b/src/native/windows/apps/prunsrv/prunsrv.c
@@ -888,8 +888,8 @@ static BOOL docmdStopService(LPAPXCMDLINE lpCmdline)
 /* Wait for the timeout if any */
 int  timeout = SO_STOPTIMEOUT;
 if (timeout) {
-   int i;
-for (i=0; i

[commons-daemon] branch master updated: Add missing bits for version 1.2.5 upgrade

2021-03-03 Thread mturk 
This is an automated email from the ASF dual-hosted git repository.

mturk 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 c1a5919  Add missing bits for version 1.2.5 upgrade
c1a5919 is described below

commit c1a5919e70a5ce0998e51656b4dbd10c7bc0138c
Author: Mladen Turk 
AuthorDate: Wed Mar 3 20:24:42 2021 +0100

Add missing bits for version 1.2.5 upgrade
---
 src/native/windows/apps/prunmgr/prunmgr.rc | 4 ++--
 src/native/windows/apps/prunsrv/prunsrv.rc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/native/windows/apps/prunmgr/prunmgr.rc 
b/src/native/windows/apps/prunmgr/prunmgr.rc
index 91885d9..bf3982f 100644
--- a/src/native/windows/apps/prunmgr/prunmgr.rc
+++ b/src/native/windows/apps/prunmgr/prunmgr.rc
@@ -259,8 +259,8 @@ BEGIN
 END
 
 1 VERSIONINFO
- FILEVERSION 1,2,4,0
- PRODUCTVERSION 1,2,4,0
+ FILEVERSION 1,2,5,0
+ PRODUCTVERSION 1,2,5,0
  FILEFLAGSMASK 0x3fL
 #if defined(_DEBUG)
  FILEFLAGS 0x03L
diff --git a/src/native/windows/apps/prunsrv/prunsrv.rc 
b/src/native/windows/apps/prunsrv/prunsrv.rc
index 4f032a2..ca8cdf9 100644
--- a/src/native/windows/apps/prunsrv/prunsrv.rc
+++ b/src/native/windows/apps/prunsrv/prunsrv.rc
@@ -23,8 +23,8 @@ IDI_MAINICON ICON   
"../../resources/procrunw.ico"
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "prunsrv.manifest"
 
 1 VERSIONINFO
- FILEVERSION 1,2,4,0
- PRODUCTVERSION 1,2,4,0
+ FILEVERSION 1,2,5,0
+ PRODUCTVERSION 1,2,5,0
  FILEFLAGSMASK 0x3fL
 #if defined(_DEBUG)
  FILEFLAGS 0x03L

[commons-daemon] branch master updated: Fix trivial typo. Windows 7 ABI is 0x0601

2021-03-03 Thread mturk 
This is an automated email from the ASF dual-hosted git repository.

mturk 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 4253cb7  Fix trivial typo. Windows 7 ABI is 0x0601
4253cb7 is described below

commit 4253cb75ea3eabf5c2b9481c704d07324f778a57
Author: Mladen Turk 
AuthorDate: Wed Mar 3 19:28:46 2021 +0100

Fix trivial typo. Windows 7 ABI is 0x0601
---
 src/native/windows/include/Makefile.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/native/windows/include/Makefile.inc 
b/src/native/windows/include/Makefile.inc
index 4ed852c..17e813d 100644
--- a/src/native/windows/include/Makefile.inc
+++ b/src/native/windows/include/Makefile.inc
@@ -152,7 +152,7 @@ _WIN32_IE = 0x0600
 NMAKE_WINVER = 0x0600
 _WIN32_IE = 0x0700
 !ELSEIF "$(WINVER)" == "WIN7"
-NMAKE_WINVER = 0x0700
+NMAKE_WINVER = 0x0601
 _WIN32_IE = 0x0800
 !ELSE
 !ERROR Must specify WINVER environment variable (WINXP, WIN2003, VISTA, WIN7)

svn commit: r1817507 - in /commons/proper/daemon/branches/1.0.x/src/native/windows: apps/prunsrv/prunsrv.c apps/prunsrv/prunsrv.h apps/prunsrv/prunsrv.rc include/Makefile.inc

2017-12-08 Thread mturk 
Author: mturk
Date: Fri Dec  8 14:28:55 2017
New Revision: 1817507

URL: http://svn.apache.org/viewvc?rev=1817507=rev
Log:
Do not set event if not initialized

Modified:

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
commons/proper/daemon/branches/1.0.x/src/native/windows/include/Makefile.inc

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=1817507=1817506=1817507=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 
Fri Dec  8 14:28:55 2017
@@ -1018,7 +1018,7 @@ static DWORD WINAPI serviceStop(LPVOID l
 }
 if (!apxProcessSetExecutableW(hWorker, SO_STOPIMAGE)) {
 apxLogWrite(APXLOG_MARK_ERROR "Failed setting process executable 
%S",
-SO_STARTIMAGE);
+SO_STOPIMAGE);
 rv = 2;
 goto cleanup;
 }
@@ -1112,7 +1112,9 @@ cleanup:
 }
 
 apxLogWrite(APXLOG_MARK_INFO "Service stop thread completed.");
-SetEvent(gShutdownEvent);
+if (gShutdownEvent) {
+SetEvent(gShutdownEvent);
+}
 return rv;
 }
 
@@ -1544,6 +1546,7 @@ void WINAPI serviceMain(DWORD argc, LPTS
 WaitForSingleObject(gShutdownEvent, ONE_MINUTE);
 apxLogWrite(APXLOG_MARK_DEBUG "ShutdownEvent signaled");
 CloseHandle(gShutdownEvent);
+gShutdownEvent = NULL;
 
 /* This will cause to wait for all threads to exit
  */
@@ -1768,6 +1771,10 @@ cleanup:
 _service_mode = FALSE;
 _flushall();
 apxLogClose(NULL);
+#if 0
+/* Memory will be destoyed uppon exit
+ */
 apxHandleManagerDestroy();
+#endif
 ExitProcess(rv);
 }

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=1817507=1817506=1817507=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 
Fri Dec  8 14:28:55 2017
@@ -14,18 +14,11 @@
  * limitations under the License.
  */
 
-/* 
- * jar2exe -- convert .jar file to WIN32 executable.
- * Contributed by Mladen Turk <mt...@apache.org>
- * 05 Aug 2003
- * 
- */
-
 #ifndef _PRUNSRV_H
 #define _PRUNSRV_H
 
 #undef  PRG_VERSION
-#define PRG_VERSION"1.0.15.0"
+#define PRG_VERSION"1.0.16.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=1817507=1817506=1817507=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 
Fri Dec  8 14:28:55 2017
@@ -23,8 +23,8 @@ IDI_MAINICON ICON
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "prunsrv.manifest"
 
 1 VERSIONINFO
- FILEVERSION 1,0,15,0
- PRODUCTVERSION 1,0,15,0
+ FILEVERSION 1,0,16,0
+ PRODUCTVERSION 1,0,16,0
  FILEFLAGSMASK 0x3fL
 #if defined(_DEBUG)
  FILEFLAGS 0x03L
@@ -44,7 +44,7 @@ BEGIN
   VALUE "FileDescription", RSTR_PRUNSRV "\0"
   VALUE "FileVersion", PRG_VERSION
   VALUE "InternalName", RSTR_PRUNSRV "\0"
-  VALUE "LegalCopyright", "Copyright (c) 2000-2013 The Apache Software 
Foundation.\0"
+  VALUE "LegalCopyright", "Copyright (c) 2000-2017 The Apache Software 
Foundation.\0"
   VALUE "OriginalFilename", "prunsrv.exe\0"
   VALUE "ProductName", RSTR_PRUNSRV "\0"
   VALUE "ProductVersion", PRG_VERSION

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/windows/include/Makefile.inc
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/include/Makefile.inc?rev=1817507=1817

svn commit: r1533345 - in /commons/proper/daemon/branches/1.0.x: RELEASE-NOTES.txt src/native/unix/configure src/native/unix/support/apsupport.m4

2013-10-18 Thread mturk 
Author: mturk
Date: Fri Oct 18 07:35:06 2013
New Revision: 1533345

URL: http://svn.apache.org/r1533345
Log:
Apply fix for DAEMON-308

Modified:
commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
commons/proper/daemon/branches/1.0.x/src/native/unix/configure
commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4

Modified: commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt?rev=1533345r1=1533344r2=1533345view=diff
==
--- commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt Fri Oct 18 07:35:06 
2013
@@ -84,7 +84,7 @@ NEW FEATURES:
 
 BUG FIXES:
 
-1.0.16: DAEMON-289
+1.0.16: DAEMON-289, DAEMON-308
 
 1.0.15: DAEMON-288, DAEMON-291, DAEMON-292
 

Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/configure
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/configure?rev=1533345r1=1533344r2=1533345view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/configure (original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/configure Fri Oct 18 
07:35:06 2013
@@ -2697,6 +2697,11 @@ echo $as_me: error: Unsupported operati
 supported_os=arm
 HOST_CPU=arm
 ;;
+  aarch64)
+CFLAGS=$CFLAGS -DCPU=\\\aarch64\\\
+supported_os=aarch64
+HOST_CPU=aarch64
+;;
   *)
 echo $as_me:$LINENO: result: failed 5
 echo ${ECHO_T}failed 6

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4?rev=1533345r1=1533344r2=1533345view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 
Fri Oct 18 07:35:06 2013
@@ -179,6 +179,11 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
 supported_os=arm
 HOST_CPU=arm
 ;;
+  aarch64)
+CFLAGS=$CFLAGS -DCPU=\\\aarch64\\\
+supported_os=aarch64
+HOST_CPU=aarch64
+;;
   *)
 AC_MSG_RESULT([failed])
 AC_MSG_ERROR([Unsupported CPU architecture $host_cpu]);;

svn commit: r1533348 - in /commons/proper/daemon/branches/1.0.x: RELEASE-NOTES.txt src/native/unix/native/java.c src/native/unix/native/location.c

2013-10-18 Thread mturk 
Author: mturk
Date: Fri Oct 18 07:40:05 2013
New Revision: 1533348

URL: http://svn.apache.org/r1533348
Log:
Apply fix for DAEMON-281

Modified:
commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
commons/proper/daemon/branches/1.0.x/src/native/unix/native/java.c
commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c

Modified: commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt?rev=1533348r1=1533347r2=1533348view=diff
==
--- commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt Fri Oct 18 07:40:05 
2013
@@ -84,7 +84,7 @@ NEW FEATURES:
 
 BUG FIXES:
 
-1.0.16: DAEMON-289, DAEMON-308
+1.0.16: DAEMON-281, DAEMON-289, DAEMON-308
 
 1.0.15: DAEMON-288, DAEMON-291, DAEMON-292
 

Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/native/java.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/native/java.c?rev=1533348r1=1533347r2=1533348view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/native/java.c 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/native/java.c Fri Oct 
18 07:40:05 2013
@@ -203,6 +203,13 @@ bool java_init(arg_data *args, home_data
 return false;
 }
 }
+if (stat(appf, sb)) {
+if (replace(appf, 1024, $JAVA_HOME/../MacOS/libjli.dylib,
+$JAVA_HOME, data-path) != 0) {
+log_error(Cannot replace values in loader library);
+return false;
+}
+}
 apph = dso_link(appf);
 if (apph == NULL) {
 log_error(Cannot load required shell library %s, appf);

Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c?rev=1533348r1=1533347r2=1533348view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c Fri 
Oct 18 07:40:05 2013
@@ -143,6 +143,7 @@ char *location_jvm_default[] = {
  */
 char *location_jvm_configured[] = {
 #if defined(OS_DARWIN)
+$JAVA_HOME/jre/lib/$VM_NAME/libjvm.dylib,
 $JAVA_HOME/../Libraries/lib$VM_NAME.dylib,
 #elif defined(OS_CYGWIN)
 $JAVA_HOME/jre/bin/$VM_NAME/jvm.dll,  /* Sun JDK 1.3 */

svn commit: r1732 - in /release/commons/daemon: binaries/ binaries/windows/ source/

2013-04-03 Thread mturk 
Author: mturk
Date: Wed Apr  3 07:05:46 2013
New Revision: 1732

Log:
Remove previous version

Removed:
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.tar.gz
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.tar.gz.asc
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.tar.gz.md5
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.tar.gz.sha1
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.zip
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.zip.asc
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.zip.md5
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.zip.sha1
release/commons/daemon/binaries/commons-daemon-1.0.14.jar
release/commons/daemon/binaries/commons-daemon-1.0.14.jar.asc
release/commons/daemon/binaries/commons-daemon-1.0.14.jar.md5
release/commons/daemon/binaries/commons-daemon-1.0.14.jar.sha1

release/commons/daemon/binaries/windows/commons-daemon-1.0.14-bin-windows.zip

release/commons/daemon/binaries/windows/commons-daemon-1.0.14-bin-windows.zip.asc

release/commons/daemon/binaries/windows/commons-daemon-1.0.14-bin-windows.zip.md5

release/commons/daemon/binaries/windows/commons-daemon-1.0.14-bin-windows.zip.sha1
release/commons/daemon/source/commons-daemon-1.0.14-native-src.tar.gz
release/commons/daemon/source/commons-daemon-1.0.14-native-src.tar.gz.asc
release/commons/daemon/source/commons-daemon-1.0.14-native-src.tar.gz.md5
release/commons/daemon/source/commons-daemon-1.0.14-native-src.tar.gz.sha1
release/commons/daemon/source/commons-daemon-1.0.14-native-src.zip
release/commons/daemon/source/commons-daemon-1.0.14-native-src.zip.asc
release/commons/daemon/source/commons-daemon-1.0.14-native-src.zip.md5
release/commons/daemon/source/commons-daemon-1.0.14-native-src.zip.sha1
release/commons/daemon/source/commons-daemon-1.0.14-src.tar.gz
release/commons/daemon/source/commons-daemon-1.0.14-src.tar.gz.asc
release/commons/daemon/source/commons-daemon-1.0.14-src.tar.gz.md5
release/commons/daemon/source/commons-daemon-1.0.14-src.tar.gz.sha1
release/commons/daemon/source/commons-daemon-1.0.14-src.zip
release/commons/daemon/source/commons-daemon-1.0.14-src.zip.asc
release/commons/daemon/source/commons-daemon-1.0.14-src.zip.md5
release/commons/daemon/source/commons-daemon-1.0.14-src.zip.sha1

svn commit: r1732 - in /release/commons/daemon: binaries/ binaries/windows/ source/

2013-04-03 Thread mturk 
Author: mturk
Date: Wed Apr  3 07:05:46 2013
New Revision: 1732

Log:
Remove previous version

Removed:
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.tar.gz
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.tar.gz.asc
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.tar.gz.md5
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.tar.gz.sha1
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.zip
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.zip.asc
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.zip.md5
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.zip.sha1
release/commons/daemon/binaries/commons-daemon-1.0.14.jar
release/commons/daemon/binaries/commons-daemon-1.0.14.jar.asc
release/commons/daemon/binaries/commons-daemon-1.0.14.jar.md5
release/commons/daemon/binaries/commons-daemon-1.0.14.jar.sha1

release/commons/daemon/binaries/windows/commons-daemon-1.0.14-bin-windows.zip

release/commons/daemon/binaries/windows/commons-daemon-1.0.14-bin-windows.zip.asc

release/commons/daemon/binaries/windows/commons-daemon-1.0.14-bin-windows.zip.md5

release/commons/daemon/binaries/windows/commons-daemon-1.0.14-bin-windows.zip.sha1
release/commons/daemon/source/commons-daemon-1.0.14-native-src.tar.gz
release/commons/daemon/source/commons-daemon-1.0.14-native-src.tar.gz.asc
release/commons/daemon/source/commons-daemon-1.0.14-native-src.tar.gz.md5
release/commons/daemon/source/commons-daemon-1.0.14-native-src.tar.gz.sha1
release/commons/daemon/source/commons-daemon-1.0.14-native-src.zip
release/commons/daemon/source/commons-daemon-1.0.14-native-src.zip.asc
release/commons/daemon/source/commons-daemon-1.0.14-native-src.zip.md5
release/commons/daemon/source/commons-daemon-1.0.14-native-src.zip.sha1
release/commons/daemon/source/commons-daemon-1.0.14-src.tar.gz
release/commons/daemon/source/commons-daemon-1.0.14-src.tar.gz.asc
release/commons/daemon/source/commons-daemon-1.0.14-src.tar.gz.md5
release/commons/daemon/source/commons-daemon-1.0.14-src.tar.gz.sha1
release/commons/daemon/source/commons-daemon-1.0.14-src.zip
release/commons/daemon/source/commons-daemon-1.0.14-src.zip.asc
release/commons/daemon/source/commons-daemon-1.0.14-src.zip.md5
release/commons/daemon/source/commons-daemon-1.0.14-src.zip.sha1

svn commit: r1716 - in /release/commons/daemon: ./ binaries/ binaries/windows/ source/

2013-04-02 Thread mturk 
Author: mturk
Date: Tue Apr  2 14:03:49 2013
New Revision: 1716

Log:
Upload 1.0.15 release

Added:
release/commons/daemon/binaries/commons-daemon-1.0.15-bin.tar.gz   (with 
props)
release/commons/daemon/binaries/commons-daemon-1.0.15-bin.tar.gz.asc   
(with props)
release/commons/daemon/binaries/commons-daemon-1.0.15-bin.tar.gz.md5
release/commons/daemon/binaries/commons-daemon-1.0.15-bin.tar.gz.sha1
release/commons/daemon/binaries/commons-daemon-1.0.15-bin.zip   (with props)
release/commons/daemon/binaries/commons-daemon-1.0.15-bin.zip.asc   (with 
props)
release/commons/daemon/binaries/commons-daemon-1.0.15-bin.zip.md5
release/commons/daemon/binaries/commons-daemon-1.0.15-bin.zip.sha1
release/commons/daemon/binaries/commons-daemon-1.0.15.jar   (with props)
release/commons/daemon/binaries/commons-daemon-1.0.15.jar.asc   (with props)
release/commons/daemon/binaries/commons-daemon-1.0.15.jar.md5
release/commons/daemon/binaries/commons-daemon-1.0.15.jar.sha1

release/commons/daemon/binaries/windows/commons-daemon-1.0.15-bin-windows.zip   
(with props)

release/commons/daemon/binaries/windows/commons-daemon-1.0.15-bin-windows.zip.asc
   (with props)

release/commons/daemon/binaries/windows/commons-daemon-1.0.15-bin-windows.zip.md5

release/commons/daemon/binaries/windows/commons-daemon-1.0.15-bin-windows.zip.sha1
release/commons/daemon/source/commons-daemon-1.0.15-native-src.tar.gz   
(with props)
release/commons/daemon/source/commons-daemon-1.0.15-native-src.tar.gz.asc   
(with props)
release/commons/daemon/source/commons-daemon-1.0.15-native-src.tar.gz.md5
release/commons/daemon/source/commons-daemon-1.0.15-native-src.tar.gz.sha1
release/commons/daemon/source/commons-daemon-1.0.15-native-src.zip   (with 
props)
release/commons/daemon/source/commons-daemon-1.0.15-native-src.zip.asc   
(with props)
release/commons/daemon/source/commons-daemon-1.0.15-native-src.zip.md5
release/commons/daemon/source/commons-daemon-1.0.15-native-src.zip.sha1
release/commons/daemon/source/commons-daemon-1.0.15-src.tar.gz   (with 
props)
release/commons/daemon/source/commons-daemon-1.0.15-src.tar.gz.asc   (with 
props)
release/commons/daemon/source/commons-daemon-1.0.15-src.tar.gz.md5
release/commons/daemon/source/commons-daemon-1.0.15-src.tar.gz.sha1
release/commons/daemon/source/commons-daemon-1.0.15-src.zip   (with props)
release/commons/daemon/source/commons-daemon-1.0.15-src.zip.asc   (with 
props)
release/commons/daemon/source/commons-daemon-1.0.15-src.zip.md5
release/commons/daemon/source/commons-daemon-1.0.15-src.zip.sha1
Modified:
release/commons/daemon/README.html
release/commons/daemon/RELEASE-NOTES.txt
release/commons/daemon/binaries/README.html
release/commons/daemon/binaries/windows/README.html
release/commons/daemon/source/README.html

Modified: release/commons/daemon/README.html
==
--- release/commons/daemon/README.html (original)
+++ release/commons/daemon/README.html Tue Apr  2 14:03:49 2013
@@ -1,7 +1,7 @@
-h1Commons Daemon 1.0.14/h1
+h1Commons Daemon 1.0.15/h1
 
 p
-  This is the current release version of Commons Daemon, version 1.0.14.
+  This is the current release version of Commons Daemon, version 1.0.15.
   This release is available in both binary and source distributions.
 /p
 
@@ -69,21 +69,21 @@
   br
   $ pgpk -a KEYS
   br
-  $ pgpv commons-daemon-1.0.14.tar.gz.asc
+  $ pgpv commons-daemon-1.0.15.tar.gz.asc
 /li
 li
   PGP command line (some versions):
   br
   $ pgp -ka KEYS
   br
-  $ pgp commons-daemon-1.0.14.tar.gz.asc
+  $ pgp commons-daemon-1.0.15.tar.gz.asc
 /li
 li
   GnuPG:
   br
   $ gpg --import KEYS
   br
-  $ gpg --verify commons-daemon-1.0.14.tar.gz.asc
+  $ gpg --verify commons-daemon-1.0.15.tar.gz.asc
 /li
   /ul
 p

Modified: release/commons/daemon/RELEASE-NOTES.txt
==
--- release/commons/daemon/RELEASE-NOTES.txt (original)
+++ release/commons/daemon/RELEASE-NOTES.txt Tue Apr  2 14:03:49 2013
@@ -1,5 +1,5 @@
 Apache Commons Daemon
-   Version 1.0.14
+   Version 1.0.15
Release Notes
 
 
@@ -84,6 +84,8 @@
 
 BUG FIXES:
 
+1.0.15: DAEMON-288, DAEMON-289, DAEMON-291, DAEMON-292
+
 1.0.14: DAEMON-278, DAEMON-280, DAEMON-281, DAEMON-283, DAEMON-284, DAEMON-286,
 DAEMON-287
 

Modified: release/commons/daemon/binaries/README.html
==
--- release/commons/daemon/binaries/README.html (original)
+++ release/commons/daemon/binaries/README.html Tue Apr  2 14:03:49 2013
@@ -1,7 +1,7 @@
-h1Commons Daemon 1.0.14/h1
+h1Commons Daemon 1.0.15/h1
 
 p
-  This is the current release

svn commit: r1716 - in /release/commons/daemon: ./ binaries/ binaries/windows/ source/

2013-04-02 Thread mturk 
Author: mturk
Date: Tue Apr  2 14:03:49 2013
New Revision: 1716

Log:
Upload 1.0.15 release

Added:
release/commons/daemon/binaries/commons-daemon-1.0.15-bin.tar.gz   (with 
props)
release/commons/daemon/binaries/commons-daemon-1.0.15-bin.tar.gz.asc   
(with props)
release/commons/daemon/binaries/commons-daemon-1.0.15-bin.tar.gz.md5
release/commons/daemon/binaries/commons-daemon-1.0.15-bin.tar.gz.sha1
release/commons/daemon/binaries/commons-daemon-1.0.15-bin.zip   (with props)
release/commons/daemon/binaries/commons-daemon-1.0.15-bin.zip.asc   (with 
props)
release/commons/daemon/binaries/commons-daemon-1.0.15-bin.zip.md5
release/commons/daemon/binaries/commons-daemon-1.0.15-bin.zip.sha1
release/commons/daemon/binaries/commons-daemon-1.0.15.jar   (with props)
release/commons/daemon/binaries/commons-daemon-1.0.15.jar.asc   (with props)
release/commons/daemon/binaries/commons-daemon-1.0.15.jar.md5
release/commons/daemon/binaries/commons-daemon-1.0.15.jar.sha1

release/commons/daemon/binaries/windows/commons-daemon-1.0.15-bin-windows.zip   
(with props)

release/commons/daemon/binaries/windows/commons-daemon-1.0.15-bin-windows.zip.asc
   (with props)

release/commons/daemon/binaries/windows/commons-daemon-1.0.15-bin-windows.zip.md5

release/commons/daemon/binaries/windows/commons-daemon-1.0.15-bin-windows.zip.sha1
release/commons/daemon/source/commons-daemon-1.0.15-native-src.tar.gz   
(with props)
release/commons/daemon/source/commons-daemon-1.0.15-native-src.tar.gz.asc   
(with props)
release/commons/daemon/source/commons-daemon-1.0.15-native-src.tar.gz.md5
release/commons/daemon/source/commons-daemon-1.0.15-native-src.tar.gz.sha1
release/commons/daemon/source/commons-daemon-1.0.15-native-src.zip   (with 
props)
release/commons/daemon/source/commons-daemon-1.0.15-native-src.zip.asc   
(with props)
release/commons/daemon/source/commons-daemon-1.0.15-native-src.zip.md5
release/commons/daemon/source/commons-daemon-1.0.15-native-src.zip.sha1
release/commons/daemon/source/commons-daemon-1.0.15-src.tar.gz   (with 
props)
release/commons/daemon/source/commons-daemon-1.0.15-src.tar.gz.asc   (with 
props)
release/commons/daemon/source/commons-daemon-1.0.15-src.tar.gz.md5
release/commons/daemon/source/commons-daemon-1.0.15-src.tar.gz.sha1
release/commons/daemon/source/commons-daemon-1.0.15-src.zip   (with props)
release/commons/daemon/source/commons-daemon-1.0.15-src.zip.asc   (with 
props)
release/commons/daemon/source/commons-daemon-1.0.15-src.zip.md5
release/commons/daemon/source/commons-daemon-1.0.15-src.zip.sha1
Modified:
release/commons/daemon/README.html
release/commons/daemon/RELEASE-NOTES.txt
release/commons/daemon/binaries/README.html
release/commons/daemon/binaries/windows/README.html
release/commons/daemon/source/README.html

Modified: release/commons/daemon/README.html
==
--- release/commons/daemon/README.html (original)
+++ release/commons/daemon/README.html Tue Apr  2 14:03:49 2013
@@ -1,7 +1,7 @@
-h1Commons Daemon 1.0.14/h1
+h1Commons Daemon 1.0.15/h1
 
 p
-  This is the current release version of Commons Daemon, version 1.0.14.
+  This is the current release version of Commons Daemon, version 1.0.15.
   This release is available in both binary and source distributions.
 /p
 
@@ -69,21 +69,21 @@
   br
   $ pgpk -a KEYS
   br
-  $ pgpv commons-daemon-1.0.14.tar.gz.asc
+  $ pgpv commons-daemon-1.0.15.tar.gz.asc
 /li
 li
   PGP command line (some versions):
   br
   $ pgp -ka KEYS
   br
-  $ pgp commons-daemon-1.0.14.tar.gz.asc
+  $ pgp commons-daemon-1.0.15.tar.gz.asc
 /li
 li
   GnuPG:
   br
   $ gpg --import KEYS
   br
-  $ gpg --verify commons-daemon-1.0.14.tar.gz.asc
+  $ gpg --verify commons-daemon-1.0.15.tar.gz.asc
 /li
   /ul
 p

Modified: release/commons/daemon/RELEASE-NOTES.txt
==
--- release/commons/daemon/RELEASE-NOTES.txt (original)
+++ release/commons/daemon/RELEASE-NOTES.txt Tue Apr  2 14:03:49 2013
@@ -1,5 +1,5 @@
 Apache Commons Daemon
-   Version 1.0.14
+   Version 1.0.15
Release Notes
 
 
@@ -84,6 +84,8 @@
 
 BUG FIXES:
 
+1.0.15: DAEMON-288, DAEMON-289, DAEMON-291, DAEMON-292
+
 1.0.14: DAEMON-278, DAEMON-280, DAEMON-281, DAEMON-283, DAEMON-284, DAEMON-286,
 DAEMON-287
 

Modified: release/commons/daemon/binaries/README.html
==
--- release/commons/daemon/binaries/README.html (original)
+++ release/commons/daemon/binaries/README.html Tue Apr  2 14:03:49 2013
@@ -1,7 +1,7 @@
-h1Commons Daemon 1.0.14/h1
+h1Commons Daemon 1.0.15/h1
 
 p
-  This is the current release

svn commit: r1463550 - in /commons/proper/daemon/tags: COMMONS_DAEMON_1_0_15/ COMMONS_DAEMON_1_0_15_RC1/

2013-04-02 Thread mturk 
Author: mturk
Date: Tue Apr  2 14:04:37 2013
New Revision: 1463550

URL: http://svn.apache.org/r1463550
Log:
Promote RC1 to release as per vote

Added:
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_15/
  - copied from r1463549, 
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_15_RC1/
Removed:
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_15_RC1/

svn commit: r1462073 - in /commons/proper/daemon/branches/1.0.x: RELEASE-NOTES.txt pom.xml src/site/xdoc/binaries.xml src/site/xdoc/download_daemon.xml

2013-03-28 Thread mturk 
Author: mturk
Date: Thu Mar 28 12:40:57 2013
New Revision: 1462073

URL: http://svn.apache.org/r1462073
Log:
Update versions before tag

Modified:
commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
commons/proper/daemon/branches/1.0.x/pom.xml
commons/proper/daemon/branches/1.0.x/src/site/xdoc/binaries.xml
commons/proper/daemon/branches/1.0.x/src/site/xdoc/download_daemon.xml

Modified: commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt?rev=1462073r1=1462072r2=1462073view=diff
==
--- commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt Thu Mar 28 12:40:57 
2013
@@ -84,7 +84,7 @@ NEW FEATURES:
 
 BUG FIXES:
 
-1.0.15: DAEMON-288, DAEMON-291, DAEMON-292
+1.0.15: DAEMON-288, DAEMON-289, DAEMON-291, DAEMON-292
 
 1.0.14: DAEMON-278, DAEMON-280, DAEMON-281, DAEMON-283, DAEMON-284, DAEMON-286,
 DAEMON-287

Modified: commons/proper/daemon/branches/1.0.x/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/pom.xml?rev=1462073r1=1462072r2=1462073view=diff
==
--- commons/proper/daemon/branches/1.0.x/pom.xml (original)
+++ commons/proper/daemon/branches/1.0.x/pom.xml Thu Mar 28 12:40:57 2013
@@ -27,7 +27,7 @@
   modelVersion4.0.0/modelVersion
   groupIdcommons-daemon/groupId
   artifactIdcommons-daemon/artifactId
-  version1.0.15-SNAPSHOT/version
+  version1.0.15/version
   nameCommons 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/branches/1.0.x/src/site/xdoc/binaries.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/site/xdoc/binaries.xml?rev=1462073r1=1462072r2=1462073view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/site/xdoc/binaries.xml (original)
+++ commons/proper/daemon/branches/1.0.x/src/site/xdoc/binaries.xml Thu Mar 28 
12:40:57 2013
@@ -36,7 +36,7 @@ corresponding to your operating system. 
 section name=How do I get the executable?
 subsection name=procrun
 p
-The Windows archive (e.g. commons-daemon-1.0.14-bin-windows.zip) contains 2 
different executables:
+The Windows archive (e.g. commons-daemon-1.0.15-bin-windows.zip) contains 2 
different executables:
 ul
 liprunsrv.exe - service application for running applications as 
services./li
 liprunmgr.exe - the GUI manager application used to monitor and configure 
installed services./li

Modified: commons/proper/daemon/branches/1.0.x/src/site/xdoc/download_daemon.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/site/xdoc/download_daemon.xml?rev=1462073r1=1462072r2=1462073view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/site/xdoc/download_daemon.xml 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/site/xdoc/download_daemon.xml Thu 
Mar 28 12:40:57 2013
@@ -95,32 +95,32 @@ limitations under the License.
   /p
 /subsection
 /section
-section name=Commons Daemon 1.0.14 
+section name=Commons Daemon 1.0.15 
   subsection name=Binaries
 table
   tr
-  tda 
href=[preferred]/commons/daemon/binaries/commons-daemon-1.0.14-bin.tar.gzcommons-daemon-1.0.14-bin.tar.gz/a/td
-  tda 
href=http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.14-bin.tar.gz.md5;md5/a/td
-  tda 
href=http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.14-bin.tar.gz.asc;pgp/a/td
+  tda 
href=[preferred]/commons/daemon/binaries/commons-daemon-1.0.15-bin.tar.gzcommons-daemon-1.0.15-bin.tar.gz/a/td
+  tda 
href=http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.15-bin.tar.gz.md5;md5/a/td
+  tda 
href=http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.15-bin.tar.gz.asc;pgp/a/td
   /tr
   tr
-  tda 
href=[preferred]/commons/daemon/binaries/commons-daemon-1.0.14-bin.zipcommons-daemon-1.0.14-bin.zip/a/td
-  tda 
href=http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.14-bin.zip.md5;md5/a/td
-  tda 
href=http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.14-bin.zip.asc;pgp/a/td
+  tda 
href=[preferred]/commons/daemon/binaries/commons-daemon-1.0.15-bin.zipcommons-daemon-1.0.15-bin.zip/a/td
+  tda 
href=http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.15-bin.zip.md5;md5/a/td
+  tda 
href=http://www.apache.org/dist/commons

svn commit: r1462074 - /commons/proper/daemon/tags/COMMONS_DAEMON_1_0_15_RC1/

2013-03-28 Thread mturk 
Author: mturk
Date: Thu Mar 28 12:42:26 2013
New Revision: 1462074

URL: http://svn.apache.org/r1462074
Log:
Tag 1.0.15 release candidate

Added:
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_15_RC1/
  - copied from r1462073, commons/proper/daemon/branches/1.0.x/

svn commit: r1462075 - /commons/proper/daemon/branches/1.0.x/pom.xml

2013-03-28 Thread mturk 
Author: mturk
Date: Thu Mar 28 12:43:15 2013
New Revision: 1462075

URL: http://svn.apache.org/r1462075
Log:
Bump to next dev version

Modified:
commons/proper/daemon/branches/1.0.x/pom.xml

Modified: commons/proper/daemon/branches/1.0.x/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/pom.xml?rev=1462075r1=1462074r2=1462075view=diff
==
--- commons/proper/daemon/branches/1.0.x/pom.xml (original)
+++ commons/proper/daemon/branches/1.0.x/pom.xml Thu Mar 28 12:43:15 2013
@@ -27,7 +27,7 @@
   modelVersion4.0.0/modelVersion
   groupIdcommons-daemon/groupId
   artifactIdcommons-daemon/artifactId
-  version1.0.15/version
+  version1.0.16-SNAPSHOT/version
   nameCommons 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 
--

svn commit: r1461424 - in /commons/proper/daemon/branches/1.0.x/src/native/unix/support: apsupport.m4 config.sub

2013-03-27 Thread mturk 
Author: mturk
Date: Wed Mar 27 06:42:53 2013
New Revision: 1461424

URL: http://svn.apache.org/r1461424
Log:
Further improove hpux support

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4
commons/proper/daemon/branches/1.0.x/src/native/unix/support/config.sub

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4?rev=1461424r1=1461423r2=1461424view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 
Wed Mar 27 06:42:53 2013
@@ -45,11 +45,13 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
   sysv)
 CFLAGS=$CFLAGS -DOS_SYSV -DDSO_DLFCN
 LIBS=$LIBS -ldl
+supported_os=sysv
 ;;
   sysv4)
 CFLAGS=$CFLAGS -DOS_SYSV -DDSO_DLFCN -Kthread
 LDFLAGS=-Kthread $LDFLAGS
 LIBS=$LIBS -ldl
+supported_os=sysv4
 ;;
   freebsd*)
 CFLAGS=$CFLAGS -DOS_FREEBSD -DDSO_DLFCN -D_THREAD_SAFE -pthread
@@ -59,52 +61,16 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
   osf5*)
 CFLAGS=$CFLAGS -pthread -DOS_TRU64 -DDSO_DLFCN -D_XOPEN_SOURCE_EXTENDED
 LDFLAGS=$LDFLAGS -pthread
-;;
-  hpux32)
-if test x$GCC = xyes
-then
-CFLAGS=$CFLAGS -pthread -milp32
-LDFLAGS=$LDFLAGS -pthread -milp32
-else
-CFLAGS=$CFLAGS -mt +DD32
-LDFLAGS=$LDFLAGS -mt +DD32
-fi
-CFLAGS=$CFLAGS -DOS_HPUX -DDSO_DLFCN
-supported_os=hp-ux
-if test $host_cpu = ia64
-then
-host_cpu=ia64n
-else
-host_cpu=hppa2.0n
-fi
-;;
-  hpux64)
-if test x$GCC = xyes
-then
-CFLAGS=$CFLAGS -pthread -mlp64
-LDFLAGS=$LDFLAGS -pthread -mlp64
-else
-CFLAGS=$CFLAGS -mt +DD64
-LDFLAGS=$LDFLAGS -mt +DD64
-fi
-CFLAGS=$CFLAGS -DOS_HPUX -DDSO_DLFCN
-supported_os=hp-ux
-if test $host_cpu = ia64
-then
-host_cpu=ia64w
-else
-host_cpu=hppa2.0w
-fi
+supported_os=osf5
 ;;
   hpux*)
-CFLAGS=$CFLAGS -pthread -DOS_HPUX -DDSO_DLFCN
-LDFLAGS=$LDFLAGS -pthread
-LIBS=$LIBS -lpthread
-supported_os=hp-ux
+CFLAGS=$CFLAGS -DOS_HPUX -DDSO_DLFCN
+supported_os=hpux
 ;;
   aix5*)
 CFLAGS=$CFLAGS -DOS_AIX -DDSO_DLFCN
 LDFLAGS=$LDFLAGS -ldl
+supported_os=aix5
 ;;
   *)
 AC_MSG_RESULT([failed])
@@ -114,77 +80,123 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
   case $host_cpu in
   powerpc)
 CFLAGS=$CFLAGS -DCPU=\\\$host_cpu\\\
-HOST_CPU=$host_cpu;;
+HOST_CPU=$host_cpu
+;;
   sparc*)
 CFLAGS=$CFLAGS -DCPU=\\\$host_cpu\\\
-HOST_CPU=$host_cpu;;
+HOST_CPU=$host_cpu
+;;
   i?86|x86)
 CFLAGS=$CFLAGS -DCPU=\\\i386\\\
-HOST_CPU=i386;;
+HOST_CPU=i386
+;;
   x86_64 | amd64)
 CFLAGS=$CFLAGS -DCPU=\\\amd64\\\
-HOST_CPU=amd64;;
+HOST_CPU=amd64
+;;
   bs2000)
 CFLAGS=$CFLAGS -DCPU=\\\osd\\\ -DCHARSET_EBCDIC -DOSD_POSIX
 supported_os=osd
 LDFLAGS=-Kno_link_stdlibs -B llm4
 LIBS=$LIBS -lBLSLIB
 LDCMD=/opt/C/bin/cc
-HOST_CPU=osd;;
+HOST_CPU=osd
+;;
   mips)
 CFLAGS=$CFLAGS -DCPU=\\\mips\\\
 supported_os=mips
-HOST_CPU=mips;;
+HOST_CPU=mips
+;;
   alpha*)
 CFLAGS=$CFLAGS -DCPU=\\\alpha\\\
 supported_os=alpha
-HOST_CPU=alpha;;
+HOST_CPU=alpha
+;;
   hppa2.0w|hppa64)
 CFLAGS=$CFLAGS -DCPU=\\\PA_RISC2.0W\\\ -DSO_EXT=\\\sl\\\
-HOST_CPU=PA_RISC2.0W;;
+host_cpu=hppa2.0w
+HOST_CPU=PA_RISC2.0W
+;;
   hppa2.0n)
 CFLAGS=$CFLAGS -DCPU=\\\PA_RISC2.0N\\\ -DSO_EXT=\\\sl\\\
-HOST_CPU=PA_RISC2.0N;;
+HOST_CPU=PA_RISC2.0N
+;;
   hppa2.0)
-CFLAGS=$CFLAGS -DCPU=\\\PA_RISC2.0\\\ -DSO_EXT=\\\sl\\\
-HOST_CPU=PA_RISC2.0;;
+if test $supported_os = hpux
+then
+host_cpu=hppa2.0w
+HOST_CPU=PA_RISC2.0W
+else
+HOST_CPU=PA_RISC2.0
+fi
+CFLAGS=$CFLAGS -DCPU=\\\$HOST_CPU\\\ -DSO_EXT=\\\sl\\\
+;;
   mipsel)
 CFLAGS=$CFLAGS -DCPU=\\\mipsel\\\
 supported_os=mipsel
-HOST_CPU=mipsel;;
+HOST_CPU=mipsel
+;;
   ia64w)
-if test $supported_os = hp-ux
+CFLAGS=$CFLAGS -DCPU=\\\IA64W\\\ -DSO_EXT=\\\so\\\
+HOST_CPU=IA64W
+;;
+  ia64n)
+CFLAGS=$CFLAGS -DCPU=\\\IA64N\\\ -DSO_EXT=\\\so\\\
+HOST_CPU=IA64N
+;;
+  ia64)
+if test $supported_os = hpux
 then
 CFLAGS=$CFLAGS -DCPU=\\\IA64W\\\ -DSO_EXT=\\\so\\\
+host_cpu=ia64w
 HOST_CPU=IA64W
 else
 CFLAGS=$CFLAGS -DCPU=\\\ia64\\\
 HOST_CPU=ia64
 fi
-  ;;
-  ia64|ia64n)
-if test $supported_os = hp-ux
-then
-CFLAGS=$CFLAGS -DCPU=\\\IA64N\\\ -DSO_EXT=\\\so\\\
-HOST_CPU=IA64N
-else
-CFLAGS=$CFLAGS -DCPU=\\\ia64\\\
-HOST_CPU=ia64
-fi
 ;;
   s390)
 CFLAGS

svn commit: r1461425 - /commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4

2013-03-27 Thread mturk 
Author: mturk
Date: Wed Mar 27 06:52:37 2013
New Revision: 1461425

URL: http://svn.apache.org/r1461425
Log:
Further improove hpux support

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4?rev=1461425r1=1461424r2=1461425view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 
Wed Mar 27 06:52:37 2013
@@ -65,7 +65,8 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
 ;;
   hpux*)
 CFLAGS=$CFLAGS -DOS_HPUX -DDSO_DLFCN
-supported_os=hpux
+supported_os=hp-ux
+host_os=hpux
 ;;
   aix5*)
 CFLAGS=$CFLAGS -DOS_AIX -DDSO_DLFCN
@@ -122,7 +123,7 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
 HOST_CPU=PA_RISC2.0N
 ;;
   hppa2.0)
-if test $supported_os = hpux
+if test $host_os = hpux
 then
 host_cpu=hppa2.0w
 HOST_CPU=PA_RISC2.0W
@@ -145,7 +146,7 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
 HOST_CPU=IA64N
 ;;
   ia64)
-if test $supported_os = hpux
+if test $host_os = hpux
 then
 CFLAGS=$CFLAGS -DCPU=\\\IA64W\\\ -DSO_EXT=\\\so\\\
 host_cpu=ia64w
@@ -170,7 +171,7 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
 AC_MSG_ERROR([Unsupported CPU architecture $host_cpu]);;
   esac
 
-  case $supported_os-$host_cpu in
+  case $host_os-$host_cpu in
   hpux-ia64n|hpux-hppa2.0n)
 if test x$GCC = xyes
 then

svn commit: r1461427 - /commons/proper/daemon/branches/1.0.x/src/native/unix/configure

2013-03-27 Thread mturk 
Author: mturk
Date: Wed Mar 27 07:00:37 2013
New Revision: 1461427

URL: http://svn.apache.org/r1461427
Log:
Regen configure

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/configure

Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/configure
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/configure?rev=1461427r1=1461426r2=1461427view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/configure (original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/configure Wed Mar 27 
07:00:37 2013
@@ -2573,11 +2573,13 @@ echo $ECHO_N checking C flags dependant
   sysv)
 CFLAGS=$CFLAGS -DOS_SYSV -DDSO_DLFCN
 LIBS=$LIBS -ldl
+supported_os=sysv
 ;;
   sysv4)
 CFLAGS=$CFLAGS -DOS_SYSV -DDSO_DLFCN -Kthread
 LDFLAGS=-Kthread $LDFLAGS
 LIBS=$LIBS -ldl
+supported_os=sysv4
 ;;
   freebsd*)
 CFLAGS=$CFLAGS -DOS_FREEBSD -DDSO_DLFCN -D_THREAD_SAFE -pthread
@@ -2587,52 +2589,17 @@ echo $ECHO_N checking C flags dependant
   osf5*)
 CFLAGS=$CFLAGS -pthread -DOS_TRU64 -DDSO_DLFCN -D_XOPEN_SOURCE_EXTENDED
 LDFLAGS=$LDFLAGS -pthread
-;;
-  hpux32)
-if test x$GCC = xyes
-then
-CFLAGS=$CFLAGS -pthread -milp32
-LDFLAGS=$LDFLAGS -pthread -milp32
-else
-CFLAGS=$CFLAGS -mt +DD32
-LDFLAGS=$LDFLAGS -mt +DD32
-fi
-CFLAGS=$CFLAGS -DOS_HPUX -DDSO_DLFCN
-supported_os=hp-ux
-if test $host_cpu = ia64
-then
-host_cpu=ia64n
-else
-host_cpu=hppa2.0n
-fi
-;;
-  hpux64)
-if test x$GCC = xyes
-then
-CFLAGS=$CFLAGS -pthread -mlp64
-LDFLAGS=$LDFLAGS -pthread -mlp64
-else
-CFLAGS=$CFLAGS -mt +DD64
-LDFLAGS=$LDFLAGS -mt +DD64
-fi
-CFLAGS=$CFLAGS -DOS_HPUX -DDSO_DLFCN
-supported_os=hp-ux
-if test $host_cpu = ia64
-then
-host_cpu=ia64w
-else
-host_cpu=hppa2.0w
-fi
+supported_os=osf5
 ;;
   hpux*)
-CFLAGS=$CFLAGS -pthread -DOS_HPUX -DDSO_DLFCN
-LDFLAGS=$LDFLAGS -pthread
-LIBS=$LIBS -lpthread
+CFLAGS=$CFLAGS -DOS_HPUX -DDSO_DLFCN
 supported_os=hp-ux
+host_os=hpux
 ;;
   aix5*)
 CFLAGS=$CFLAGS -DOS_AIX -DDSO_DLFCN
 LDFLAGS=$LDFLAGS -ldl
+supported_os=aix5
 ;;
   *)
 echo $as_me:$LINENO: result: failed 5
@@ -2645,72 +2612,91 @@ echo $as_me: error: Unsupported operati
   case $host_cpu in
   powerpc)
 CFLAGS=$CFLAGS -DCPU=\\\$host_cpu\\\
-HOST_CPU=$host_cpu;;
+HOST_CPU=$host_cpu
+;;
   sparc*)
 CFLAGS=$CFLAGS -DCPU=\\\$host_cpu\\\
-HOST_CPU=$host_cpu;;
+HOST_CPU=$host_cpu
+;;
   i?86|x86)
 CFLAGS=$CFLAGS -DCPU=\\\i386\\\
-HOST_CPU=i386;;
+HOST_CPU=i386
+;;
   x86_64 | amd64)
 CFLAGS=$CFLAGS -DCPU=\\\amd64\\\
-HOST_CPU=amd64;;
+HOST_CPU=amd64
+;;
   bs2000)
 CFLAGS=$CFLAGS -DCPU=\\\osd\\\ -DCHARSET_EBCDIC -DOSD_POSIX
 supported_os=osd
 LDFLAGS=-Kno_link_stdlibs -B llm4
 LIBS=$LIBS -lBLSLIB
 LDCMD=/opt/C/bin/cc
-HOST_CPU=osd;;
+HOST_CPU=osd
+;;
   mips)
 CFLAGS=$CFLAGS -DCPU=\\\mips\\\
 supported_os=mips
-HOST_CPU=mips;;
+HOST_CPU=mips
+;;
   alpha*)
 CFLAGS=$CFLAGS -DCPU=\\\alpha\\\
 supported_os=alpha
-HOST_CPU=alpha;;
+HOST_CPU=alpha
+;;
   hppa2.0w|hppa64)
 CFLAGS=$CFLAGS -DCPU=\\\PA_RISC2.0W\\\ -DSO_EXT=\\\sl\\\
-HOST_CPU=PA_RISC2.0W;;
+host_cpu=hppa2.0w
+HOST_CPU=PA_RISC2.0W
+;;
   hppa2.0n)
 CFLAGS=$CFLAGS -DCPU=\\\PA_RISC2.0N\\\ -DSO_EXT=\\\sl\\\
-HOST_CPU=PA_RISC2.0N;;
+HOST_CPU=PA_RISC2.0N
+;;
   hppa2.0)
-CFLAGS=$CFLAGS -DCPU=\\\PA_RISC2.0\\\ -DSO_EXT=\\\sl\\\
-HOST_CPU=PA_RISC2.0;;
+if test $host_os = hpux
+then
+host_cpu=hppa2.0w
+HOST_CPU=PA_RISC2.0W
+else
+HOST_CPU=PA_RISC2.0
+fi
+CFLAGS=$CFLAGS -DCPU=\\\$HOST_CPU\\\ -DSO_EXT=\\\sl\\\
+;;
   mipsel)
 CFLAGS=$CFLAGS -DCPU=\\\mipsel\\\
 supported_os=mipsel
-HOST_CPU=mipsel;;
+HOST_CPU=mipsel
+;;
   ia64w)
-if test $supported_os = hp-ux
+CFLAGS=$CFLAGS -DCPU=\\\IA64W\\\ -DSO_EXT=\\\so\\\
+HOST_CPU=IA64W
+;;
+  ia64n)
+CFLAGS=$CFLAGS -DCPU=\\\IA64N\\\ -DSO_EXT=\\\so\\\
+HOST_CPU=IA64N
+;;
+  ia64)
+if test $host_os = hpux
 then
 CFLAGS=$CFLAGS -DCPU=\\\IA64W\\\ -DSO_EXT=\\\so\\\
+host_cpu=ia64w
 HOST_CPU=IA64W
 else
 CFLAGS=$CFLAGS -DCPU=\\\ia64\\\
 HOST_CPU=ia64
 fi
-  ;;
-  ia64|ia64n)
-if test $supported_os = hp-ux
-then
-CFLAGS=$CFLAGS -DCPU=\\\IA64N\\\ -DSO_EXT=\\\so\\\
-HOST_CPU=IA64N
-else
-CFLAGS=$CFLAGS -DCPU=\\\ia64\\\
-HOST_CPU=ia64
-fi
 ;;
   s390)
 CFLAGS=$CFLAGS -DCPU=\\\s390\\\
 supported_os=s390
-HOST_CPU=s390;;
+HOST_CPU=s390
+;;
   arm

svn commit: r1461428 - /commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4

2013-03-27 Thread mturk 
Author: mturk
Date: Wed Mar 27 07:04:15 2013
New Revision: 1461428

URL: http://svn.apache.org/r1461428
Log:
Fix copy/paste typo

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4?rev=1461428r1=1461427r2=1461428view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 
Wed Mar 27 07:04:15 2013
@@ -180,7 +180,7 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
 LIBS=$LIBS -lpthread
 else
 CFLAGS=+DD32 -mt $CFLAGS
-LDFLAGS=+DD32 -mt $CFLAGS
+LDFLAGS=+DD32 -mt $LDFLAGS
 fi
   ;;
   hpux-ia64w|hpux-hppa2.0w)
@@ -191,7 +191,7 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
 LIBS=$LIBS -lpthread
 else
 CFLAGS=+DD64 -mt $CFLAGS
-LDFLAGS=+DD64 -mt $CFLAGS
+LDFLAGS=+DD64 -mt $LDFLAGS
 fi
   ;;
   *)

svn commit: r1461430 - /commons/proper/daemon/branches/1.0.x/src/native/unix/configure

2013-03-27 Thread mturk 
Author: mturk
Date: Wed Mar 27 07:05:04 2013
New Revision: 1461430

URL: http://svn.apache.org/r1461430
Log:
Regen configure

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/configure

Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/configure
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/configure?rev=1461430r1=1461429r2=1461430view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/configure (original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/configure Wed Mar 27 
07:05:04 2013
@@ -2714,7 +2714,7 @@ echo $as_me: error: Unsupported CPU arc
 LIBS=$LIBS -lpthread
 else
 CFLAGS=+DD32 -mt $CFLAGS
-LDFLAGS=+DD32 -mt $CFLAGS
+LDFLAGS=+DD32 -mt $LDFLAGS
 fi
   ;;
   hpux-ia64w|hpux-hppa2.0w)
@@ -2725,7 +2725,7 @@ echo $as_me: error: Unsupported CPU arc
 LIBS=$LIBS -lpthread
 else
 CFLAGS=+DD64 -mt $CFLAGS
-LDFLAGS=+DD64 -mt $CFLAGS
+LDFLAGS=+DD64 -mt $LDFLAGS
 fi
   ;;
   *)

svn commit: r1461438 - /commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4

2013-03-27 Thread mturk 
Author: mturk
Date: Wed Mar 27 08:09:02 2013
New Revision: 1461438

URL: http://svn.apache.org/r1461438
Log:
gcc for parisc does not have milp32/mlp64 flags

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4?rev=1461438r1=1461437r2=1461438view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 
Wed Mar 27 08:09:02 2013
@@ -118,7 +118,7 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
 host_cpu=hppa2.0w
 HOST_CPU=PA_RISC2.0W
 ;;
-  hppa2.0n)
+  hppa2.0n|hppa32)
 CFLAGS=$CFLAGS -DCPU=\\\PA_RISC2.0N\\\ -DSO_EXT=\\\sl\\\
 HOST_CPU=PA_RISC2.0N
 ;;
@@ -171,32 +171,45 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
 AC_MSG_ERROR([Unsupported CPU architecture $host_cpu]);;
   esac
 
-  case $host_os-$host_cpu in
-  hpux-ia64n|hpux-hppa2.0n)
-if test x$GCC = xyes
-then
+  if test x$GCC = xyes
+  then
+case $host_os-$host_cpu in
+hpux-ia64n)
 CFLAGS=-milp32 -pthread $CFLAGS
 LDFLAGS=-milp32 -pthread $LDFLAGS
 LIBS=$LIBS -lpthread
-else
-CFLAGS=+DD32 -mt $CFLAGS
-LDFLAGS=+DD32 -mt $LDFLAGS
-fi
-  ;;
-  hpux-ia64w|hpux-hppa2.0w)
-if test x$GCC = xyes
-then
+;;
+hpux-ia64w)
 CFLAGS=-mlp64 -pthread $CFLAGS
 LDFLAGS=-mlp64 -pthread $LDFLAGS
 LIBS=$LIBS -lpthread
-else
+;;
+hpux-*)
+CFLAGS=-pthread $CFLAGS
+LDFLAGS=-pthread $LDFLAGS
+LIBS=$LIBS -lpthread
+;;
+*)
+;;
+esac
+  else
+case $host_os-$host_cpu in
+hpux-ia64n|hpux-hppa2.0n)
+CFLAGS=+DD32 -mt $CFLAGS
+LDFLAGS=+DD32 -mt $LDFLAGS
+;;
+hpux-ia64w|hpux-hppa2.0w)
 CFLAGS=+DD64 -mt $CFLAGS
 LDFLAGS=+DD64 -mt $LDFLAGS
-fi
-  ;;
-  *)
-  ;;
-  esac
+;;
+hpux-*)
+CFLAGS=-mt $CFLAGS
+LDFLAGS=-mt $LDFLAGS
+;;
+*)
+;;
+esac
+  fi
 
   AC_MSG_RESULT([ok])
   AC_SUBST(CFLAGS)

svn commit: r1461439 - /commons/proper/daemon/branches/1.0.x/src/native/unix/configure

2013-03-27 Thread mturk 
Author: mturk
Date: Wed Mar 27 08:11:16 2013
New Revision: 1461439

URL: http://svn.apache.org/r1461439
Log:
Regen configure

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/configure

Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/configure
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/configure?rev=1461439r1=1461438r2=1461439view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/configure (original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/configure Wed Mar 27 
08:11:16 2013
@@ -2649,7 +2649,7 @@ echo $as_me: error: Unsupported operati
 host_cpu=hppa2.0w
 HOST_CPU=PA_RISC2.0W
 ;;
-  hppa2.0n)
+  hppa2.0n|hppa32)
 CFLAGS=$CFLAGS -DCPU=\\\PA_RISC2.0N\\\ -DSO_EXT=\\\sl\\\
 HOST_CPU=PA_RISC2.0N
 ;;
@@ -2705,32 +2705,45 @@ echo $as_me: error: Unsupported CPU arc
{ (exit 1); exit 1; }; };;
   esac
 
-  case $host_os-$host_cpu in
-  hpux-ia64n|hpux-hppa2.0n)
-if test x$GCC = xyes
-then
+  if test x$GCC = xyes
+  then
+case $host_os-$host_cpu in
+hpux-ia64n)
 CFLAGS=-milp32 -pthread $CFLAGS
 LDFLAGS=-milp32 -pthread $LDFLAGS
 LIBS=$LIBS -lpthread
-else
-CFLAGS=+DD32 -mt $CFLAGS
-LDFLAGS=+DD32 -mt $LDFLAGS
-fi
-  ;;
-  hpux-ia64w|hpux-hppa2.0w)
-if test x$GCC = xyes
-then
+;;
+hpux-ia64w)
 CFLAGS=-mlp64 -pthread $CFLAGS
 LDFLAGS=-mlp64 -pthread $LDFLAGS
 LIBS=$LIBS -lpthread
-else
+;;
+hpux-*)
+CFLAGS=-pthread $CFLAGS
+LDFLAGS=-pthread $LDFLAGS
+LIBS=$LIBS -lpthread
+;;
+*)
+;;
+esac
+  else
+case $host_os-$host_cpu in
+hpux-ia64n|hpux-hppa2.0n)
+CFLAGS=+DD32 -mt $CFLAGS
+LDFLAGS=+DD32 -mt $LDFLAGS
+;;
+hpux-ia64w|hpux-hppa2.0w)
 CFLAGS=+DD64 -mt $CFLAGS
 LDFLAGS=+DD64 -mt $LDFLAGS
-fi
-  ;;
-  *)
-  ;;
-  esac
+;;
+hpux-*)
+CFLAGS=-mt $CFLAGS
+LDFLAGS=-mt $LDFLAGS
+;;
+*)
+;;
+esac
+  fi
 
   echo $as_me:$LINENO: result: ok 5
 echo ${ECHO_T}ok 6

svn commit: r1461070 - in /commons/proper/daemon/branches/1.0.x: RELEASE-NOTES.txt src/native/windows/apps/prunsrv/prunsrv.c

2013-03-26 Thread mturk 
Author: mturk
Date: Tue Mar 26 12:05:46 2013
New Revision: 1461070

URL: http://svn.apache.org/r1461070
Log:
DAEMON-288: Apply patch provided by Mike Miller

Modified:
commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c

Modified: commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt?rev=1461070r1=1461069r2=1461070view=diff
==
--- commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt Tue Mar 26 12:05:46 
2013
@@ -84,7 +84,7 @@ NEW FEATURES:
 
 BUG FIXES:
 
-1.0.15:
+1.0.15: DAEMON-288
 
 1.0.14: DAEMON-278, DAEMON-280, DAEMON-281, DAEMON-283, DAEMON-284, DAEMON-286,
 DAEMON-287

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=1461070r1=1461069r2=1461070view=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 
Tue Mar 26 12:05:46 2013
@@ -1076,7 +1076,6 @@ cleanup:
 CloseHandle(gSignalThread);
 gSignalEvent = NULL;
 }
-SetEvent(gShutdownEvent);
 if (timeout  0x7FFF)
 timeout = INFINITE; /* If the timeout was '-1' wait forewer */
 if (wait_to_die  !timeout)
@@ -1112,8 +,8 @@ cleanup:
 apxHandleSendMessage(gWorker, WM_CLOSE, 0, 0);
 }
 
-apxLogWrite(APXLOG_MARK_INFO Service stopped.);
-reportServiceStatusStopped(0);
+apxLogWrite(APXLOG_MARK_INFO Service stop thread completed.);
+SetEvent(gShutdownEvent);
 return rv;
 }
 
@@ -1538,15 +1537,18 @@ void WINAPI serviceMain(DWORD argc, LPTS
 goto cleanup;
 }
 if (gShutdownEvent) {
-reportServiceStatus(SERVICE_STOP_PENDING, NO_ERROR, 0);
+
 /* Ensure that shutdown thread exits before us */
 apxLogWrite(APXLOG_MARK_DEBUG Waiting for ShutdownEvent);
+reportServiceStatus(SERVICE_STOP_PENDING, NO_ERROR, ONE_MINUTE);
 WaitForSingleObject(gShutdownEvent, ONE_MINUTE);
 apxLogWrite(APXLOG_MARK_DEBUG ShutdownEvent signaled);
 CloseHandle(gShutdownEvent);
+
 /* This will cause to wait for all threads to exit
  */
 apxLogWrite(APXLOG_MARK_DEBUG Waiting 1 minute for all threads to 
exit);
+reportServiceStatus(SERVICE_STOP_PENDING, NO_ERROR, ONE_MINUTE);
 apxDestroyJvm(ONE_MINUTE);
 }
 else {

svn commit: r1461071 - /commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt

2013-03-26 Thread mturk 
Author: mturk
Date: Tue Mar 26 12:12:31 2013
New Revision: 1461071

URL: http://svn.apache.org/r1461071
Log:
Add two more Jira issues

Modified:
commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt

Modified: commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt?rev=1461071r1=1461070r2=1461071view=diff
==
--- commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt Tue Mar 26 12:12:31 
2013
@@ -84,7 +84,7 @@ NEW FEATURES:
 
 BUG FIXES:
 
-1.0.15: DAEMON-288
+1.0.15: DAEMON-288, DAEMON-291, DAEMON-292
 
 1.0.14: DAEMON-278, DAEMON-280, DAEMON-281, DAEMON-283, DAEMON-284, DAEMON-286,
 DAEMON-287

svn commit: r1461080 - /commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4

2013-03-26 Thread mturk 
Author: mturk
Date: Tue Mar 26 12:26:10 2013
New Revision: 1461080

URL: http://svn.apache.org/r1461080
Log:
Add support for non-gcc HP-UX compiler

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4?rev=1461080r1=1461079r2=1461080view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 
Tue Mar 26 12:26:10 2013
@@ -61,9 +61,15 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
 LDFLAGS=$LDFLAGS -pthread
 ;;
   hpux*)
-CFLAGS=$CFLAGS -pthread -DOS_HPUX -DDSO_DLFCN
-LDFLAGS=$LDFLAGS -pthread
-LIBS=$LIBS -lpthread
+if test x$GCC = xyes
+then
+CFLAGS=$CFLAGS -pthread -DOS_HPUX -DDSO_DLFCN
+LDFLAGS=$LDFLAGS -pthread
+LIBS=$LIBS -lpthread
+else
+CFLAGS=$CFLAGS -mt -DOS_HPUX -DDSO_DLFCN
+LDFLAGS=$LDFLAGS -mt
+fi
 supported_os=hp-ux
 ;;
   aix5*)
@@ -119,8 +125,14 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
   ia64w)
 if test $supported_os = hp-ux
 then
-CFLAGS=$CFLAGS -mlp64 -DCPU=\\\IA64W\\\ -DSO_EXT=\\\so\\\
-LDFLAGS=$LDFLAGS -mlp64
+if test x$GCC = xyes
+then
+CFLAGS=$CFLAGS -mlp64 -DCPU=\\\IA64W\\\ -DSO_EXT=\\\so\\\
+LDFLAGS=$LDFLAGS -mlp64
+else
+CFLAGS=$CFLAGS +DD64 -DCPU=\\\IA64W\\\ -DSO_EXT=\\\so\\\
+LDFLAGS=$LDFLAGS +DD64
+fi
 else
 CFLAGS=$CFLAGS -DCPU=\\\ia64\\\
 fi
@@ -128,8 +140,14 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
   ia64|ia64n)
 if test $supported_os = hp-ux
 then
-CFLAGS=$CFLAGS -milp32 -DCPU=\\\IA64N\\\ -DSO_EXT=\\\so\\\
-LDFLAGS=$LDFLAGS -milp32
+if test x$GCC = xyes
+then
+CFLAGS=$CFLAGS +DD32 -DCPU=\\\IA64N\\\ -DSO_EXT=\\\so\\\
+LDFLAGS=$LDFLAGS +DD32
+else
+CFLAGS=$CFLAGS -milp32 -DCPU=\\\IA64N\\\ -DSO_EXT=\\\so\\\
+LDFLAGS=$LDFLAGS -milp32
+fi
 HOST_CPU=IA64N
 else
 CFLAGS=$CFLAGS -DCPU=\\\ia64\\\

svn commit: r1461085 - /commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4

2013-03-26 Thread mturk 
Author: mturk
Date: Tue Mar 26 12:30:54 2013
New Revision: 1461085

URL: http://svn.apache.org/r1461085
Log:
Fix typo

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4?rev=1461085r1=1461084r2=1461085view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 
Tue Mar 26 12:30:54 2013
@@ -142,11 +142,11 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
 then
 if test x$GCC = xyes
 then
-CFLAGS=$CFLAGS +DD32 -DCPU=\\\IA64N\\\ -DSO_EXT=\\\so\\\
-LDFLAGS=$LDFLAGS +DD32
-else
 CFLAGS=$CFLAGS -milp32 -DCPU=\\\IA64N\\\ -DSO_EXT=\\\so\\\
 LDFLAGS=$LDFLAGS -milp32
+else
+CFLAGS=$CFLAGS +DD32 -DCPU=\\\IA64N\\\ -DSO_EXT=\\\so\\\
+LDFLAGS=$LDFLAGS +DD32
 fi
 HOST_CPU=IA64N
 else

svn commit: r1461095 - /commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4

2013-03-26 Thread mturk 
Author: mturk
Date: Tue Mar 26 12:51:02 2013
New Revision: 1461095

URL: http://svn.apache.org/r1461095
Log:
Rewrite hp-ux part

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4?rev=1461095r1=1461094r2=1461095view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 
Tue Mar 26 12:51:02 2013
@@ -60,16 +60,44 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
 CFLAGS=$CFLAGS -pthread -DOS_TRU64 -DDSO_DLFCN -D_XOPEN_SOURCE_EXTENDED
 LDFLAGS=$LDFLAGS -pthread
 ;;
-  hpux*)
+  hpux32)
 if test x$GCC = xyes
 then
-CFLAGS=$CFLAGS -pthread -DOS_HPUX -DDSO_DLFCN
-LDFLAGS=$LDFLAGS -pthread
-LIBS=$LIBS -lpthread
+CFLAGS=$CFLAGS -pthread -mlp32
+LDFLAGS=$LDFLAGS -pthread -mlp32
 else
-CFLAGS=$CFLAGS -mt -DOS_HPUX -DDSO_DLFCN
-LDFLAGS=$LDFLAGS -mt
+CFLAGS=$CFLAGS -mt +DD32
+LDFLAGS=$LDFLAGS -mt +DD32
 fi
+CFLAGS=$CFLAGS -DOS_HPUX -DDSO_DLFCN
+supported_os=hp-ux
+if test $host_cpu = ia64
+then
+host_cpu=ia64n
+else
+host_cpu=hppa2.0n
+fi
+;;
+  hpux64)
+if test x$GCC = xyes
+then
+CFLAGS=$CFLAGS -pthread -mlp64
+LDFLAGS=$LDFLAGS -pthread -mlp64
+else
+CFLAGS=$CFLAGS -mt +DD64
+LDFLAGS=$LDFLAGS -mt +DD64
+fi
+CFLAGS=$CFLAGS -DOS_HPUX -DDSO_DLFCN
+supported_os=hp-ux
+if test $host_cpu = ia64
+then
+host_cpu=hppa2.0w
+fi
+;;
+  hpux*)
+CFLAGS=$CFLAGS -pthread -DOS_HPUX -DDSO_DLFCN
+LDFLAGS=$LDFLAGS -pthread
+LIBS=$LIBS -lpthread
 supported_os=hp-ux
 ;;
   aix5*)
@@ -125,29 +153,17 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
   ia64w)
 if test $supported_os = hp-ux
 then
-if test x$GCC = xyes
-then
-CFLAGS=$CFLAGS -mlp64 -DCPU=\\\IA64W\\\ -DSO_EXT=\\\so\\\
-LDFLAGS=$LDFLAGS -mlp64
-else
-CFLAGS=$CFLAGS +DD64 -DCPU=\\\IA64W\\\ -DSO_EXT=\\\so\\\
-LDFLAGS=$LDFLAGS +DD64
-fi
+CFLAGS=$CFLAGS -DCPU=\\\IA64W\\\ -DSO_EXT=\\\so\\\
+HOST_CPU=IA64W
 else
 CFLAGS=$CFLAGS -DCPU=\\\ia64\\\
+HOST_CPU=ia64
 fi
-HOST_CPU=ia64;;
+  ;;
   ia64|ia64n)
 if test $supported_os = hp-ux
 then
-if test x$GCC = xyes
-then
-CFLAGS=$CFLAGS -milp32 -DCPU=\\\IA64N\\\ -DSO_EXT=\\\so\\\
-LDFLAGS=$LDFLAGS -milp32
-else
-CFLAGS=$CFLAGS +DD32 -DCPU=\\\IA64N\\\ -DSO_EXT=\\\so\\\
-LDFLAGS=$LDFLAGS +DD32
-fi
+CFLAGS=$CFLAGS -DCPU=\\\IA64N\\\ -DSO_EXT=\\\so\\\
 HOST_CPU=IA64N
 else
 CFLAGS=$CFLAGS -DCPU=\\\ia64\\\

svn commit: r1461099 - /commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4

2013-03-26 Thread mturk 
Author: mturk
Date: Tue Mar 26 12:55:19 2013
New Revision: 1461099

URL: http://svn.apache.org/r1461099
Log:
Fix typo

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4?rev=1461099r1=1461098r2=1461099view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 
Tue Mar 26 12:55:19 2013
@@ -91,6 +91,8 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
 supported_os=hp-ux
 if test $host_cpu = ia64
 then
+host_cpu=ia64w
+else
 host_cpu=hppa2.0w
 fi
 ;;

svn commit: r1461114 [1/2] - /commons/proper/daemon/branches/1.0.x/src/native/unix/configure

2013-03-26 Thread mturk 
Author: mturk
Date: Tue Mar 26 13:15:22 2013
New Revision: 1461114

URL: http://svn.apache.org/r1461114
Log:
Update regenerated configure

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/configure

svn commit: r1461117 [1/2] - /commons/proper/daemon/branches/1.0.x/src/native/unix/configure

2013-03-26 Thread mturk 
Author: mturk
Date: Tue Mar 26 13:20:46 2013
New Revision: 1461117

URL: http://svn.apache.org/r1461117
Log:
Oops. Use older autoconf

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/configure

svn commit: r1461123 - /commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4

2013-03-26 Thread mturk 
Author: mturk
Date: Tue Mar 26 13:28:15 2013
New Revision: 1461123

URL: http://svn.apache.org/r1461123
Log:
Use correct flag for GCC

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4?rev=1461123r1=1461122r2=1461123view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 
Tue Mar 26 13:28:15 2013
@@ -63,8 +63,8 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
   hpux32)
 if test x$GCC = xyes
 then
-CFLAGS=$CFLAGS -pthread -mlp32
-LDFLAGS=$LDFLAGS -pthread -mlp32
+CFLAGS=$CFLAGS -pthread -milp32
+LDFLAGS=$LDFLAGS -pthread -milp32
 else
 CFLAGS=$CFLAGS -mt +DD32
 LDFLAGS=$LDFLAGS -mt +DD32

svn commit: r1461124 - /commons/proper/daemon/branches/1.0.x/src/native/unix/configure

2013-03-26 Thread mturk 
Author: mturk
Date: Tue Mar 26 13:31:04 2013
New Revision: 1461124

URL: http://svn.apache.org/r1461124
Log:
Regen configure

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/configure

Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/configure
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/configure?rev=1461124r1=1461123r2=1461124view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/configure (original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/configure Tue Mar 26 
13:31:04 2013
@@ -272,7 +272,44 @@ PACKAGE_STRING=
 PACKAGE_BUGREPORT=
 
 ac_unique_file=configure.in
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME 
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix 
program_transform_name bindir sbindir libexecdir datadir sysconfdir 
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir 
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build 
build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS 
LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP 
JAVA_HOME LDCMD INCLUDES LIBOBJS LTLIBOBJS'
+# Factoring default headers for most tests.
+ac_includes_default=\
+#include stdio.h
+#if HAVE_SYS_TYPES_H
+# include sys/types.h
+#endif
+#if HAVE_SYS_STAT_H
+# include sys/stat.h
+#endif
+#if STDC_HEADERS
+# include stdlib.h
+# include stddef.h
+#else
+# if HAVE_STDLIB_H
+#  include stdlib.h
+# endif
+#endif
+#if HAVE_STRING_H
+# if !STDC_HEADERS  HAVE_MEMORY_H
+#  include memory.h
+# endif
+# include string.h
+#endif
+#if HAVE_STRINGS_H
+# include strings.h
+#endif
+#if HAVE_INTTYPES_H
+# include inttypes.h
+#else
+# if HAVE_STDINT_H
+#  include stdint.h
+# endif
+#endif
+#if HAVE_UNISTD_H
+# include unistd.h
+#endif
+
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME 
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix 
program_transform_name bindir sbindir libexecdir datadir sysconfdir 
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir 
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build 
build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS 
LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP 
JAVA_HOME LDCMD CPP EGREP INCLUDES LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -729,6 +766,10 @@ ac_env_CPPFLAGS_set=${CPPFLAGS+set}
 ac_env_CPPFLAGS_value=$CPPFLAGS
 ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
 ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_CPP_set=${CPP+set}
+ac_env_CPP_value=$CPP
+ac_cv_env_CPP_set=${CPP+set}
+ac_cv_env_CPP_value=$CPP
 
 #
 # Report the --help message.
@@ -813,6 +854,7 @@ Some influential environment variables:
   nonstandard directory lib dir
   CPPFLAGSC/C++ preprocessor flags, e.g. -Iinclude dir if you have
   headers in a nonstandard directory include dir
+  CPP C preprocessor
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -2546,6 +2588,42 @@ echo $ECHO_N checking C flags dependant
 CFLAGS=$CFLAGS -pthread -DOS_TRU64 -DDSO_DLFCN -D_XOPEN_SOURCE_EXTENDED
 LDFLAGS=$LDFLAGS -pthread
 ;;
+  hpux32)
+if test x$GCC = xyes
+then
+CFLAGS=$CFLAGS -pthread -milp32
+LDFLAGS=$LDFLAGS -pthread -milp32
+else
+CFLAGS=$CFLAGS -mt +DD32
+LDFLAGS=$LDFLAGS -mt +DD32
+fi
+CFLAGS=$CFLAGS -DOS_HPUX -DDSO_DLFCN
+supported_os=hp-ux
+if test $host_cpu = ia64
+then
+host_cpu=ia64n
+else
+host_cpu=hppa2.0n
+fi
+;;
+  hpux64)
+if test x$GCC = xyes
+then
+CFLAGS=$CFLAGS -pthread -mlp64
+LDFLAGS=$LDFLAGS -pthread -mlp64
+else
+CFLAGS=$CFLAGS -mt +DD64
+LDFLAGS=$LDFLAGS -mt +DD64
+fi
+CFLAGS=$CFLAGS -DOS_HPUX -DDSO_DLFCN
+supported_os=hp-ux
+if test $host_cpu = ia64
+then
+host_cpu=ia64w
+else
+host_cpu=hppa2.0w
+fi
+;;
   hpux*)
 CFLAGS=$CFLAGS -pthread -DOS_HPUX -DDSO_DLFCN
 LDFLAGS=$LDFLAGS -pthread
@@ -2556,16 +2634,6 @@ echo $ECHO_N checking C flags dependant
 CFLAGS=$CFLAGS -DOS_AIX -DDSO_DLFCN
 LDFLAGS=$LDFLAGS -ldl
 ;;
-  kfreebsd*-gnu)
-CFLAGS=$CFLAGS -DOS_BSD -DDSO_DLFCN -pthread
-supported_os=kfreebsd-gnu
-LIBS=$LIBS -ldl -lpthread
-;;
-  gnu*)
-CFLAGS=$CFLAGS -DOS_HURD -DDSO_DLFCN -pthread 
-supported_os=hurd-gnu
-LIBS=$LIBS -ldl -lpthread
-;;
   *)
 echo $as_me:$LINENO: result: failed 5
 echo ${ECHO_T}failed 6
@@ -2575,7 +2643,7 @@ echo $as_me: error: Unsupported operati
 ;;
   esac
   case $host_cpu in
-  powerpc*)
+  powerpc)
 CFLAGS=$CFLAGS -DCPU

svn commit: r1460687 - /commons/proper/daemon/branches/1.0.x/src/native/unix/native/jsvc-unix.c

2013-03-25 Thread mturk 
Author: mturk
Date: Mon Mar 25 14:44:32 2013
New Revision: 1460687

URL: http://svn.apache.org/r1460687
Log:
Fix typo which can cause core if LD_LIBRARY_PATH was not set

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/native/jsvc-unix.c

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/unix/native/jsvc-unix.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/native/jsvc-unix.c?rev=1460687r1=1460686r2=1460687view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/native/jsvc-unix.c 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/native/jsvc-unix.c Mon 
Mar 25 14:44:32 2013
@@ -1163,7 +1163,7 @@ int main(int argc, char *argv[])
  * PATH, so require that argv[0] be either an absolute or
  * relative path.  Error out if this isn't the case.
  */
-tmp = strchr(oldpath,'/');
+tmp = strchr(argv[0], '/');
 if (tmp == NULL) {
 log_error(JSVC re-exec requires execution with an absolute or 
relative path);
 return 1;

svn commit: r1460101 - in /commons/proper/daemon/branches/1.0.x/src/native/windows: apps/prunsrv/prunsrv.c include/javajni.h src/javajni.c

2013-03-22 Thread mturk 
Author: mturk
Date: Sat Mar 23 05:30:32 2013
New Revision: 1460101

URL: http://svn.apache.org/r1460101
Log:
Fix DumpThreads from services. Seems the call to AttachConsole makes the 
message pipe unusable. Use console window to detect if we have or have not a 
console

Modified:

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c
commons/proper/daemon/branches/1.0.x/src/native/windows/include/javajni.h
commons/proper/daemon/branches/1.0.x/src/native/windows/src/javajni.c

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=1460101r1=1460100r2=1460101view=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 
Sat Mar 23 05:30:32 2013
@@ -263,8 +263,11 @@ DWORD WINAPI eventThread(LPVOID lpParam)
 continue;
 }
 if (dw == WAIT_OBJECT_0  gSignalValid) {
-if (!GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, 0))
-apxLogWrite(APXLOG_MARK_SYSERR);
+if (!GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, 0)) {
+/* Invoke Thread dump */
+if (gWorker  _jni_startup)
+apxJavaDumpAllStacks(gWorker);
+}
 ResetEvent(gSignalEvent);
 continue;
 }
@@ -284,15 +287,13 @@ static BOOL redirectStdStreams(APX_STDWR
 BOOL aErr = FALSE;
 BOOL aOut = FALSE;
 
-if (lpWrapper-szStdOutFilename || lpWrapper-szStdErrFilename) {
-/* Alloc console if it doesn't exists. */
-if (!AttachConsole(ATTACH_PARENT_PROCESS) 
- GetLastError() == ERROR_INVALID_HANDLE) {
-HWND hc;
-AllocConsole();
-if ((hc = GetConsoleWindow()) != NULL)
-ShowWindow(hc, SW_HIDE);
-}
+/* Allocate console if we have none
+ */
+if (GetConsoleWindow() == NULL) {
+HWND hc;
+AllocConsole();
+if ((hc = GetConsoleWindow()) != NULL)
+ShowWindow(hc, SW_HIDE);
 }
 /* redirect to file or console */
 if (lpWrapper-szStdOutFilename) {

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/windows/include/javajni.h
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/include/javajni.h?rev=1460101r1=1460100r2=1460101view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/windows/include/javajni.h 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/windows/include/javajni.h 
Sat Mar 23 05:30:32 2013
@@ -32,7 +32,7 @@ typedef struct stAPXJAVA_THREADARGS
 DWORD   bJniVfprintf;
 LPCSTR  szClassName;
 LPCSTR  szMethodName;
-LPCVOID lpArguments;
+LPCVOID lpArguments;
 BOOLsetErrorOrOut;
 LPCWSTR szStdErrFilename;
 LPCWSTR szStdOutFilename;
@@ -63,10 +63,12 @@ DWORD   apxJavaSetOptions(APXHANDLE 
 
 BOOLapxDestroyJvm(DWORD dwTimeout);
 
-DWORDapxGetVmExitCode();
+DWORD   apxGetVmExitCode();
 
 voidapxSetVmExitCode(DWORD exitCode);
 
+voidapxJavaDumpAllStacks(APXHANDLE hJava);
+
 __APXEND_DECLS
 
 #endif /* _JAVAJNI_H_INCLUDED_ */

Modified: commons/proper/daemon/branches/1.0.x/src/native/windows/src/javajni.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/src/javajni.c?rev=1460101r1=1460100r2=1460101view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/windows/src/javajni.c 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/windows/src/javajni.c Sat 
Mar 23 05:30:32 2013
@@ -47,6 +47,9 @@ static DYNLOAD_FPTR_DECLARE(JNI_CreateJa
 DYNOLAD_TYPE_DECLARE(JNI_GetCreatedJavaVMs, JNICALL, jint)(JavaVM **, jsize, 
jsize *);
 static DYNLOAD_FPTR_DECLARE(JNI_GetCreatedJavaVMs) = NULL;
 
+DYNOLAD_TYPE_DECLARE(JVM_DumpAllStacks, JNICALL, void)(JNIEnv *, jclass);
+static DYNLOAD_FPTR_DECLARE(JVM_DumpAllStacks) = NULL;
+
 static HANDLE  _st_sys_jvmDllHandle = NULL;
 static JavaVM *_st_sys_jvm = NULL;
 
@@ -142,31 +145,40 @@ typedef struct APX_JDK1_1InitArgs {
 
 static DWORD vmExitCode = 0;
 
-static __inline BOOL __apxJvmAttach(LPAPXJAVAVM lpJava)
+static __inline BOOL __apxJvmAttachEnv(LPAPXJAVAVM lpJava, JNIEnv **lpEnv,
+   LPBOOL lpAttached)
 {
 jint _iStatus;
 
-if (!_st_sys_jvm)
+if (!_st_sys_jvm || !lpJava-lpJvm)
   return FALSE;
 _iStatus = (*(lpJava-lpJvm))-GetEnv(lpJava-lpJvm,
-  (void **)(lpJava-lpEnv

svn commit: r1458847 - /commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/Makefile

2013-03-20 Thread mturk 
Author: mturk
Date: Wed Mar 20 14:21:26 2013
New Revision: 1458847

URL: http://svn.apache.org/r1458847
Log:
Axe duplicate cpu target

Modified:

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/Makefile

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/Makefile
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/Makefile?rev=1458847r1=1458846r2=1458847view=diff
==
--- 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/Makefile 
(original)
+++ 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/Makefile 
Wed Mar 20 14:21:26 2013
@@ -32,13 +32,6 @@ SRCDIR = .\..\..
 LFLAGS = $(LFLAGS) /stack:0x64000
 !ENDIF
 
-!IF $(CPU) == X64
-PREFIX = $(PREFIX)\amd64
-!ENDIF
-!IF $(CPU) == I64
-PREFIX = $(PREFIX)\ia64
-!ENDIF
-
 LFLAGS = $(LFLAGS) /version:1.0
 LIBS = $(LIBS) user32.lib gdi32.lib winspool.lib comdlg32.lib comctl32.lib 
shlwapi.lib netapi32.lib
 INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\src $(JAVA_INCLUDES)

svn commit: r1575 - in /release/commons/daemon: ./ binaries/ binaries/windows/ source/

2013-03-19 Thread mturk 
Author: mturk
Date: Tue Mar 19 12:38:47 2013
New Revision: 1575

Log:
Update to latest release

Added:
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.tar.gz   (with 
props)
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.tar.gz.asc   
(with props)
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.tar.gz.md5
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.tar.gz.sha1
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.zip   (with props)
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.zip.asc   (with 
props)
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.zip.md5
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.zip.sha1
release/commons/daemon/binaries/commons-daemon-1.0.14.jar   (with props)
release/commons/daemon/binaries/commons-daemon-1.0.14.jar.asc   (with props)
release/commons/daemon/binaries/commons-daemon-1.0.14.jar.md5
release/commons/daemon/binaries/commons-daemon-1.0.14.jar.sha1

release/commons/daemon/binaries/windows/commons-daemon-1.0.14-bin-windows.zip   
(with props)

release/commons/daemon/binaries/windows/commons-daemon-1.0.14-bin-windows.zip.asc
   (with props)

release/commons/daemon/binaries/windows/commons-daemon-1.0.14-bin-windows.zip.md5

release/commons/daemon/binaries/windows/commons-daemon-1.0.14-bin-windows.zip.sha1
release/commons/daemon/source/commons-daemon-1.0.14-native-src.tar.gz   
(with props)
release/commons/daemon/source/commons-daemon-1.0.14-native-src.tar.gz.asc   
(with props)
release/commons/daemon/source/commons-daemon-1.0.14-native-src.tar.gz.md5
release/commons/daemon/source/commons-daemon-1.0.14-native-src.tar.gz.sha1
release/commons/daemon/source/commons-daemon-1.0.14-native-src.zip   (with 
props)
release/commons/daemon/source/commons-daemon-1.0.14-native-src.zip.asc   
(with props)
release/commons/daemon/source/commons-daemon-1.0.14-native-src.zip.md5
release/commons/daemon/source/commons-daemon-1.0.14-native-src.zip.sha1
release/commons/daemon/source/commons-daemon-1.0.14-src.tar.gz   (with 
props)
release/commons/daemon/source/commons-daemon-1.0.14-src.tar.gz.asc   (with 
props)
release/commons/daemon/source/commons-daemon-1.0.14-src.tar.gz.md5
release/commons/daemon/source/commons-daemon-1.0.14-src.tar.gz.sha1
release/commons/daemon/source/commons-daemon-1.0.14-src.zip   (with props)
release/commons/daemon/source/commons-daemon-1.0.14-src.zip.asc   (with 
props)
release/commons/daemon/source/commons-daemon-1.0.14-src.zip.md5
release/commons/daemon/source/commons-daemon-1.0.14-src.zip.sha1
Removed:
release/commons/daemon/binaries/commons-daemon-1.0.13-bin.tar.gz
release/commons/daemon/binaries/commons-daemon-1.0.13-bin.tar.gz.asc
release/commons/daemon/binaries/commons-daemon-1.0.13-bin.tar.gz.md5
release/commons/daemon/binaries/commons-daemon-1.0.13-bin.tar.gz.sha1
release/commons/daemon/binaries/commons-daemon-1.0.13-bin.zip
release/commons/daemon/binaries/commons-daemon-1.0.13-bin.zip.asc
release/commons/daemon/binaries/commons-daemon-1.0.13-bin.zip.md5
release/commons/daemon/binaries/commons-daemon-1.0.13-bin.zip.sha1
release/commons/daemon/binaries/commons-daemon-1.0.13.jar
release/commons/daemon/binaries/commons-daemon-1.0.13.jar.asc
release/commons/daemon/binaries/commons-daemon-1.0.13.jar.md5
release/commons/daemon/binaries/commons-daemon-1.0.13.jar.sha1

release/commons/daemon/binaries/windows/commons-daemon-1.0.13-bin-windows.zip

release/commons/daemon/binaries/windows/commons-daemon-1.0.13-bin-windows.zip.asc

release/commons/daemon/binaries/windows/commons-daemon-1.0.13-bin-windows.zip.md5

release/commons/daemon/binaries/windows/commons-daemon-1.0.13-bin-windows.zip.sha1
release/commons/daemon/source/commons-daemon-1.0.13-native-src.tar.gz
release/commons/daemon/source/commons-daemon-1.0.13-native-src.tar.gz.asc
release/commons/daemon/source/commons-daemon-1.0.13-native-src.tar.gz.md5
release/commons/daemon/source/commons-daemon-1.0.13-native-src.tar.gz.sha1
release/commons/daemon/source/commons-daemon-1.0.13-native-src.zip
release/commons/daemon/source/commons-daemon-1.0.13-native-src.zip.asc
release/commons/daemon/source/commons-daemon-1.0.13-native-src.zip.md5
release/commons/daemon/source/commons-daemon-1.0.13-native-src.zip.sha1
release/commons/daemon/source/commons-daemon-1.0.13-sources.jar.sha1
release/commons/daemon/source/commons-daemon-1.0.13-src.tar.gz
release/commons/daemon/source/commons-daemon-1.0.13-src.tar.gz.asc
release/commons/daemon/source/commons-daemon-1.0.13-src.tar.gz.md5
release/commons/daemon/source/commons-daemon-1.0.13-src.tar.gz.sha1
release/commons/daemon/source/commons-daemon-1.0.13-src.zip
release/commons/daemon/source/commons-daemon-1.0.13-src.zip.asc
release/commons/daemon/source/commons

svn commit: r1575 - in /release/commons/daemon: ./ binaries/ binaries/windows/ source/

2013-03-19 Thread mturk 
Author: mturk
Date: Tue Mar 19 12:38:47 2013
New Revision: 1575

Log:
Update to latest release

Added:
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.tar.gz   (with 
props)
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.tar.gz.asc   
(with props)
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.tar.gz.md5
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.tar.gz.sha1
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.zip   (with props)
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.zip.asc   (with 
props)
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.zip.md5
release/commons/daemon/binaries/commons-daemon-1.0.14-bin.zip.sha1
release/commons/daemon/binaries/commons-daemon-1.0.14.jar   (with props)
release/commons/daemon/binaries/commons-daemon-1.0.14.jar.asc   (with props)
release/commons/daemon/binaries/commons-daemon-1.0.14.jar.md5
release/commons/daemon/binaries/commons-daemon-1.0.14.jar.sha1

release/commons/daemon/binaries/windows/commons-daemon-1.0.14-bin-windows.zip   
(with props)

release/commons/daemon/binaries/windows/commons-daemon-1.0.14-bin-windows.zip.asc
   (with props)

release/commons/daemon/binaries/windows/commons-daemon-1.0.14-bin-windows.zip.md5

release/commons/daemon/binaries/windows/commons-daemon-1.0.14-bin-windows.zip.sha1
release/commons/daemon/source/commons-daemon-1.0.14-native-src.tar.gz   
(with props)
release/commons/daemon/source/commons-daemon-1.0.14-native-src.tar.gz.asc   
(with props)
release/commons/daemon/source/commons-daemon-1.0.14-native-src.tar.gz.md5
release/commons/daemon/source/commons-daemon-1.0.14-native-src.tar.gz.sha1
release/commons/daemon/source/commons-daemon-1.0.14-native-src.zip   (with 
props)
release/commons/daemon/source/commons-daemon-1.0.14-native-src.zip.asc   
(with props)
release/commons/daemon/source/commons-daemon-1.0.14-native-src.zip.md5
release/commons/daemon/source/commons-daemon-1.0.14-native-src.zip.sha1
release/commons/daemon/source/commons-daemon-1.0.14-src.tar.gz   (with 
props)
release/commons/daemon/source/commons-daemon-1.0.14-src.tar.gz.asc   (with 
props)
release/commons/daemon/source/commons-daemon-1.0.14-src.tar.gz.md5
release/commons/daemon/source/commons-daemon-1.0.14-src.tar.gz.sha1
release/commons/daemon/source/commons-daemon-1.0.14-src.zip   (with props)
release/commons/daemon/source/commons-daemon-1.0.14-src.zip.asc   (with 
props)
release/commons/daemon/source/commons-daemon-1.0.14-src.zip.md5
release/commons/daemon/source/commons-daemon-1.0.14-src.zip.sha1
Removed:
release/commons/daemon/binaries/commons-daemon-1.0.13-bin.tar.gz
release/commons/daemon/binaries/commons-daemon-1.0.13-bin.tar.gz.asc
release/commons/daemon/binaries/commons-daemon-1.0.13-bin.tar.gz.md5
release/commons/daemon/binaries/commons-daemon-1.0.13-bin.tar.gz.sha1
release/commons/daemon/binaries/commons-daemon-1.0.13-bin.zip
release/commons/daemon/binaries/commons-daemon-1.0.13-bin.zip.asc
release/commons/daemon/binaries/commons-daemon-1.0.13-bin.zip.md5
release/commons/daemon/binaries/commons-daemon-1.0.13-bin.zip.sha1
release/commons/daemon/binaries/commons-daemon-1.0.13.jar
release/commons/daemon/binaries/commons-daemon-1.0.13.jar.asc
release/commons/daemon/binaries/commons-daemon-1.0.13.jar.md5
release/commons/daemon/binaries/commons-daemon-1.0.13.jar.sha1

release/commons/daemon/binaries/windows/commons-daemon-1.0.13-bin-windows.zip

release/commons/daemon/binaries/windows/commons-daemon-1.0.13-bin-windows.zip.asc

release/commons/daemon/binaries/windows/commons-daemon-1.0.13-bin-windows.zip.md5

release/commons/daemon/binaries/windows/commons-daemon-1.0.13-bin-windows.zip.sha1
release/commons/daemon/source/commons-daemon-1.0.13-native-src.tar.gz
release/commons/daemon/source/commons-daemon-1.0.13-native-src.tar.gz.asc
release/commons/daemon/source/commons-daemon-1.0.13-native-src.tar.gz.md5
release/commons/daemon/source/commons-daemon-1.0.13-native-src.tar.gz.sha1
release/commons/daemon/source/commons-daemon-1.0.13-native-src.zip
release/commons/daemon/source/commons-daemon-1.0.13-native-src.zip.asc
release/commons/daemon/source/commons-daemon-1.0.13-native-src.zip.md5
release/commons/daemon/source/commons-daemon-1.0.13-native-src.zip.sha1
release/commons/daemon/source/commons-daemon-1.0.13-sources.jar.sha1
release/commons/daemon/source/commons-daemon-1.0.13-src.tar.gz
release/commons/daemon/source/commons-daemon-1.0.13-src.tar.gz.asc
release/commons/daemon/source/commons-daemon-1.0.13-src.tar.gz.md5
release/commons/daemon/source/commons-daemon-1.0.13-src.tar.gz.sha1
release/commons/daemon/source/commons-daemon-1.0.13-src.zip
release/commons/daemon/source/commons-daemon-1.0.13-src.zip.asc
release/commons/daemon/source/commons

svn commit: r1457752 - in /commons/proper/daemon/tags: COMMONS_DAEMON_1_0_14/ COMMONS_DAEMON_1_0_14_RC1/

2013-03-18 Thread mturk 
Author: mturk
Date: Mon Mar 18 13:15:29 2013
New Revision: 1457752

URL: http://svn.apache.org/r1457752
Log:
Promote RC1 tag as per VOTE

Added:
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_14/
  - copied from r1457751, 
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_14_RC1/
Removed:
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_14_RC1/

svn commit: r1457753 - in /commons/proper/daemon/branches/1.0.x: ./ src/native/unix/native/ src/native/windows/apps/prunmgr/ src/native/windows/apps/prunsrv/

2013-03-18 Thread mturk 
Author: mturk
Date: Mon Mar 18 13:21:31 2013
New Revision: 1457753

URL: http://svn.apache.org/r1457753
Log:
Bump to next version

Modified:
commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
commons/proper/daemon/branches/1.0.x/build.xml
commons/proper/daemon/branches/1.0.x/src/native/unix/native/version.h

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.h

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.h

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.rc

Modified: commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt?rev=1457753r1=1457752r2=1457753view=diff
==
--- commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt Mon Mar 18 13:21:31 
2013
@@ -1,5 +1,5 @@
 Apache Commons Daemon
-   Version 1.0.14
+   Version 1.0.15
Release Notes
 
 
@@ -84,6 +84,8 @@ NEW FEATURES:
 
 BUG FIXES:
 
+1.0.15:
+
 1.0.14: DAEMON-278, DAEMON-280, DAEMON-281, DAEMON-283, DAEMON-284, DAEMON-286,
 DAEMON-287
 

Modified: commons/proper/daemon/branches/1.0.x/build.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/build.xml?rev=1457753r1=1457752r2=1457753view=diff
==
--- commons/proper/daemon/branches/1.0.x/build.xml (original)
+++ commons/proper/daemon/branches/1.0.x/build.xml Mon Mar 18 13:21:31 2013
@@ -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.14/
+  property name=component.version   value=1.0.15/
 
   !-- The base directory for compilation targets --
   property name=build.home  value=target/

Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/native/version.h
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/native/version.h?rev=1457753r1=1457752r2=1457753view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/native/version.h 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/native/version.h Mon 
Mar 18 13:21:31 2013
@@ -31,13 +31,13 @@
 #define JSVC_MINOR_VERSION  0
 
 /** patch level */
-#define JSVC_PATCH_VERSION 14
+#define JSVC_PATCH_VERSION 15
 
 /**
  *  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)

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.h
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.h?rev=1457753r1=1457752r2=1457753view=diff
==
--- 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.h 
(original)
+++ 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.h 
Mon Mar 18 13:21:31 2013
@@ -24,7 +24,7 @@
 #define _PRUNMGR_H
 
 #undef  PRG_VERSION
-#define PRG_VERSION1.0.14.0
+#define PRG_VERSION1.0.15.0
 #define PRG_REGROOT   LApache Software Foundation\\Procrun 2.0
 
 #define IDM_TM_EXIT 2000

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=1457753r1=1457752r2=1457753view=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 
Mon Mar 18 13:21:31 2013
@@ -228,7 +228,7 @@ END
 STRINGTABLE
 BEGIN
 IDS_APPLICATION RSTR_PSM
-IDS_APPVERSION  Version 1.0.14
+IDS_APPVERSION  Version 1.0.15
 IDS_APPFULLNAME RSTR_PSM  Version  PRG_VERSION
 IDS_APPCOPYRIGHTCopyright (c) 2000-2013 The Apache Software 
Foundation
 IDS_APPDESCRIPTION  Apache Commons Daemon Service Management Tool
@@ -259,8 +259,8 @@ BEGIN
 END
 
 1 VERSIONINFO
- FILEVERSION 1,0,14,0
- PRODUCTVERSION 1,0,14,0
+ FILEVERSION 1,0,15,0
+ PRODUCTVERSION 1,0,15,0
  FILEFLAGSMASK 0x3fL
 #if defined(_DEBUG)
  FILEFLAGS 0x03L

svn commit: r1457755 - /commons/proper/daemon/branches/1.0.x/pom.xml

2013-03-18 Thread mturk 
Author: mturk
Date: Mon Mar 18 13:21:53 2013
New Revision: 1457755

URL: http://svn.apache.org/r1457755
Log:
Bump to next version

Modified:
commons/proper/daemon/branches/1.0.x/pom.xml

Modified: commons/proper/daemon/branches/1.0.x/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/pom.xml?rev=1457755r1=1457754r2=1457755view=diff
==
--- commons/proper/daemon/branches/1.0.x/pom.xml (original)
+++ commons/proper/daemon/branches/1.0.x/pom.xml Mon Mar 18 13:21:53 2013
@@ -92,7 +92,7 @@
 maven.compile.source1.3/maven.compile.source
 maven.compile.target1.3/maven.compile.target
 commons.componentiddaemon/commons.componentid
-commons.release.version1.0.14/commons.release.version
+commons.release.version1.0.15/commons.release.version
 commons.jira.idDAEMON/commons.jira.id
 commons.jira.pid12310468/commons.jira.pid
   /properties

svn commit: r1456777 - /commons/proper/daemon/branches/1.0.x/pom.xml

2013-03-15 Thread mturk 
Author: mturk
Date: Fri Mar 15 06:29:05 2013
New Revision: 1456777

URL: http://svn.apache.org/r1456777
Log:
Bump to release before tag

Modified:
commons/proper/daemon/branches/1.0.x/pom.xml

Modified: commons/proper/daemon/branches/1.0.x/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/pom.xml?rev=1456777r1=1456776r2=1456777view=diff
==
--- commons/proper/daemon/branches/1.0.x/pom.xml (original)
+++ commons/proper/daemon/branches/1.0.x/pom.xml Fri Mar 15 06:29:05 2013
@@ -27,7 +27,7 @@
   modelVersion4.0.0/modelVersion
   groupIdcommons-daemon/groupId
   artifactIdcommons-daemon/artifactId
-  version1.0.14-SNAPSHOT/version
+  version1.0.14/version
   nameCommons 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 
--

svn commit: r1456778 - /commons/proper/daemon/tags/COMMONS_DAEMON_1_0_14_RC1/

2013-03-15 Thread mturk 
Author: mturk
Date: Fri Mar 15 06:30:32 2013
New Revision: 1456778

URL: http://svn.apache.org/r1456778
Log:
Tag 1.0.14 RC1

Added:
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_14_RC1/
  - copied from r1456777, commons/proper/daemon/branches/1.0.x/

svn commit: r1456779 - /commons/proper/daemon/tags/COMMONS_DAEMON_1_0_14_RC1/

2013-03-15 Thread mturk 
Author: mturk
Date: Fri Mar 15 06:35:56 2013
New Revision: 1456779

URL: http://svn.apache.org/r1456779
Log:
Axe test tag

Removed:
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_14_RC1/

svn commit: r1456781 - in /commons/proper/daemon/branches/1.0.x/src/site/xdoc: binaries.xml download_daemon.xml

2013-03-15 Thread mturk 
Author: mturk
Date: Fri Mar 15 06:38:48 2013
New Revision: 1456781

URL: http://svn.apache.org/r1456781
Log:
Update next release links

Modified:
commons/proper/daemon/branches/1.0.x/src/site/xdoc/binaries.xml
commons/proper/daemon/branches/1.0.x/src/site/xdoc/download_daemon.xml

Modified: commons/proper/daemon/branches/1.0.x/src/site/xdoc/binaries.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/site/xdoc/binaries.xml?rev=1456781r1=1456780r2=1456781view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/site/xdoc/binaries.xml (original)
+++ commons/proper/daemon/branches/1.0.x/src/site/xdoc/binaries.xml Fri Mar 15 
06:38:48 2013
@@ -36,7 +36,7 @@ corresponding to your operating system. 
 section name=How do I get the executable?
 subsection name=procrun
 p
-The Windows archive (e.g. commons-daemon-1.0.13-bin-windows.zip) contains 2 
different executables:
+The Windows archive (e.g. commons-daemon-1.0.14-bin-windows.zip) contains 2 
different executables:
 ul
 liprunsrv.exe - service application for running applications as 
services./li
 liprunmgr.exe - the GUI manager application used to monitor and configure 
installed services./li

Modified: commons/proper/daemon/branches/1.0.x/src/site/xdoc/download_daemon.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/site/xdoc/download_daemon.xml?rev=1456781r1=1456780r2=1456781view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/site/xdoc/download_daemon.xml 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/site/xdoc/download_daemon.xml Fri 
Mar 15 06:38:48 2013
@@ -95,32 +95,32 @@ limitations under the License.
   /p
 /subsection
 /section
-section name=Commons Daemon 1.0.13 
+section name=Commons Daemon 1.0.14 
   subsection name=Binaries
 table
   tr
-  tda 
href=[preferred]/commons/daemon/binaries/commons-daemon-1.0.13-bin.tar.gzcommons-daemon-1.0.13-bin.tar.gz/a/td
-  tda 
href=http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.13-bin.tar.gz.md5;md5/a/td
-  tda 
href=http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.13-bin.tar.gz.asc;pgp/a/td
+  tda 
href=[preferred]/commons/daemon/binaries/commons-daemon-1.0.14-bin.tar.gzcommons-daemon-1.0.14-bin.tar.gz/a/td
+  tda 
href=http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.14-bin.tar.gz.md5;md5/a/td
+  tda 
href=http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.14-bin.tar.gz.asc;pgp/a/td
   /tr
   tr
-  tda 
href=[preferred]/commons/daemon/binaries/commons-daemon-1.0.13-bin.zipcommons-daemon-1.0.13-bin.zip/a/td
-  tda 
href=http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.13-bin.zip.md5;md5/a/td
-  tda 
href=http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.13-bin.zip.asc;pgp/a/td
+  tda 
href=[preferred]/commons/daemon/binaries/commons-daemon-1.0.14-bin.zipcommons-daemon-1.0.14-bin.zip/a/td
+  tda 
href=http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.14-bin.zip.md5;md5/a/td
+  tda 
href=http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.14-bin.zip.asc;pgp/a/td
   /tr
 /table
   /subsection
   subsection name=Source
 table
   tr
-  tda 
href=[preferred]/commons/daemon/source/commons-daemon-1.0.13-src.tar.gzcommons-daemon-1.0.13-src.tar.gz/a/td
-  tda 
href=http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.13-src.tar.gz.md5;md5/a/td
-  tda 
href=http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.13-src.tar.gz.asc;pgp/a/td
+  tda 
href=[preferred]/commons/daemon/source/commons-daemon-1.0.14-src.tar.gzcommons-daemon-1.0.14-src.tar.gz/a/td
+  tda 
href=http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.14-src.tar.gz.md5;md5/a/td
+  tda 
href=http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.14-src.tar.gz.asc;pgp/a/td
   /tr
   tr
-  tda 
href=[preferred]/commons/daemon/source/commons-daemon-1.0.13-src.zipcommons-daemon-1.0.13-src.zip/a/td
-  tda 
href=http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.13-src.zip.md5;md5/a/td
-  tda 
href=http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.13-src.zip.asc;pgp/a/td
+  tda 
href=[preferred]/commons/daemon/source/commons-daemon-1.0.14-src.zipcommons-daemon-1.0.14-src.zip/a/td
+  tda 
href=http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.14-src.zip.md5;md5/a/td
+  tda

svn commit: r1456782 - /commons/proper/daemon/tags/COMMONS_DAEMON_1_0_14_RC1/

2013-03-15 Thread mturk 
Author: mturk
Date: Fri Mar 15 06:39:41 2013
New Revision: 1456782

URL: http://svn.apache.org/r1456782
Log:
Tag 1.0.14 RC1

Added:
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_14_RC1/
  - copied from r1456781, commons/proper/daemon/branches/1.0.x/

svn commit: r1455821 - in /commons/proper/daemon/branches/1.0.x: RELEASE-NOTES.txt src/native/windows/apps/prunsrv/prunsrv.c

2013-03-13 Thread mturk 
Author: mturk
Date: Wed Mar 13 06:41:40 2013
New Revision: 1455821

URL: http://svn.apache.org/r1455821
Log:
DAEMON-287: No need to close service_status_handle

Modified:
commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c

Modified: commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt?rev=1455821r1=1455820r2=1455821view=diff
==
--- commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt Wed Mar 13 06:41:40 
2013
@@ -84,7 +84,8 @@ NEW FEATURES:
 
 BUG FIXES:
 
-1.0.14: DAEMON-278, DAEMON-280, DAEMON-281, DAEMON-283, DAEMON-284
+1.0.14: DAEMON-278, DAEMON-280, DAEMON-281, DAEMON-283, DAEMON-284,
+DAEMON-287
 
 1.0.13: DAEMON-275, DAEMON-276
 

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=1455821r1=1455820r2=1455821view=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 Mar 13 06:41:40 2013
@@ -1761,8 +1761,6 @@ cleanup:
 apxLogWrite(APXLOG_MARK_INFO Commons Daemon procrun finished);
 if (lpCmdline)
 apxCmdlineFree(lpCmdline);
-if (_service_status_handle)
-CloseHandle(_service_status_handle);
 _service_status_handle = NULL;
 _service_mode = FALSE;
 _flushall();

svn commit: r1455823 - in /commons/proper/daemon/branches/1.0.x: RELEASE-NOTES.txt src/native/windows/src/javajni.c

2013-03-13 Thread mturk 
Author: mturk
Date: Wed Mar 13 07:00:45 2013
New Revision: 1455823

URL: http://svn.apache.org/r1455823
Log:
DAEMON-286: Ensure we have a full thread sync

Modified:
commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
commons/proper/daemon/branches/1.0.x/src/native/windows/src/javajni.c

Modified: commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt?rev=1455823r1=1455822r2=1455823view=diff
==
--- commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt Wed Mar 13 07:00:45 
2013
@@ -84,7 +84,7 @@ NEW FEATURES:
 
 BUG FIXES:
 
-1.0.14: DAEMON-278, DAEMON-280, DAEMON-281, DAEMON-283, DAEMON-284,
+1.0.14: DAEMON-278, DAEMON-280, DAEMON-281, DAEMON-283, DAEMON-284, DAEMON-286,
 DAEMON-287
 
 1.0.13: DAEMON-275, DAEMON-276

Modified: commons/proper/daemon/branches/1.0.x/src/native/windows/src/javajni.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/src/javajni.c?rev=1455823r1=1455822r2=1455823view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/windows/src/javajni.c 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/windows/src/javajni.c Wed 
Mar 13 07:00:45 2013
@@ -113,6 +113,7 @@ typedef struct APXJAVAVM {
 DWORD   dwWorkerStatus;
 SIZE_T  szStackSize;
 HANDLE  hWorkerSync;
+HANDLE  hWorkerInit;
 } APXJAVAVM, *LPAPXJAVAVM;
 
 /* This is no longer exported in jni.h
@@ -927,7 +928,9 @@ static DWORD WINAPI __apxJavaWorkerThrea
 apxLogWrite(APXLOG_MARK_DEBUG Java Worker thread started %s:%s,
 lpJava-clWorker.sClazz, lpJava-clWorker.sMethod);
 lpJava-dwWorkerStatus = 1;
-SetEvent(lpJava-hWorkerSync);
+SetEvent(lpJava-hWorkerInit);
+/* Ensure apxJavaStart readed our status */
+WaitForSingleObject(lpJava-hWorkerSync, INFINITE);
 JNICALL_3(CallStaticVoidMethod,
   lpJava-clWorker.jClazz,
   lpJava-clWorker.jMethod,
@@ -947,7 +950,7 @@ finished:
 lpJava-dwWorkerStatus = 0;
 apxLogWrite(APXLOG_MARK_DEBUG Java Worker thread finished %s:%s with 
status=%d,
 lpJava-clWorker.sClazz, lpJava-clWorker.sMethod, rv);
-SetEvent(lpJava-hWorkerSync);
+SetEvent(lpJava-hWorkerInit);
 }
 ExitThread(rv);
 /* never gets here but keep the compiler happy */
@@ -962,6 +965,7 @@ apxJavaStart(LPAPXJAVA_THREADARGS pArgs)
 if (!lpJava)
 return FALSE;
 lpJava-dwWorkerStatus = 0;
+lpJava-hWorkerInit= CreateEvent(NULL, FALSE, FALSE, NULL);
 lpJava-hWorkerSync= CreateEvent(NULL, FALSE, FALSE, NULL);
 lpJava-hWorkerThread  = CreateThread(NULL,
   lpJava-szStackSize,
@@ -974,9 +978,10 @@ apxJavaStart(LPAPXJAVA_THREADARGS pArgs)
 }
 ResumeThread(lpJava-hWorkerThread);
 /* Wait until the worker thread initializes */
-WaitForSingleObject(lpJava-hWorkerSync, INFINITE);
+WaitForSingleObject(lpJava-hWorkerInit, INFINITE);
 if (lpJava-dwWorkerStatus == 0)
 return FALSE;
+SetEvent(lpJava-hWorkerSync);
 if (lstrcmpA(lpJava-clWorker.sClazz, java/lang/System)) {
 /* Give some time to initialize the thread
  * Unless we are calling System.exit(0).

svn commit: r1455825 - /commons/proper/daemon/branches/1.0.x/src/native/windows/src/javajni.c

2013-03-13 Thread mturk 
Author: mturk
Date: Wed Mar 13 07:06:52 2013
New Revision: 1455825

URL: http://svn.apache.org/r1455825
Log:
Fix typo in comment

Modified:
commons/proper/daemon/branches/1.0.x/src/native/windows/src/javajni.c

Modified: commons/proper/daemon/branches/1.0.x/src/native/windows/src/javajni.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/src/javajni.c?rev=1455825r1=1455824r2=1455825view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/windows/src/javajni.c 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/windows/src/javajni.c Wed 
Mar 13 07:06:52 2013
@@ -929,7 +929,7 @@ static DWORD WINAPI __apxJavaWorkerThrea
 lpJava-clWorker.sClazz, lpJava-clWorker.sMethod);
 lpJava-dwWorkerStatus = 1;
 SetEvent(lpJava-hWorkerInit);
-/* Ensure apxJavaStart readed our status */
+/* Ensure apxJavaStart worker has read our status */
 WaitForSingleObject(lpJava-hWorkerSync, INFINITE);
 JNICALL_3(CallStaticVoidMethod,
   lpJava-clWorker.jClazz,

svn commit: r1455019 - /commons/proper/daemon/branches/1.0.x/src/native/windows/src/log.c

2013-03-11 Thread mturk 
Author: mturk
Date: Mon Mar 11 06:57:31 2013
New Revision: 1455019

URL: http://svn.apache.org/r1455019
Log:
Make sure we unlock the rotated file before closing so that it does not depend 
on OS unlocking which can take some time

Modified:
commons/proper/daemon/branches/1.0.x/src/native/windows/src/log.c

Modified: commons/proper/daemon/branches/1.0.x/src/native/windows/src/log.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/src/log.c?rev=1455019r1=1455018r2=1455019view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/windows/src/log.c (original)
+++ commons/proper/daemon/branches/1.0.x/src/native/windows/src/log.c Mon Mar 
11 06:57:31 2013
@@ -89,6 +89,10 @@ static void logRotate(apx_logfile_st *lf
 /* TODO: Log something */
 return;
 }
+/* Make sure we relock the correct file */
+APX_LOGLOCK(h);
+APX_LOGUNLOCK(lf-hFile);
+/* Close original handle */
 CloseHandle(lf-hFile);
 lf-hFile = h;
 }
@@ -305,6 +309,9 @@ apxLogWrite(
 if (IS_INVALID_HANDLE(lf)) {
 lf = _st_sys_errhandle;
 lf-hFile = GetStdHandle(STD_ERROR_HANDLE);
+}
+if (lf == _st_sys_errhandle) {
+/* Do not rotate if redirected to console */
 dolock = FALSE;
 }
 if (dwLevel  lf-dwLogLevel)

svn commit: r1454340 - /commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c

2013-03-08 Thread mturk 
Author: mturk
Date: Fri Mar  8 12:19:02 2013
New Revision: 1454340

URL: http://svn.apache.org/r1454340
Log:
Make code more readable - no functional change

Modified:

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c

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=1454340r1=1454339r2=1454340view=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 
Fri Mar  8 12:19:02 2013
@@ -979,15 +979,17 @@ static DWORD WINAPI serviceStop(LPVOID l
 apxLogWrite(APXLOG_MARK_ERROR Failed starting java);
 rv = 3;
 }
-else if (lstrcmpA(_jni_sclass, java/lang/System) == 0) {
-reportServiceStatus(SERVICE_STOP_PENDING, NO_ERROR, 5000);
-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...);
-apxJavaWait(hWorker, INFINITE, FALSE);
-apxLogWrite(APXLOG_MARK_DEBUG Java jni stop worker finished.);
+if (lstrcmpA(_jni_sclass, java/lang/System) == 0) {
+reportServiceStatus(SERVICE_STOP_PENDING, NO_ERROR, 5000);
+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...);
+apxJavaWait(hWorker, INFINITE, FALSE);
+apxLogWrite(APXLOG_MARK_DEBUG Java jni stop worker 
finished.);
+}
 }
 wait_to_die = TRUE;
 }

svn commit: r1454344 - /commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c

2013-03-08 Thread mturk 
Author: mturk
Date: Fri Mar  8 12:29:23 2013
New Revision: 1454344

URL: http://svn.apache.org/r1454344
Log:
Use larger default stop wait hints

Modified:

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c

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=1454344r1=1454343r2=1454344view=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 
Fri Mar  8 12:29:23 2013
@@ -907,7 +907,7 @@ static int onExitStop(void)
 {
 if (_service_mode) {
 apxLogWrite(APXLOG_MARK_DEBUG Stop exit hook called ...);
-reportServiceStatus(SERVICE_STOPPED, NO_ERROR, 0);
+reportServiceStatusStopped(0);
 }
 return 0;
 }
@@ -981,7 +981,7 @@ static DWORD WINAPI serviceStop(LPVOID l
 }
 else {
 if (lstrcmpA(_jni_sclass, java/lang/System) == 0) {
-reportServiceStatus(SERVICE_STOP_PENDING, NO_ERROR, 5000);
+reportServiceStatus(SERVICE_STOP_PENDING, NO_ERROR, 20 * 1000);
 apxLogWrite(APXLOG_MARK_DEBUG Forcing java jni System.exit 
worker to finish...);
 return 0;
 }
@@ -1112,7 +1112,7 @@ cleanup:
 }
 
 apxLogWrite(APXLOG_MARK_INFO Service stopped.);
-reportServiceStatus(SERVICE_STOPPED, NO_ERROR, 0);
+reportServiceStatusStopped(0);
 return rv;
 }
 
@@ -1302,7 +1302,7 @@ void WINAPI service_ctrl_handler(DWORD d
 case SERVICE_CONTROL_SHUTDOWN:
 apxLogWrite(APXLOG_MARK_INFO Service SHUTDOWN signaled);
 case SERVICE_CONTROL_STOP:
-reportServiceStatus(SERVICE_STOP_PENDING, NO_ERROR, 3000);
+reportServiceStatus(SERVICE_STOP_PENDING, NO_ERROR, 3 * 1000);
 /* Stop the service asynchronously */
 stopThread = CreateThread(NULL, 0,
   serviceStop,

svn commit: r1453769 - /commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c

2013-03-07 Thread mturk 
Author: mturk
Date: Thu Mar  7 10:57:27 2013
New Revision: 1453769

URL: http://svn.apache.org/r1453769
Log:
Enuse we have a limit to a correct buffer size

Modified:

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c

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=1453769r1=1453768r2=1453769view=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 
Thu Mar  7 10:57:27 2013
@@ -586,7 +586,7 @@ static BOOL docmdInstallService(LPAPXCMD
 /* Add run-service command line option */
 lstrlcatW(szImage, SIZ_HUGLEN, L );
 lstrlcpyW(szName, SIZ_BUFLEN, L//RS//);
-lstrlcatW(szName, SIZ_HUGLEN, lpCmdline-szApplication);
+lstrlcatW(szName, SIZ_BUFLEN, lpCmdline-szApplication);
 apxStrQuoteInplaceW(szName);
 lstrlcatW(szImage, SIZ_HUGLEN, szName);
 SO_INSTALL = apxPoolStrdupW(gPool, szImage);

svn commit: r1453809 - /commons/proper/daemon/branches/1.0.x/src/native/unix/support/config.guess

2013-03-07 Thread mturk 
Author: mturk
Date: Thu Mar  7 12:29:11 2013
New Revision: 1453809

URL: http://svn.apache.org/r1453809
Log:
Update config.guess to the latest one

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/support/config.guess

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/unix/support/config.guess
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/support/config.guess?rev=1453809r1=1453808r2=1453809view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/support/config.guess 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/support/config.guess 
Thu Mar  7 12:29:11 2013
@@ -1,13 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2001-04-20'
+timestamp='2013-02-04'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -16,23 +15,22 @@ timestamp='2001-04-20'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, see http://www.gnu.org/licenses/.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Written by Per Bothner both...@cygnus.com.
-# Please send patches to config-patc...@gnu.org.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 (GPLv3).
+#
+# Originally written by Per Bothner.
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# You can get the latest version of this script from:
+# 
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# Please send patches with a ChangeLog entry to config-patc...@gnu.org.
+
 
 me=`echo $0 | sed -e 's,.*/,,'`
 
@@ -52,8 +50,7 @@ version=\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
-Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -65,11 +62,11 @@ Try \`$me --help' for more information.
 while test $# -gt 0 ; do
   case $1 in
 --time-stamp | --time* | -t )
-   echo $timestamp ; exit 0 ;;
+   echo $timestamp ; exit ;;
 --version | -v )
-   echo $version ; exit 0 ;;
+   echo $version ; exit ;;
 --help | --h* | -h )
-   echo $usage; exit 0 ;;
+   echo $usage; exit ;;
 -- ) # Stop option processing
shift; break ;;
 - )# Use stdin as input.
@@ -87,33 +84,45 @@ if test $# != 0; then
   exit 1
 fi
 
+trap 'exit 1' 1 2 15
 
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
 
-# CC_FOR_BUILD -- compiler used by this script.
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap exitcode=\$?; (rm -f \$tmpfiles 2/dev/null; rmdir \$tmp 2/dev/null)  
exit \$exitcode 0 ;
+trap rm -f \$tmpfiles 2/dev/null; rmdir \$tmp 2/dev/null; exit 1 1 2 13 15 
;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077  mktemp -d $TMPDIR/cgXX) 2/dev/null`  test -n 
$tmp  test -d $tmp ; } ||
+ { test -n $RANDOM  tmp=$TMPDIR/cg$$-$RANDOM  (umask 077  mkdir $tmp) 
; } ||
+ { tmp=$TMPDIR/cg-$$  (umask 077  mkdir $tmp)  echo Warning: creating 
insecure temp directory 2

svn commit: r1453811 - /commons/proper/daemon/branches/1.0.x/src/native/unix/support/config.guess

2013-03-07 Thread mturk 
Author: mturk
Date: Thu Mar  7 12:31:13 2013
New Revision: 1453811

URL: http://svn.apache.org/r1453811
Log:
Make sure config.guess is executable

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/support/config.guess   
(props changed)

Propchange: 
commons/proper/daemon/branches/1.0.x/src/native/unix/support/config.guess
--
svn:executable = *

svn commit: r1453813 - /commons/proper/daemon/branches/1.0.x/src/native/unix/support/config.sub

2013-03-07 Thread mturk 
Author: mturk
Date: Thu Mar  7 12:32:10 2013
New Revision: 1453813

URL: http://svn.apache.org/r1453813
Log:
Sync config.sub with config guess

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/support/config.sub

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/unix/support/config.sub
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/support/config.sub?rev=1453813r1=1453812r2=1453813view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/support/config.sub 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/support/config.sub Thu 
Mar  7 12:32:10 2013
@@ -1,38 +1,31 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
-
-timestamp='2011-03-23'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+#   Copyright 1992-2013 Free Software Foundation, Inc.
+
+timestamp='2013-02-04'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see http://www.gnu.org/licenses/.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 (GPLv3).
 
 
-# Please send patches to config-patc...@gnu.org.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches with a ChangeLog entry to config-patc...@gnu.org.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -75,9 +68,7 @@ Report bugs and patches to config-patch
 version=\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -125,13 +116,17 @@ esac
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | 
kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
 os=-$maybe_os
 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
 ;;
+  android-linux)
+os=-linux-android
+basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+;;
   *)
 basic_machine=`echo $1 | sed 's/-[^-]*$//'`
 if [ $basic_machine != $1 ]
@@ -154,7 +149,7 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-   -apple | -axis | -knuth | -cray | -microblaze)
+   -apple | -axis | -knuth | -cray | -microblaze*)
os

svn commit: r1453245 - in /commons/proper/daemon/branches/1.0.x: RELEASE-NOTES.txt src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java

2013-03-06 Thread mturk 
Author: mturk
Date: Wed Mar  6 09:54:38 2013
New Revision: 1453245

URL: http://svn.apache.org/r1453245
Log:
DAEMON-283: Make sure we instantiate class only for non static method. For 
static methods class instance in unused and can be null

Modified:
commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt

commons/proper/daemon/branches/1.0.x/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java

Modified: commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt?rev=1453245r1=1453244r2=1453245view=diff
==
--- commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt Wed Mar  6 09:54:38 
2013
@@ -1,5 +1,5 @@
 Apache Commons Daemon
-   Version 1.0.13
+   Version 1.0.14
Release Notes
 
 
@@ -84,6 +84,8 @@ NEW FEATURES:
 
 BUG FIXES:
 
+1.0.14: DAEMON-283
+
 1.0.13: DAEMON-275, DAEMON-276
 
 1.0.12: DAEMON-268, DAEMON-272, DAEMON-274

Modified: 
commons/proper/daemon/branches/1.0.x/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java?rev=1453245r1=1453244r2=1453245view=diff
==
--- 
commons/proper/daemon/branches/1.0.x/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
 (original)
+++ 
commons/proper/daemon/branches/1.0.x/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
 Wed Mar  6 09:54:38 2013
@@ -20,6 +20,7 @@
 package org.apache.commons.daemon.support;
 
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Arrays;
 import org.apache.commons.daemon.Daemon;
@@ -226,7 +227,11 @@ public class DaemonWrapper implements Da
 System.exit(0);
 }
 else {
-Object obj   = main.newInstance();
+Object obj   = null;
+if ((inst.getModifiers()  Modifier.STATIC) == 0) {
+// We only need object instance for non-static methods.
+obj = main.newInstance();
+}
 Object arg[] = new Object[1];
 
 arg[0] = args;

svn commit: r1453259 - /commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java

2013-03-06 Thread mturk 
Author: mturk
Date: Wed Mar  6 10:04:49 2013
New Revision: 1453259

URL: http://svn.apache.org/r1453259
Log:
Backport DAEMON-283 fix

Modified:

commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java

Modified: 
commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java?rev=1453259r1=1453258r2=1453259view=diff
==
--- 
commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
 (original)
+++ 
commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
 Wed Mar  6 10:04:49 2013
@@ -20,6 +20,7 @@
 package org.apache.commons.daemon.support;
 
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Arrays;
 import org.apache.commons.daemon.Daemon;
@@ -226,7 +227,11 @@ public class DaemonWrapper implements Da
 System.exit(0);
 }
 else {
-Object obj   = main.newInstance();
+Object obj   = null;
+if ((inst.getModifiers()  Modifier.STATIC) == 0) {
+// We only need object instance for non-static methods.
+obj = main.newInstance();
+}
 Object arg[] = new Object[1];
 
 arg[0] = args;

svn commit: r1453272 - in /commons/proper/daemon/branches/1.0.x: RELEASE-NOTES.txt src/native/unix/native/location.c

2013-03-06 Thread mturk 
Author: mturk
Date: Wed Mar  6 10:34:31 2013
New Revision: 1453272

URL: http://svn.apache.org/r1453272
Log:
Fix DAEMON-281

Modified:
commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c

Modified: commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt?rev=1453272r1=1453271r2=1453272view=diff
==
--- commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt Wed Mar  6 10:34:31 
2013
@@ -84,7 +84,7 @@ NEW FEATURES:
 
 BUG FIXES:
 
-1.0.14: DAEMON-283
+1.0.14: DAEMON-281, DAEMON-283
 
 1.0.13: DAEMON-275, DAEMON-276
 

Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c?rev=1453272r1=1453271r2=1453272view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c Wed 
Mar  6 10:34:31 2013
@@ -84,6 +84,8 @@ char *location_jvm_cfg[] = {
 char *location_jvm_default[] = {
 #if defined(OS_DARWIN)
 $JAVA_HOME/../Libraries/libjvm.dylib,
+$JAVA_HOME/jre/lib/server/libjvm.dylib,
+$JAVA_HOME/jre/lib/client/libjvm.dylib,
 #elif defined(OS_CYGWIN)
 $JAVA_HOME/jre/bin/classic/jvm.dll,   /* Sun JDK 1.3 */
 $JAVA_HOME/jre/bin/client/jvm.dll,/* Sun JDK 1.4 */

svn commit: r1453275 - in /commons/proper/daemon/branches/1.0.x: RELEASE-NOTES.txt src/native/windows/apps/prunsrv/prunsrv.c

2013-03-06 Thread mturk 
Author: mturk
Date: Wed Mar  6 10:39:46 2013
New Revision: 1453275

URL: http://svn.apache.org/r1453275
Log:
Fix DAEMON-278 by calling setInprocEnvironment for non-JNI startup as well

Modified:
commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c

Modified: commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt?rev=1453275r1=1453274r2=1453275view=diff
==
--- commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt Wed Mar  6 10:39:46 
2013
@@ -84,7 +84,7 @@ NEW FEATURES:
 
 BUG FIXES:
 
-1.0.14: DAEMON-281, DAEMON-283
+1.0.14: DAEMON-278, DAEMON-281, DAEMON-283
 
 1.0.13: DAEMON-275, DAEMON-276
 

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=1453275r1=1453274r2=1453275view=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 Mar  6 10:39:46 2013
@@ -1195,6 +1195,8 @@ static DWORD serviceStart()
 /* Add LibraryPath to the PATH */
apxAddToPathW(gPool, SO_LIBPATH);
 }
+/* Set the environment using putenv, so JVM can use it */
+setInprocEnvironment();
 /* Redirect process */
 gWorker = apxCreateProcessW(gPool,
 0,

svn commit: r1453280 - in /commons/proper/daemon/branches/1.0.x: RELEASE-NOTES.txt src/native/unix/native/arguments.c

2013-03-06 Thread mturk 
Author: mturk
Date: Wed Mar  6 10:45:30 2013
New Revision: 1453280

URL: http://svn.apache.org/r1453280
Log:
Fix DAEMON-280

Modified:
commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
commons/proper/daemon/branches/1.0.x/src/native/unix/native/arguments.c

Modified: commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt?rev=1453280r1=1453279r2=1453280view=diff
==
--- commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt Wed Mar  6 10:45:30 
2013
@@ -84,7 +84,7 @@ NEW FEATURES:
 
 BUG FIXES:
 
-1.0.14: DAEMON-278, DAEMON-281, DAEMON-283
+1.0.14: DAEMON-278, DAEMON-280, DAEMON-281, DAEMON-283
 
 1.0.13: DAEMON-275, DAEMON-276
 

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/unix/native/arguments.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/native/arguments.c?rev=1453280r1=1453279r2=1453280view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/native/arguments.c 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/native/arguments.c Wed 
Mar  6 10:45:30 2013
@@ -281,7 +281,8 @@ static arg_data *parse(int argc, char *a
 log_error(Invalid umask specified);
 return NULL;
 }
-args-umask = atoi(temp);
+/* Parameter must be in octal */
+args-umask = (int)strtol(temp, NULL, 8);
 if (args-umask  02) {
 log_error(Invalid umask specified (min=02));
 return NULL;

svn commit: r1453680 - /commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c

2013-03-06 Thread mturk 
Author: mturk
Date: Thu Mar  7 05:36:39 2013
New Revision: 1453680

URL: http://svn.apache.org/r1453680
Log:
Apply DAEMON-288 patch

Modified:

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c

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=1453680r1=1453679r2=1453680view=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 
Thu Mar  7 05:36:39 2013
@@ -585,7 +585,7 @@ static BOOL docmdInstallService(LPAPXCMD
 apxStrQuoteInplaceW(szImage);
 /* Add run-service command line option */
 lstrlcatW(szImage, SIZ_HUGLEN, L );
-lstrlcatW(szName, SIZ_BUFLEN, L//RS//);
+lstrlcpyW(szName, SIZ_BUFLEN, L//RS//);
 lstrlcatW(szName, SIZ_HUGLEN, lpCmdline-szApplication);
 apxStrQuoteInplaceW(szName);
 lstrlcatW(szImage, SIZ_HUGLEN, szName);

svn commit: r1453681 - /commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt

2013-03-06 Thread mturk 
Author: mturk
Date: Thu Mar  7 05:37:37 2013
New Revision: 1453681

URL: http://svn.apache.org/r1453681
Log:
Apply DAEMON-284 patch

Modified:
commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt

Modified: commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt?rev=1453681r1=1453680r2=1453681view=diff
==
--- commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt Thu Mar  7 05:37:37 
2013
@@ -84,7 +84,7 @@ NEW FEATURES:
 
 BUG FIXES:
 
-1.0.14: DAEMON-278, DAEMON-280, DAEMON-281, DAEMON-283
+1.0.14: DAEMON-278, DAEMON-280, DAEMON-281, DAEMON-283, DAEMON-284
 
 1.0.13: DAEMON-275, DAEMON-276

svn commit: r1453682 - /commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c

2013-03-06 Thread mturk 
Author: mturk
Date: Thu Mar  7 05:43:20 2013
New Revision: 1453682

URL: http://svn.apache.org/r1453682
Log:
Addition to DAEMON-284 patch. Ensure we use safe string copy methods

Modified:

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c

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=1453682r1=1453681r2=1453682view=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 
Thu Mar  7 05:43:20 2013
@@ -299,9 +299,9 @@ static BOOL redirectStdStreams(APX_STDWR
 if (lstrcmpiW(lpWrapper-szStdOutFilename, PRSRV_AUTO) == 0) {
 WCHAR lsn[1024];
 aOut = TRUE;
-lstrcpyW(lsn, lpCmdline-szApplication);
+lstrlcpyW(lsn, 1020, lpCmdline-szApplication);
+lstrlcatW(lsn, 1020, L-stdout);
 lstrlocaseW(lsn);
-lstrcatW(lsn, L-stdout);
 lpWrapper-szStdOutFilename = apxLogFile(gPool,
  lpWrapper-szLogPath,
  lsn,
@@ -326,9 +326,9 @@ static BOOL redirectStdStreams(APX_STDWR
 if (lstrcmpiW(lpWrapper-szStdErrFilename, PRSRV_AUTO) == 0) {
 WCHAR lsn[1024];
 aErr = TRUE;
-lstrcpyW(lsn, lpCmdline-szApplication);
+lstrlcpyW(lsn, 1020, lpCmdline-szApplication);
+lstrlcatW(lsn, 1020, L-stderr);
 lstrlocaseW(lsn);
-lstrcatW(lsn, L-stderr);
 lpWrapper-szStdErrFilename = apxLogFile(gPool,
  lpWrapper-szLogPath,
  lsn,
@@ -580,7 +580,7 @@ static BOOL docmdInstallService(LPAPXCMD
 lstrlcatW(szImage, SIZ_HUGLEN, L.exe);
 }
 else
-lstrcpyW(szImage, SO_INSTALL);
+lstrlcpyW(szImage, SIZ_HUGLEN, SO_INSTALL);
 /* Replace not needed qoutes */
 apxStrQuoteInplaceW(szImage);
 /* Add run-service command line option */

svn commit: r1453695 - /commons/proper/daemon/branches/1.0.x/src/native/unix/native/jsvc-unix.c

2013-03-06 Thread mturk 
Author: mturk
Date: Thu Mar  7 06:14:09 2013
New Revision: 1453695

URL: http://svn.apache.org/r1453695
Log:
Ensure that execv uses absolute or relative path

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/native/jsvc-unix.c

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/unix/native/jsvc-unix.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/native/jsvc-unix.c?rev=1453695r1=1453694r2=1453695view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/native/jsvc-unix.c 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/native/jsvc-unix.c Thu 
Mar  7 06:14:09 2013
@@ -1159,6 +1159,16 @@ int main(int argc, char *argv[])
 char *p1  = NULL;
 char *p2  = NULL;
 
+/* We don't want to use a form of exec() that searches the
+ * PATH, so require that argv[0] be either an absolute or
+ * relative path.  Error out if this isn't the case.
+ */
+tmp = strchr(oldpath,'/');
+if (tmp == NULL) {
+log_error(JSVC re-exec requires execution with an absolute or 
relative path);
+return 1;
+}
+
 /*
  * There is no need to change LD_LIBRARY_PATH
  * if we were not able to find a path to libjvm.so

svn commit: r1453702 - in /commons/proper/daemon/branches/1.0.x: ./ src/native/unix/native/ src/native/windows/apps/prunmgr/ src/native/windows/apps/prunsrv/

2013-03-06 Thread mturk 
Author: mturk
Date: Thu Mar  7 06:22:05 2013
New Revision: 1453702

URL: http://svn.apache.org/r1453702
Log:
Bump version numbers to 1.0.14

Modified:
commons/proper/daemon/branches/1.0.x/build.xml
commons/proper/daemon/branches/1.0.x/src/native/unix/native/version.h

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.h

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.h

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.rc

Modified: commons/proper/daemon/branches/1.0.x/build.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/build.xml?rev=1453702r1=1453701r2=1453702view=diff
==
--- commons/proper/daemon/branches/1.0.x/build.xml (original)
+++ commons/proper/daemon/branches/1.0.x/build.xml Thu Mar  7 06:22:05 2013
@@ -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.13/
+  property name=component.version   value=1.0.14/
 
   !-- The base directory for compilation targets --
   property name=build.home  value=target/

Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/native/version.h
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/native/version.h?rev=1453702r1=1453701r2=1453702view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/native/version.h 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/native/version.h Thu 
Mar  7 06:22:05 2013
@@ -31,7 +31,7 @@
 #define JSVC_MINOR_VERSION  0
 
 /** patch level */
-#define JSVC_PATCH_VERSION 13
+#define JSVC_PATCH_VERSION 14
 
 /**
  *  This symbol is defined for internal, development copies of JSVC.

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.h
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.h?rev=1453702r1=1453701r2=1453702view=diff
==
--- 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.h 
(original)
+++ 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.h 
Thu Mar  7 06:22:05 2013
@@ -24,7 +24,7 @@
 #define _PRUNMGR_H
 
 #undef  PRG_VERSION
-#define PRG_VERSION1.0.13.0
+#define PRG_VERSION1.0.14.0
 #define PRG_REGROOT   LApache Software Foundation\\Procrun 2.0
 
 #define IDM_TM_EXIT 2000

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=1453702r1=1453701r2=1453702view=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 
Thu Mar  7 06:22:05 2013
@@ -228,7 +228,7 @@ END
 STRINGTABLE
 BEGIN
 IDS_APPLICATION RSTR_PSM
-IDS_APPVERSION  Version 1.0.13
+IDS_APPVERSION  Version 1.0.14
 IDS_APPFULLNAME RSTR_PSM  Version  PRG_VERSION
 IDS_APPCOPYRIGHTCopyright (c) 2000-2013 The Apache Software 
Foundation
 IDS_APPDESCRIPTION  Apache Commons Daemon Service Management Tool
@@ -259,8 +259,8 @@ BEGIN
 END
 
 1 VERSIONINFO
- FILEVERSION 1,0,13,0
- PRODUCTVERSION 1,0,13,0
+ FILEVERSION 1,0,14,0
+ PRODUCTVERSION 1,0,14,0
  FILEFLAGSMASK 0x3fL
 #if defined(_DEBUG)
  FILEFLAGS 0x03L

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=1453702r1=1453701r2=1453702view=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 
Thu Mar  7 06:22:05 2013
@@ -25,7 +25,7 @@
 #define _PRUNSRV_H
 
 #undef  PRG_VERSION
-#define PRG_VERSION1.0.13.0
+#define PRG_VERSION1.0.14.0
 #define PRG_REGROOT   LApache 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=1453702r1=1453701r2=1453702view=diff

svn commit: r1453703 - /commons/proper/daemon/branches/1.0.x/pom.xml

2013-03-06 Thread mturk 
Author: mturk
Date: Thu Mar  7 06:22:23 2013
New Revision: 1453703

URL: http://svn.apache.org/r1453703
Log:
Bump version numbers to 1.0.14

Modified:
commons/proper/daemon/branches/1.0.x/pom.xml

Modified: commons/proper/daemon/branches/1.0.x/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/pom.xml?rev=1453703r1=1453702r2=1453703view=diff
==
--- commons/proper/daemon/branches/1.0.x/pom.xml (original)
+++ commons/proper/daemon/branches/1.0.x/pom.xml Thu Mar  7 06:22:23 2013
@@ -92,7 +92,7 @@
 maven.compile.source1.3/maven.compile.source
 maven.compile.target1.3/maven.compile.target
 commons.componentiddaemon/commons.componentid
-commons.release.version1.0.13/commons.release.version
+commons.release.version1.0.14/commons.release.version
 commons.jira.idDAEMON/commons.jira.id
 commons.jira.pid12310468/commons.jira.pid
   /properties

svn commit: r1445053 - /commons/proper/daemon/tags/COMMONS_DAEMON_1_0_13/

2013-02-12 Thread mturk 
Author: mturk
Date: Tue Feb 12 08:22:18 2013
New Revision: 1445053

URL: http://svn.apache.org/r1445053
Log:
Tag should be moved not copied

Removed:
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_13/

svn commit: r1445041 - /commons/proper/daemon/tags/COMMONS_DAEMON_1_0_13/

2013-02-11 Thread mturk 
Author: mturk
Date: Tue Feb 12 07:27:50 2013
New Revision: 1445041

URL: http://svn.apache.org/r1445041
Log:
Promote RC1 tag to release as per VOTE

Added:
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_13/
  - copied from r1445040, 
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_13_RC1/

svn commit: r1443089 - in /commons/proper/daemon/tags: COMMONS_DAEMON_1_0_12/ COMMONS_DAEMON_1_0_12_RC1/

2013-02-06 Thread mturk 
Author: mturk
Date: Wed Feb  6 17:45:52 2013
New Revision: 1443089

URL: http://svn.apache.org/viewvc?rev=1443089view=rev
Log:
Promote RC1 to release as per VOTE

Added:
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_12/
  - copied from r1443087, 
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_12_RC1/
Removed:
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_12_RC1/

svn commit: r1443090 - in /commons/proper/daemon/branches/1.0.x: RELEASE-NOTES.txt pom.xml

2013-02-06 Thread mturk 
Author: mturk
Date: Wed Feb  6 17:48:53 2013
New Revision: 1443090

URL: http://svn.apache.org/viewvc?rev=1443090view=rev
Log:
Prepare for 1.0.13 tag

Modified:
commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
commons/proper/daemon/branches/1.0.x/pom.xml

Modified: commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt?rev=1443090r1=1443089r2=1443090view=diff
==
--- commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt Wed Feb  6 17:48:53 
2013
@@ -84,7 +84,7 @@ NEW FEATURES:
 
 BUG FIXES:
 
-1.0.13: DAEMON-276
+1.0.13: DAEMON-275, DAEMON-276
 
 1.0.12: DAEMON-268, DAEMON-272, DAEMON-274
 

Modified: commons/proper/daemon/branches/1.0.x/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/pom.xml?rev=1443090r1=1443089r2=1443090view=diff
==
--- commons/proper/daemon/branches/1.0.x/pom.xml (original)
+++ commons/proper/daemon/branches/1.0.x/pom.xml Wed Feb  6 17:48:53 2013
@@ -27,7 +27,7 @@
   modelVersion4.0.0/modelVersion
   groupIdcommons-daemon/groupId
   artifactIdcommons-daemon/artifactId
-  version1.0.13-SNAPSHOT/version
+  version1.0.13/version
   nameCommons 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,7 +92,7 @@
 maven.compile.source1.3/maven.compile.source
 maven.compile.target1.3/maven.compile.target
 commons.componentiddaemon/commons.componentid
-commons.release.version1.0.12/commons.release.version
+commons.release.version1.0.13/commons.release.version
 commons.jira.idDAEMON/commons.jira.id
 commons.jira.pid12310468/commons.jira.pid
   /properties

svn commit: r1443091 - /commons/proper/daemon/tags/COMMONS_DAEMON_1_0_13_RC1/

2013-02-06 Thread mturk 
Author: mturk
Date: Wed Feb  6 17:50:19 2013
New Revision: 1443091

URL: http://svn.apache.org/viewvc?rev=1443091view=rev
Log:
Tag 1.0.13 release candidate

Added:
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_13_RC1/
  - copied from r1443090, commons/proper/daemon/branches/1.0.x/

svn commit: r1443092 - /commons/proper/daemon/tags/COMMONS_DAEMON_1_0_13_RC1/

2013-02-06 Thread mturk 
Author: mturk
Date: Wed Feb  6 17:51:23 2013
New Revision: 1443092

URL: http://svn.apache.org/viewvc?rev=1443092view=rev
Log:
Oops. Hit it too fast

Removed:
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_13_RC1/

svn commit: r1443100 - /commons/proper/daemon/tags/COMMONS_DAEMON_1_0_13_RC1/

2013-02-06 Thread mturk 
Author: mturk
Date: Wed Feb  6 18:04:02 2013
New Revision: 1443100

URL: http://svn.apache.org/viewvc?rev=1443100view=rev
Log:
Tag 1.0.13 release candidate

Added:
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_13_RC1/
  - copied from r1443099, commons/proper/daemon/branches/1.0.x/

svn commit: r1442650 - in /commons/proper/daemon/branches/1.0.x/src/native/windows: apps/prunmgr/prunmgr.h apps/prunmgr/prunmgr.rc apps/prunsrv/prunsrv.h apps/prunsrv/prunsrv.rc include/log.h src/log.

2013-02-05 Thread mturk 
Author: mturk
Date: Tue Feb  5 16:28:35 2013
New Revision: 1442650

URL: http://svn.apache.org/viewvc?rev=1442650view=rev
Log:
DAEMON-276 Fix log file corruption

Modified:

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.h

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.h

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.rc
commons/proper/daemon/branches/1.0.x/src/native/windows/include/log.h
commons/proper/daemon/branches/1.0.x/src/native/windows/src/log.c

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.h
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.h?rev=1442650r1=1442649r2=1442650view=diff
==
--- 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.h 
(original)
+++ 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.h 
Tue Feb  5 16:28:35 2013
@@ -24,7 +24,7 @@
 #define _PRUNMGR_H
 
 #undef  PRG_VERSION
-#define PRG_VERSION1.0.12.0
+#define PRG_VERSION1.0.13.0
 #define PRG_REGROOT   LApache Software Foundation\\Procrun 2.0
 
 #define IDM_TM_EXIT 2000

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=1442650r1=1442649r2=1442650view=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 
Tue Feb  5 16:28:35 2013
@@ -228,7 +228,7 @@ END
 STRINGTABLE
 BEGIN
 IDS_APPLICATION RSTR_PSM
-IDS_APPVERSION  Version 1.0.12
+IDS_APPVERSION  Version 1.0.13
 IDS_APPFULLNAME RSTR_PSM  Version  PRG_VERSION
 IDS_APPCOPYRIGHTCopyright (c) 2000-2013 The Apache Software 
Foundation
 IDS_APPDESCRIPTION  Apache Commons Daemon Service Management Tool
@@ -259,8 +259,8 @@ BEGIN
 END
 
 1 VERSIONINFO
- FILEVERSION 1,0,12,0
- PRODUCTVERSION 1,0,12,0
+ FILEVERSION 1,0,13,0
+ PRODUCTVERSION 1,0,13,0
  FILEFLAGSMASK 0x3fL
 #if defined(_DEBUG)
  FILEFLAGS 0x03L

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=1442650r1=1442649r2=1442650view=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 
Tue Feb  5 16:28:35 2013
@@ -25,7 +25,7 @@
 #define _PRUNSRV_H
 
 #undef  PRG_VERSION
-#define PRG_VERSION1.0.12.0
+#define PRG_VERSION1.0.13.0
 #define PRG_REGROOT   LApache 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=1442650r1=1442649r2=1442650view=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 
Tue Feb  5 16:28:35 2013
@@ -23,8 +23,8 @@ IDI_MAINICON ICON   
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST prunsrv.manifest
 
 1 VERSIONINFO
- FILEVERSION 1,0,12,0
- PRODUCTVERSION 1,0,12,0
+ FILEVERSION 1,0,13,0
+ PRODUCTVERSION 1,0,13,0
  FILEFLAGSMASK 0x3fL
 #if defined(_DEBUG)
  FILEFLAGS 0x03L

Modified: commons/proper/daemon/branches/1.0.x/src/native/windows/include/log.h
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/include/log.h?rev=1442650r1=1442649r2=1442650view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/windows/include/log.h 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/windows/include/log.h Tue 
Feb  5 16:28:35 2013
@@ -38,6 +38,16 @@ __APXBEGIN_DECLS
 UnlockFile(file, 0, 0, 512, 0); \
 APXMACRO_END
 
+#define APX_LOGENTER()  \
+if (_pt_sys_loglock)\
+EnterCriticalSection(_pt_sys_loglock);  \
+else (void)0
+
+#define APX_LOGLEAVE()  \
+if (_pt_sys_loglock

svn commit: r1442846 - /commons/proper/daemon/branches/1.0.x/src/site/xdoc/binaries.xml

2013-02-05 Thread mturk 
Author: mturk
Date: Wed Feb  6 05:34:21 2013
New Revision: 1442846

URL: http://svn.apache.org/viewvc?rev=1442846view=rev
Log:
Fix DAEMON-275

Modified:
commons/proper/daemon/branches/1.0.x/src/site/xdoc/binaries.xml

Modified: commons/proper/daemon/branches/1.0.x/src/site/xdoc/binaries.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/site/xdoc/binaries.xml?rev=1442846r1=1442845r2=1442846view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/site/xdoc/binaries.xml (original)
+++ commons/proper/daemon/branches/1.0.x/src/site/xdoc/binaries.xml Wed Feb  6 
05:34:21 2013
@@ -29,32 +29,11 @@
 In the directory
 a href=http://www.apache.org/dist/commons/daemon/binaries/;binaries/a
 you will find subdirectories containing archives
-corresponding to your operating system. If your machine is not in the list,
-please mail us and we will try to make it available, or you can try to build 
it on your own.
-The non-Windows files are compressed tar files. They are named 
codecommons-daemon-m.n.p-bin-os-hw.tar.gz/code.
-For example: In the directory codelinux/code we have 
codecommons-daemon-1.0.13-bin-linux-i686.tar.gz/code
-That is a file suitable for a Linux system running on Intel hardware.
-Windows builds are provided as a zip file.
+corresponding to your operating system. Only the Windows builds are provided 
as a zip file.
 /p
 /section
 
 section name=How do I get the executable?
-subsection name=jsvc
-p
-Do the following:
-ul
-  liFind the tar.gz file corresponding to your configuration./li
-  liDownload it./li
-  liUncompress the tar file and extract the contents (better with gnu tar).
-  There should be an executable file called codejsvc/code and some text 
files/li
-  liCopy the executable to the location where you want to run it./li
-  liWrite a suitable shell script
- (see in codesrc/samples/code and 
codesrc/native/unix/native/Tomcat.sh/code)
- to get your Java application started as a daemon.
-  /li
-/ul
-/p
-/subsection
 subsection name=procrun
 p
 The Windows archive (e.g. commons-daemon-1.0.13-bin-windows.zip) contains 2 
different executables:

svn commit: r1432832 - /commons/trunks-proper/KEYS

2013-01-14 Thread mturk 
Author: mturk
Date: Mon Jan 14 08:32:55 2013
New Revision: 1432832

URL: http://svn.apache.org/viewvc?rev=1432832view=rev
Log:
Add my new signing key. Old one has exipred

Modified:
commons/trunks-proper/KEYS

Modified: commons/trunks-proper/KEYS
URL: 
http://svn.apache.org/viewvc/commons/trunks-proper/KEYS?rev=1432832r1=1432831r2=1432832view=diff
==
--- commons/trunks-proper/KEYS (original)
+++ commons/trunks-proper/KEYS Mon Jan 14 08:32:55 2013
@@ -4636,3 +4636,67 @@ hE68a/9oR97XTe+8e1VFt+2eWD8lsvbx6avD2hwf
 WVvXdM0hFPWrUzI=
 =8lib
 -END PGP PUBLIC KEY BLOCK-
+pub   3072D/0D498E23 2013-01-14
+uid  Mladen Turk (Default signing key) mt...@apache.org
+sig 30D498E23 2013-01-14  Mladen Turk (Default signing key) 
mt...@apache.org
+sub   4096g/DC3D1B18 2013-01-14
+sig  0D498E23 2013-01-14  Mladen Turk (Default signing key) 
mt...@apache.org
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+mQSuBFDzsBQRDADVTeaOjvWuZ84mWFi5Rj0TmnIOdK9evO+6Bnr6eI0MCKxLfEYu
+tpcq3hrIN/sXoVJW14Kb2Vm5Zt0PLWBmlQoi+99QwfHRvrejQnYA5VCGql61Vkbz
+NbpZ3Eq3n9d1HOLhdRnZAUGYtFYm7etkdpUZSHOErZWdiCebc8Og2NdWU4xIG6f8
+16UxuzOWv+fPCtSjciHxYWmzrVc4fYNTvJiyN5OtJ08dCaRfMeAMqec4fNMOn1uX
+KXuwlFsHk5ieK4K91RP1zSGQEe1gGaMDSQsR6wwmnnEoP7QzlvPkr5gni2+uGccl
+UCfejUUQaBsEXDX+S9CesFLv/EtWMgjpnyVCF+uSCrj/pMNHJHX1zktp79NJFCJM
+BrifvthC7cVHl5eWVTMb+xFC9leEKcUPQj8GQmUlXKd3iiUCQEhoEAk9IC0cVaMq
+2wp2lZRAK+7MSO+iLYA6GSeCBBQowCC8fvc/1ihZ+JtcmR0uqErrLRpSfBbn6Ynw
+K6cu+Dd6zRBOegcBAMIQg3biwAjnP6AhB3Ul8J/Jlk3CL/v+ChMUuwTGgDKlC/9C
+kg3KctWPhlImHATy1STBBqIoebYxe+CCxxiukt9gp2NCZOdm2ZU7weT9kS7DYQz8
+scKcAbSFBTILSeDOHehCb1Qz47H3JfyRzv23VoJ4hA/0sfm1kWeqXwQEBkAtZfrF
+/C/N0Sdnf2OUf7LsEDdkaVzkVQVJZLzZGjpNq+W8zoHhOOi1KwIzx8y1opEysmiv
+/CitQOhnLJT5odM1a+AimUjdgyQ0p+U1EkcAnLAYD3UIKMA8wnGzfJZJ4tkrYkBu
+YLW/lyS50ddhzPniz2XeCc5SG+tCi8le4B+qZb4GhC+nKXD+heuRXA+45hQXEx9M
+dGgsormYKnCTF5v3Bf8sSnId8nj0eBbKZFJhUBVgNpwNrW5QjYfJHGHTMBnWy/Jv
+SF3CnWwg/IPTNcX9ctxL4FatpPREXE/Su/4/BDjm3R14cCBfBeiVdcRZ6J1TLuLP
+K+qcT62PHqd/ibthfkLlnuehr4Qsfy75UypY8/2zrLz9QCIEo8MEFcUicfc+HB8L
+/1AYsI4c1lkgOU8aubasn1GpNrvyz5NrehIPevPEjSeBGJnOxQEtWKDrD8TMd+Or
+7r9+SLGVog1NYnkhzdEGbO1m/VXGk7JQI6UU5Rgu3PaJbfBPnON9kABfDnIQMqH1
+LeylZUqAnnv4Fa3YtiQOyro3FM8Gv+r2E40SgIbX1bLfCzgqdYpDIIK1FLfCu9oO
+NiMolC4gl+zOjCQ+ilV74J4vODBX701Zg3nM9WnQcXBBrNcuz2ofTzg9wm61zjsE
+JSRPLIaiT63cyV1kvjMN1oAkCuc3Am5albC13mOAryEF3UB2ROrc1BwdBMC+aQ/z
+BLNrxEeT7M1YiE1cFnmZZdb0X6pz2UWsiBgmproRriAOzsMW3fToJxcMykBzg/f5
+6QCgoCbJ6Fv0UC1yDulnujxFXRrBPH7PCxeRVLi3cH0sXCBZbHRMRJDhyFn137Br
+qKiP+UTPNgrj8dc3UGi13RNApHxYBcBO05JFSh0KrFlJFBd0jITLa4LGGUC08RDT
+07Q0TWxhZGVuIFR1cmsgKERlZmF1bHQgc2lnbmluZyBrZXkpIDxtdHVya0BhcGFj
+aGUub3JnPoh6BBMRCAAiBQJQ87AUAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIX
+gAAKCRA1zSPBDUmOIziZAQCZD/YvZ1vrxmwAgDeJoMajmvHpWJPECkUzF0GFLW99
+CwEAs0ZZKpwqQEEewdGocKld7hEvlbmvqllrCNJDkeDdJPa5BA0EUPOwMxAQAL6j
+2zs8UQCVhPxf/RO0PhLqTPk8/6NW/W9uN1QjxPtdFaDmIpkIdY6RI3bo9bRlKf/F
+vWWQfteUDhRiWosE/ERDrLDoFzSAKIEE3/rm1jYTVuWbfYnBA+zHbZmN0KgV8fbh
+cLxt5qX+YTIp9mg2rXawCc5j2vQvPmCce/JkaR8k4ZF9XhWIrpH/afH1LE3ExePK
+019Zo9thP9dw+IiJGWmL5v3JCiJDNmmJwqSKtBDMRX/9ygIZUWABAmvPzsr+fkee
+FyPaezwtj1Qx96U+gZJiYO+eW8f2d3PrK2hC9yc8vD+N6w/ZdD4UIMBz/sSgmcD7
+WRVs+j1KpEzIMVwxJY2V2bcuqDRKdPrhOO4zen26wutKRzZF5SRx8ruRE/Hbxmqh
+H2teUtN+3xR0ARkbVDrTJwG8rvsUex5pzQk/z4V2s1Dm8ihirEuDFYE5B7Hpht8U
+17JhVH6wIrBvwMNfd+Ac1mlfvBZ19JGOnjCwkR9o44N5lx0BSSndJVnrjitV//Zf
+irASTVc/GEw5150kkZRCkaW3Hn5KMysGNXxgFf6aBbgVBlR56mNHT+6qbZV3Owbh
+i5hSSKqxXMPsv3XEANg0isdLiv3E4/KxozChph+93EWuZwdrD0PbBccyJlUCywaj
+pMBaKXzRDsuZOImi3ujcZbqPb0bZW1eZRpQ3LePrAAMGEAC5V1gmisUffyR5I3kk
+HBcEkKW4fCQFZ/FLB6cQi4t9sunOYPT56klokhSIE0AJq/ndkOLz9eW2+D4RK3aj
+IBtFTtBnXzn6nGbg+G9cpwPCpcWyuAMsiPwcFItH7mbcD9h/TCXJE+ILyhXaocOb
+n9D9IsQ16WAIIQQsBbGYMvaemJv4xsZQrLhCHr/ofHye5huEBn/wwyBKnTCLd+P0
+AkF+whf4Vl3yF4W3vnrYRFjU0XEXnVQ/nmiQH3cM0JxkVy46H3Zoe68Sjt49ZJt9
+eEWH4M7KyJc86DWjRl/YMNdHE9SMx0ReKJTTNATfzgWIMvH+xUsD9K85Evm70jxc
+13XziHwL0BjtMQzml19f/TDCUeLE9FiO5fyDgc6ueehsCxoKCvG8acQz25rkAJBv
+i0WqdFSJG4rrJaLEwbSDkAkpY9yVk73acamwa42/E4G7v7sKuGVHzW5xBX8ac7lz
+3CqKw771vWGZPgd8v2FIkk5ShikVyKQxnVADVACy2eqL8A8fmQMRSc/FYVMHfo0O
+MD5jeWWAIPo3g8bguqwqyTC0DQo60Y38t4lyXxAvg5oWvwzKdrWKwm/WmQJaJuk6
+TufoONXlsl0cc4LLHZESIwLRSP5YfxV9chplmA92vhekV0f2IchmJky/a25KEIRH
+OdCCQTyOitoKXYy2swx9j69Q7YhhBBgRCAAJBQJQ87AzAhsMAAoJEDXNI8ENSY4j
+plIA/R4QYFbde0Jw11KjqAr1AkQHaume7p5mv7Vt6I/D2CkUAP9i2PGC8mgArtlP
+XDH35tl64G5lNKNum0D8NSGV955R2g==
+=gxY8
+-END PGP PUBLIC KEY BLOCK-

svn commit: r1432579 [3/3] - /commons/proper/daemon/branches/1.0.x/src/native/unix/configure

2013-01-13 Thread mturk 
Propchange: commons/proper/daemon/branches/1.0.x/src/native/unix/configure
--
svn:eol = native

Propchange: commons/proper/daemon/branches/1.0.x/src/native/unix/configure
--
svn:executable = *

svn commit: r1432579 [1/3] - /commons/proper/daemon/branches/1.0.x/src/native/unix/configure

2013-01-13 Thread mturk 
Author: mturk
Date: Sun Jan 13 10:41:04 2013
New Revision: 1432579

URL: http://svn.apache.org/viewvc?rev=1432579view=rev
Log:
Add prebuilt configure

Added:
commons/proper/daemon/branches/1.0.x/src/native/unix/configure   (with 
props)

svn commit: r1432581 - /commons/proper/daemon/tags/COMMONS_DAEMON_1_0_12_RC1/

2013-01-13 Thread mturk 
Author: mturk
Date: Sun Jan 13 10:41:56 2013
New Revision: 1432581

URL: http://svn.apache.org/viewvc?rev=1432581view=rev
Log:
Axe 1.0.12 RC1 tag

Removed:
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_12_RC1/

svn commit: r1432582 - /commons/proper/daemon/branches/1.0.x/pom.xml

2013-01-13 Thread mturk 
Author: mturk
Date: Sun Jan 13 10:42:37 2013
New Revision: 1432582

URL: http://svn.apache.org/viewvc?rev=1432582view=rev
Log:
Use correct version

Modified:
commons/proper/daemon/branches/1.0.x/pom.xml

Modified: commons/proper/daemon/branches/1.0.x/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/pom.xml?rev=1432582r1=1432581r2=1432582view=diff
==
--- commons/proper/daemon/branches/1.0.x/pom.xml (original)
+++ commons/proper/daemon/branches/1.0.x/pom.xml Sun Jan 13 10:42:37 2013
@@ -27,7 +27,7 @@
   modelVersion4.0.0/modelVersion
   groupIdcommons-daemon/groupId
   artifactIdcommons-daemon/artifactId
-  version1.0.12-SNAPSHOT/version
+  version1.0.12/version
   nameCommons 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 
--

svn commit: r1432583 - /commons/proper/daemon/tags/COMMONS_DAEMON_1_0_12_RC1/

2013-01-13 Thread mturk 
Author: mturk
Date: Sun Jan 13 10:42:57 2013
New Revision: 1432583

URL: http://svn.apache.org/viewvc?rev=1432583view=rev
Log:
Re-tag 1.0.12 RC1

Added:
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_12_RC1/
  - copied from r1432582, commons/proper/daemon/branches/1.0.x/

svn commit: r1431963 - /commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt

2013-01-11 Thread mturk 
Author: mturk
Date: Fri Jan 11 10:00:11 2013
New Revision: 1431963

URL: http://svn.apache.org/viewvc?rev=1431963view=rev
Log:
Add missing issue fixed

Modified:
commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt

Modified: commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt?rev=1431963r1=1431962r2=1431963view=diff
==
--- commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt Fri Jan 11 10:00:11 
2013
@@ -84,7 +84,7 @@ NEW FEATURES:
 
 BUG FIXES:
 
-1.0.12: DAEMON-268, DAEMON-274
+1.0.12: DAEMON-268, DAEMON-272, DAEMON-274
 
 1.0.11: DAEMON-244, DAEMON-246, DAEMON-247, DAEMON-252, DAEMON-253, DAEMON-254,
 DAEMON-255, DAEMON-257, DAEMON-261, DAEMON-263, DAEMON-265, DAEMON-266,

svn commit: r1431965 - /commons/proper/daemon/tags/COMMONS_DAEMON_1_0_12_RC1/

2013-01-11 Thread mturk 
Author: mturk
Date: Fri Jan 11 10:01:41 2013
New Revision: 1431965

URL: http://svn.apache.org/viewvc?rev=1431965view=rev
Log:
Tag 1.0.12 RC1

Added:
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_12_RC1/
  - copied from r1431964, commons/proper/daemon/branches/1.0.x/

svn commit: r1430766 - in /commons/proper/daemon/branches/1.0.x: build.xml pom.xml src/native/unix/native/help.c src/native/windows/apps/prunmgr/prunmgr.rc src/native/windows/apps/prunsrv/prunsrv.c sr

2013-01-09 Thread mturk 
Author: mturk
Date: Wed Jan  9 10:23:01 2013
New Revision: 1430766

URL: http://svn.apache.org/viewvc?rev=1430766view=rev
Log:
Update version and currenty release year

Modified:
commons/proper/daemon/branches/1.0.x/build.xml
commons/proper/daemon/branches/1.0.x/pom.xml
commons/proper/daemon/branches/1.0.x/src/native/unix/native/help.c

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.rc

Modified: commons/proper/daemon/branches/1.0.x/build.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/build.xml?rev=1430766r1=1430765r2=1430766view=diff
==
--- commons/proper/daemon/branches/1.0.x/build.xml (original)
+++ commons/proper/daemon/branches/1.0.x/build.xml Wed Jan  9 10:23:01 2013
@@ -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.11/
+  property name=component.version   value=1.0.12/
 
   !-- The base directory for compilation targets --
   property name=build.home  value=target/
@@ -214,7 +214,7 @@
 version=true
doctitle=lt;h1gt;${component.title}lt;/h1gt;
 windowtitle=${component.title} (Version ${component.version})
- bottom=Copyright (c) 2002-2012 - Apache Software Foundation
+ bottom=Copyright (c) 2002-2013 - Apache Software Foundation
   classpath refid=compile.classpath/
   classpath location=${ant.lib}/ant.jar/
 /javadoc

Modified: commons/proper/daemon/branches/1.0.x/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/pom.xml?rev=1430766r1=1430765r2=1430766view=diff
==
--- commons/proper/daemon/branches/1.0.x/pom.xml (original)
+++ commons/proper/daemon/branches/1.0.x/pom.xml Wed Jan  9 10:23:01 2013
@@ -92,7 +92,7 @@
 maven.compile.source1.3/maven.compile.source
 maven.compile.target1.3/maven.compile.target
 commons.componentiddaemon/commons.componentid
-commons.release.version1.0.11/commons.release.version
+commons.release.version1.0.12/commons.release.version
 commons.jira.idDAEMON/commons.jira.id
 commons.jira.pid12310468/commons.jira.pid
   /properties

Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/native/help.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/native/help.c?rev=1430766r1=1430765r2=1430766view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/native/help.c 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/native/help.c Wed Jan  
9 10:23:01 2013
@@ -101,7 +101,7 @@ void help(home_data *data)
 printf(-keepstdin\n);
 printf(does not redirect stdin to /dev/null\n);
 printf(\njsvc (Apache Commons Daemon)  JSVC_VERSION_STRING \n);
-printf(Copyright (c) 1999-2012 Apache Software Foundation.\n);
+printf(Copyright (c) 1999-2013 Apache Software Foundation.\n);
 
 printf(\n);
 }

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=1430766r1=1430765r2=1430766view=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 Jan  9 10:23:01 2013
@@ -42,7 +42,7 @@ BEGIN
 ES_READONLY | WS_BORDER | WS_VSCROLL,0,31,335,115
 CONTROL 
BMP_JAKARTA,IDC_STATIC,Static,SS_BITMAP|0x0040L,0,0,337,30
 LTEXT,IDC_ABOUTAPP,2,150,270,12
-LTEXT   Copyright (c) 2000-2011 The Apache Software 
Foundation.,IDC_STATIC,2,160,270,12
+LTEXT   Copyright (c) 2000-2013 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
@@ -230,7 +230,7 @@ BEGIN
 IDS_APPLICATION RSTR_PSM
 IDS_APPVERSION  Version 1.0.12
 IDS_APPFULLNAME RSTR_PSM  Version  PRG_VERSION
-IDS_APPCOPYRIGHTCopyright (c) 2000-2012 The Apache Software 
Foundation
+IDS_APPCOPYRIGHTCopyright (c) 2000-2013 The Apache Software 
Foundation
 IDS_APPDESCRIPTION  Apache Commons Daemon Service Management Tool
 IDS_ALREAY_RUNING   An instance of '%S' application is already running

svn commit: r1430777 - in /commons/proper/daemon/branches/1.0.x: RELEASE-NOTES.txt src/native/windows/apps/prunsrv/prunsrv.c

2013-01-09 Thread mturk 
Author: mturk
Date: Wed Jan  9 10:51:31 2013
New Revision: 1430777

URL: http://svn.apache.org/viewvc?rev=1430777view=rev
Log:
DAEMON-274: Make sure shutdown works

Modified:
commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c

Modified: commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt?rev=1430777r1=1430776r2=1430777view=diff
==
--- commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt Wed Jan  9 10:51:31 
2013
@@ -84,7 +84,7 @@ NEW FEATURES:
 
 BUG FIXES:
 
-1.0.12: DAEMON-268
+1.0.12: DAEMON-268, DAEMON-274
 
 1.0.11: DAEMON-244, DAEMON-246, DAEMON-247, DAEMON-252, DAEMON-253, DAEMON-254,
 DAEMON-255, DAEMON-257, DAEMON-261, DAEMON-263, DAEMON-265, DAEMON-266,

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=1430777r1=1430776r2=1430777view=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 Jan  9 10:51:31 2013
@@ -832,22 +832,22 @@ static BOOL docmdUpdateService(LPAPXCMDL
 
 /* Report the service status to the SCM, including service specific exit code
  */
-int reportServiceStatusE(DWORD dwCurrentState,
-DWORD dwWin32ExitCode,
- DWORD dwWaitHint,
- DWORD dwServiceSpecificExitCode)
+static BOOL reportServiceStatusE(DWORD dwCurrentState,
+ DWORD dwWin32ExitCode,
+ DWORD dwWaitHint,
+ DWORD dwServiceSpecificExitCode)
 {
static DWORD dwCheckPoint = 1;
BOOL fResult = TRUE;
 
-   apxLogWrite(APXLOG_MARK_DEBUG reportServiceStatus: %d, %d, %d, %d,
+   apxLogWrite(APXLOG_MARK_DEBUG reportServiceStatusE: %d, %d, %d, %d,
dwCurrentState, dwWin32ExitCode, dwWaitHint, 
dwServiceSpecificExitCode);
 
if (_service_mode  _service_status_handle) {
-   if (dwCurrentState == SERVICE_START_PENDING)
-_service_status.dwControlsAccepted = 0;
+   if (dwCurrentState == SERVICE_RUNNING)
+_service_status.dwControlsAccepted = SERVICE_ACCEPT_STOP | 
SERVICE_ACCEPT_SHUTDOWN;
 else
-_service_status.dwControlsAccepted = SERVICE_ACCEPT_STOP;
+_service_status.dwControlsAccepted = 0;
 
_service_status.dwCurrentState  = dwCurrentState;
_service_status.dwWin32ExitCode = dwWin32ExitCode;
@@ -862,6 +862,7 @@ int reportServiceStatusE(DWORD dwCurrent
fResult = SetServiceStatus(_service_status_handle, _service_status);
if (!fResult) {
/* TODO: Deal with error */
+   apxLogWrite(APXLOG_MARK_ERROR Failed to set service status);
}
}
return fResult;
@@ -869,15 +870,16 @@ int reportServiceStatusE(DWORD dwCurrent
 
 /* Report the service status to the SCM
  */
-int reportServiceStatus(DWORD dwCurrentState,
-DWORD dwWin32ExitCode,
-DWORD dwWaitHint)
+static BOOL reportServiceStatus(DWORD dwCurrentState,
+DWORD dwWin32ExitCode,
+DWORD dwWaitHint)
 {
 return reportServiceStatusE(dwCurrentState, dwWin32ExitCode, dwWaitHint, 
0);
 }
 
-int reportServiceStatusStopped(DWORD exitCode) {
-if(exitCode) {
+static BOOL reportServiceStatusStopped(DWORD exitCode)
+{
+if (exitCode) {
 return reportServiceStatusE(SERVICE_STOPPED, 
ERROR_SERVICE_SPECIFIC_ERROR, 0, exitCode);
 } else {
 return reportServiceStatus(SERVICE_STOPPED, NO_ERROR, 0);
@@ -1369,8 +1371,7 @@ void WINAPI serviceMain(DWORD argc, LPTS
 DWORD rc = 0;
 _service_status.dwServiceType  = SERVICE_WIN32_OWN_PROCESS;
 _service_status.dwCurrentState = SERVICE_START_PENDING;
-_service_status.dwControlsAccepted = SERVICE_ACCEPT_STOP |
- SERVICE_ACCEPT_PAUSE_CONTINUE;
+_service_status.dwControlsAccepted = SERVICE_CONTROL_INTERROGATE;
 _service_status.dwWin32ExitCode= 0;
 _service_status.dwCheckPoint   = 0;
 _service_status.dwWaitHint = 0;

svn commit: r1430780 - /commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c

2013-01-09 Thread mturk 
Author: mturk
Date: Wed Jan  9 10:54:45 2013
New Revision: 1430780

URL: http://svn.apache.org/viewvc?rev=1430780view=rev
Log:
Make sure STOP and SHUTDOWN share the same code

Modified:

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c

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=1430780r1=1430779r2=1430780view=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 Jan  9 10:54:45 2013
@@ -1295,12 +1295,14 @@ void WINAPI service_ctrl_handler(DWORD d
 HANDLE stopThread;
 
 switch (dwCtrlCode) {
+case SERVICE_CONTROL_SHUTDOWN:
+apxLogWrite(APXLOG_MARK_INFO Service SHUTDOWN signaled);
 case SERVICE_CONTROL_STOP:
 reportServiceStatus(SERVICE_STOP_PENDING, NO_ERROR, 3000);
 /* Stop the service asynchronously */
 stopThread = CreateThread(NULL, 0,
   serviceStop,
-  (LPVOID)SERVICE_CONTROL_STOP,
+  (LPVOID)dwCtrlCode,
   0, threadId);
 #if 0
 /* Seems we don't need to wait for the stop thread
@@ -1309,18 +1311,6 @@ void WINAPI service_ctrl_handler(DWORD d
 WaitForSingleObject(stopThread, INFINITE);
 #endif
 CloseHandle(stopThread);
-
-return;
-case SERVICE_CONTROL_SHUTDOWN:
-apxLogWrite(APXLOG_MARK_INFO Service SHUTDOWN signaled);
-reportServiceStatus(SERVICE_STOP_PENDING, NO_ERROR, 3000);
-/* Stop the service asynchronously */
-stopThread = CreateThread(NULL, 0,
-  serviceStop,
-  (LPVOID)SERVICE_CONTROL_SHUTDOWN,
-  0, threadId);
-WaitForSingleObject(stopThread, INFINITE);
-CloseHandle(stopThread);
 return;
 case SERVICE_CONTROL_INTERROGATE:
 reportServiceStatus(_service_status.dwCurrentState,

svn commit: r1419313 - /commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c

2012-12-10 Thread mturk 
Author: mturk
Date: Mon Dec 10 10:05:19 2012
New Revision: 1419313

URL: http://svn.apache.org/viewvc?rev=1419313view=rev
Log:
Add few more common locations for detecting jdk

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c

Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c?rev=1419313r1=1419312r2=1419313view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c Mon 
Dec 10 10:05:19 2012
@@ -33,12 +33,20 @@ char *location_home[] = {
 /System/Library/Frameworks/JavaVM.framework/Home,
 /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home/,
 #elif defined(OS_LINUX) || defined(OS_SOLARIS) || defined(OS_BSD)
+/usr/java/default,
 /usr/java,
 /usr/local/java,
 /usr/lib/jvm/default-java,
 /usr/lib/jvm/java,
 /etc/alternatives/java_sdk,
+/etc/alternatives/java_sdk_openjdk,
 /etc/alternatives/jre,
+#if defined(__LP64__)
+/lib64/jvm/java,
+/lib64/jvm/java-openjdk,
+#endif
+/lib/jvm/java,
+/lib/jvm/java-openjdk,
 #elif defined(OS_CYGWIN)
 /cygdrive/c/WINNT/system32/java,
 #elif defined(OS_SYSV)

svn commit: r1416921 - /commons/proper/daemon/branches/1.0.x/src/native/unix/native/home.c

2012-12-04 Thread mturk 
Author: mturk
Date: Tue Dec  4 13:09:44 2012
New Revision: 1416921

URL: http://svn.apache.org/viewvc?rev=1416921view=rev
Log:
DAEMON-268: Fix regression in -home directive

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/native/home.c

Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/native/home.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/native/home.c?rev=1416921r1=1416920r2=1416921view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/native/home.c 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/native/home.c Tue Dec  
4 13:09:44 2012
@@ -212,10 +212,10 @@ static home_data *find(char *path)
 home_data *data = NULL;
 int x = 0;
 
-if (path == NULL || *path == '\0' || *path == '/') {
+if (path == NULL || *path == '\0' || strcmp(path, /) == 0) {
 log_debug(Home not specified on command line, using environment);
 path = getenv(JAVA_HOME);
-if (path == NULL || *path == '\0' || *path == '/') {
+if (path == NULL || *path == '\0' || strcmp(path, /) == 0) {
 /* guard against empty JAVA_HOME */
 path = NULL;
 }

svn commit: r1416945 - in /commons/proper/daemon/branches/1.0.x/src/native: unix/native/version.h windows/apps/prunmgr/prunmgr.h windows/apps/prunmgr/prunmgr.rc windows/apps/prunsrv/prunsrv.h windows/

2012-12-04 Thread mturk 
Author: mturk
Date: Tue Dec  4 14:04:43 2012
New Revision: 1416945

URL: http://svn.apache.org/viewvc?rev=1416945view=rev
Log:
Increment current version numbers

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/native/version.h

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.h

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.h

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.rc

Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/native/version.h
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/native/version.h?rev=1416945r1=1416944r2=1416945view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/native/version.h 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/native/version.h Tue 
Dec  4 14:04:43 2012
@@ -31,7 +31,7 @@
 #define JSVC_MINOR_VERSION  0
 
 /** patch level */
-#define JSVC_PATCH_VERSION 11
+#define JSVC_PATCH_VERSION 12
 
 /**
  *  This symbol is defined for internal, development copies of JSVC.

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.h
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.h?rev=1416945r1=1416944r2=1416945view=diff
==
--- 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.h 
(original)
+++ 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.h 
Tue Dec  4 14:04:43 2012
@@ -24,7 +24,7 @@
 #define _PRUNMGR_H
 
 #undef  PRG_VERSION
-#define PRG_VERSION1.0.11.0
+#define PRG_VERSION1.0.12.0
 #define PRG_REGROOT   LApache Software Foundation\\Procrun 2.0
 
 #define IDM_TM_EXIT 2000

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=1416945r1=1416944r2=1416945view=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 
Tue Dec  4 14:04:43 2012
@@ -228,7 +228,7 @@ END
 STRINGTABLE
 BEGIN
 IDS_APPLICATION RSTR_PSM
-IDS_APPVERSION  Version 1.0.11
+IDS_APPVERSION  Version 1.0.12
 IDS_APPFULLNAME RSTR_PSM  Version  PRG_VERSION
 IDS_APPCOPYRIGHTCopyright (c) 2000-2012 The Apache Software 
Foundation
 IDS_APPDESCRIPTION  Apache Commons Daemon Service Management Tool
@@ -259,8 +259,8 @@ BEGIN
 END
 
 1 VERSIONINFO
- FILEVERSION 1,0,11,0
- PRODUCTVERSION 1,0,11,0
+ FILEVERSION 1,0,12,0
+ PRODUCTVERSION 1,0,12,0
  FILEFLAGSMASK 0x3fL
 #if defined(_DEBUG)
  FILEFLAGS 0x03L

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=1416945r1=1416944r2=1416945view=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 
Tue Dec  4 14:04:43 2012
@@ -25,7 +25,7 @@
 #define _PRUNSRV_H
 
 #undef  PRG_VERSION
-#define PRG_VERSION1.0.11.0
+#define PRG_VERSION1.0.12.0
 #define PRG_REGROOT   LApache 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=1416945r1=1416944r2=1416945view=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 
Tue Dec  4 14:04:43 2012
@@ -23,8 +23,8 @@ IDI_MAINICON ICON   
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST prunsrv.manifest
 
 1 VERSIONINFO
- FILEVERSION 1,0,11,0
- PRODUCTVERSION 1,0,11,0
+ FILEVERSION 1,0,12,0
+ PRODUCTVERSION 1,0,12,0
  FILEFLAGSMASK 0x3fL
 #if defined(_DEBUG)
  FILEFLAGS 0x03L

svn commit: r1416946 - /commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.manifest

2012-12-04 Thread mturk 
Author: mturk
Date: Tue Dec  4 14:07:16 2012
New Revision: 1416946

URL: http://svn.apache.org/viewvc?rev=1416946view=rev
Log:
DAEMON-269 Add support for UAC for prunmgr.exe

Modified:

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.manifest

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.manifest
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.manifest?rev=1416946r1=1416945r2=1416946view=diff
==
--- 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.manifest
 (original)
+++ 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.manifest
 Tue Dec  4 14:07:16 2012
@@ -23,4 +23,12 @@
 assemblyIdentity type=win32 name=Microsoft.Windows.Common-Controls 
version=6.0.0.0 processorArchitecture=* publicKeyToken=6595b64144ccf1df 
language=* /
 /dependentAssembly
 /dependency
+trustInfo xmlns=urn:schemas-microsoft-com:asm.v3
+security
+!-- Windows UAC support --
+requestedPrivileges
+requestedExecutionLevel level=requireAdministrator 
uiAccess=false/requestedExecutionLevel
+/requestedPrivileges
+/security
+/trustInfo
 /assembly

svn commit: r1416951 - /commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt

2012-12-04 Thread mturk 
Author: mturk
Date: Tue Dec  4 14:13:42 2012
New Revision: 1416951

URL: http://svn.apache.org/viewvc?rev=1416951view=rev
Log:
Update release notes with latest bug fixes

Modified:
commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt

Modified: commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt?rev=1416951r1=1416950r2=1416951view=diff
==
--- commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt Tue Dec  4 14:13:42 
2012
@@ -1,5 +1,5 @@
 Apache Commons Daemon
-   Version 1.0.11
+   Version 1.0.12
Release Notes
 
 
@@ -30,6 +30,7 @@ Commons DAEMON 1.0.3 requires a minimum 
 
 NEW FEATURES:
 
+* DAEMON-269: Support privilege escalation on Windows UAC for procmgr (1.0.12)
 * DAEMON-264: Add -cwd to jsvc so that user can specify working
   directory. It defaults to /. (1.0.11)
 * DAEMON-262: Automatically refresh manager application (1.0.11)
@@ -83,6 +84,8 @@ NEW FEATURES:
 
 BUG FIXES:
 
+1.0.12: DAEMON-268
+
 1.0.11: DAEMON-244, DAEMON-246, DAEMON-247, DAEMON-252, DAEMON-253, DAEMON-254,
 DAEMON-255, DAEMON-257, DAEMON-261, DAEMON-263, DAEMON-265, DAEMON-266,
 DAEMON-267

svn commit: r1414165 - in /commons/proper/daemon/tags: COMMONS_DAEMON_1_0_11/ COMMONS_DAEMON_1_0_11_RC1/

2012-11-27 Thread mturk 
Author: mturk
Date: Tue Nov 27 13:03:52 2012
New Revision: 1414165

URL: http://svn.apache.org/viewvc?rev=1414165view=rev
Log:
Promote RC1 to release

Added:
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_11/
  - copied from r1414164, 
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_11_RC1/
Removed:
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_11_RC1/

svn commit: r1412527 - /commons/proper/daemon/tags/COMMONS_DAEMON_1_0_11_RC1/

2012-11-22 Thread mturk 
Author: mturk
Date: Thu Nov 22 12:36:05 2012
New Revision: 1412527

URL: http://svn.apache.org/viewvc?rev=1412527view=rev
Log:
Tag 1.0.11 RC1

Added:
commons/proper/daemon/tags/COMMONS_DAEMON_1_0_11_RC1/
  - copied from r1412526, commons/proper/daemon/branches/1.0.x/

svn commit: r1412011 - /commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c

2012-11-21 Thread mturk 
Author: mturk
Date: Wed Nov 21 08:25:33 2012
New Revision: 1412011

URL: http://svn.apache.org/viewvc?rev=1412011view=rev
Log:
DAEMON-267: Report service as stopped pnly when VM exits cleanly

Modified:

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c

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=1412011r1=1412010r2=1412011view=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 Nov 21 08:25:33 2012
@@ -836,7 +836,7 @@ int reportServiceStatusE(DWORD dwCurrent
static DWORD dwCheckPoint = 1;
BOOL fResult = TRUE;
 
-   apxLogWrite(APXLOG_MARK_DEBUG reportServiceStatus: %d, %d, %d, %d, 
+   apxLogWrite(APXLOG_MARK_DEBUG reportServiceStatus: %d, %d, %d, %d,
dwCurrentState, dwWin32ExitCode, dwWaitHint, 
dwServiceSpecificExitCode);
 
if (_service_mode  _service_status_handle) {
@@ -911,7 +911,15 @@ static int onExitStart(void)
 if (_service_mode) {
 apxLogWrite(APXLOG_MARK_DEBUG Start exit hook called ...);
 apxLogWrite(APXLOG_MARK_DEBUG VM exit code: %d, apxGetVmExitCode());
-reportServiceStatusStopped(apxGetVmExitCode());
+/* Reporting the service as stopped even with a non-zero exit code
+ * will not cause recovery actions to be initiated, so don't report at 
all.
+ * A service is considered failed when it terminates without 
reporting a
+ * status of SERVICE_STOPPED to the service controller
+ * http://msdn.microsoft.com/en-us/library/ms685939(VS.85).aspx
+ */
+if (apxGetVmExitCode() == 0) {
+reportServiceStatusStopped(0);
+}
 }
 return 0;
 }

svn commit: r1412017 - /commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c

2012-11-21 Thread mturk 
Author: mturk
Date: Wed Nov 21 08:51:11 2012
New Revision: 1412017

URL: http://svn.apache.org/viewvc?rev=1412017view=rev
Log:
DAEMON-261: Allow services names with spaces

Modified:

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c

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=1412017r1=1412016r2=1412017view=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 Nov 21 08:51:11 2012
@@ -555,6 +555,7 @@ static BOOL docmdInstallService(LPAPXCMD
 DWORD dwStart = SERVICE_DEMAND_START;
 DWORD dwType  = SERVICE_WIN32_OWN_PROCESS;
 WCHAR szImage[SIZ_HUGLEN];
+WCHAR szName[SIZ_BUFLEN];
 
 apxLogWrite(APXLOG_MARK_DEBUG Installing service...);
 hService = apxCreateService(gPool, SC_MANAGER_CREATE_SERVICE, FALSE);
@@ -583,8 +584,11 @@ static BOOL docmdInstallService(LPAPXCMD
 /* Replace not needed qoutes */
 apxStrQuoteInplaceW(szImage);
 /* Add run-service command line option */
-lstrlcatW(szImage, SIZ_HUGLEN, L //RS//);
-lstrlcatW(szImage, SIZ_HUGLEN, lpCmdline-szApplication);
+lstrlcatW(szImage, SIZ_HUGLEN, L );
+lstrlcatW(szName, SIZ_BUFLEN, L//RS//);
+lstrlcatW(szName, SIZ_HUGLEN, lpCmdline-szApplication);
+apxStrQuoteInplaceW(szName);
+lstrlcatW(szImage, SIZ_HUGLEN, szName);
 SO_INSTALL = apxPoolStrdupW(gPool, szImage);
 /* Ensure that option gets saved in the registry */
 ST_INSTALL |= APXCMDOPT_FOUND;

svn commit: r1412037 - in /commons/proper/daemon/branches/1.0.x/src/native/unix/native: arguments.c arguments.h home.c jsvc-unix.c

2012-11-21 Thread mturk 
Author: mturk
Date: Wed Nov 21 10:01:22 2012
New Revision: 1412037

URL: http://svn.apache.org/viewvc?rev=1412037view=rev
Log:
DAEMON-264: Add -cwd parameter which defaults to root

Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/native/arguments.c
commons/proper/daemon/branches/1.0.x/src/native/unix/native/arguments.h
commons/proper/daemon/branches/1.0.x/src/native/unix/native/home.c
commons/proper/daemon/branches/1.0.x/src/native/unix/native/jsvc-unix.c

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/unix/native/arguments.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/native/arguments.c?rev=1412037r1=1412036r2=1412037view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/native/arguments.c 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/native/arguments.c Wed 
Nov 21 10:01:22 2012
@@ -167,6 +167,7 @@ static arg_data *parse(int argc, char *a
 args-onum= 0;/* Zero arguments, but let's have some room 
*/
 args-clas= NULL; /* No class predefined */
 args-anum= 0;/* Zero class specific arguments but make 
room*/
+args-cwd = /;   /* Use root as default */
 args-outfile = /dev/null;   /* Swallow by default */
 args-errfile = /dev/null;   /* Swallow by default */
 args-redirectstdin = true;/* Redirect stdin to /dev/null by default */
@@ -237,6 +238,13 @@ static arg_data *parse(int argc, char *a
 return NULL;
 }
 }
+else if (!strcmp(argv[x], -cwd)) {
+args-cwd = optional(argc, argv, x++);
+if (args-cwd == NULL) {
+log_error(Invalid working directory specified);
+return NULL;
+}
+}
 else if (!strcmp(argv[x], -version)) {
 args-vers = true;
 args-dtch = false;

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/unix/native/arguments.h
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/native/arguments.h?rev=1412037r1=1412036r2=1412037view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/native/arguments.h 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/native/arguments.h Wed 
Nov 21 10:01:22 2012
@@ -35,6 +35,8 @@ typedef struct {
 char *name;
 /** The JDK or JRE installation path (JAVA_HOME). */
 char *home;
+/** Working directory (defaults to /). */
+char *cwd;
 /** Options used to invoke the JVM. */
 char **opts;
 /** Number of JVM options. */

Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/native/home.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/native/home.c?rev=1412037r1=1412036r2=1412037view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/native/home.c 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/native/home.c Wed Nov 
21 10:01:22 2012
@@ -212,9 +212,13 @@ static home_data *find(char *path)
 home_data *data = NULL;
 int x = 0;
 
-if (path == NULL) {
+if (path == NULL || *path == '\0' || *path == '/') {
 log_debug(Home not specified on command line, using environment);
 path = getenv(JAVA_HOME);
+if (path == NULL || *path == '\0' || *path == '/') {
+/* guard against empty JAVA_HOME */
+path = NULL;
+}
 }
 
 if (path == NULL) {

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/unix/native/jsvc-unix.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/native/jsvc-unix.c?rev=1412037r1=1412036r2=1412037view=diff
==
--- commons/proper/daemon/branches/1.0.x/src/native/unix/native/jsvc-unix.c 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/native/jsvc-unix.c Wed 
Nov 21 10:01:22 2012
@@ -1223,6 +1223,10 @@ int main(int argc, char *argv[])
 #endif
 }
 
+if (chdir(args-cwd)) {
+log_error(ERROR: jsvc was unable to 
+  change directory to: %s, args-cwd);
+}
 /*
  * umask() uses inverse logic; bits are CLEAR for allowed access.
  */

svn commit: r1412040 - in /commons/proper/daemon/branches/1.0.x/src/native/windows/apps: prunmgr/prunmgr.c prunsrv/prunsrv.c

2012-11-21 Thread mturk 
Author: mturk
Date: Wed Nov 21 10:18:56 2012
New Revision: 1412040

URL: http://svn.apache.org/viewvc?rev=1412040view=rev
Log:
DAEMON-252: Ensure the signal name event is the same in prunsrv and prunmgr - 
uppercase

Modified:

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.c

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.c?rev=1412040r1=1412039r2=1412040view=diff
==
--- 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.c 
(original)
+++ 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.c 
Wed Nov 21 10:18:56 2012
@@ -1485,8 +1485,10 @@ static void signalService(LPCWSTR szServ
 lstrlcatW(en, SIZ_DESLEN, szServiceName);
 lstrlcatW(en, SIZ_DESLEN, LSIGNAL);
 for (i = 7; i  lstrlenW(en); i++) {
-if (en[i] = L'a'  en[i] = L'z')
-en[i] = en[i] - 32;
+if (en[i] == L' ')
+en[i] = L'_';
+else
+en[i] = towupper(en[i]);
 }
 
 

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=1412040r1=1412039r2=1412040view=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 Nov 21 10:18:56 2012
@@ -1386,7 +1386,10 @@ void WINAPI serviceMain(DWORD argc, LPTS
 lstrlcatW(en, SIZ_DESLEN, _service_name);
 lstrlcatW(en, SIZ_DESLEN, PRSRV_SIGNAL);
 for (i = 7; i  lstrlenW(en); i++) {
-en[i] = towlower(en[i]);
+if (en[i] == L' ')
+en[i] = L'_';
+else
+en[i] = towupper(en[i]);
 }
 gSignalEvent = CreateEventW(sa, TRUE, FALSE, en);
 CleanNullACL((void *)sa);

svn commit: r1412073 - /commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.c

2012-11-21 Thread mturk 
Author: mturk
Date: Wed Nov 21 12:14:55 2012
New Revision: 1412073

URL: http://svn.apache.org/viewvc?rev=1412073view=rev
Log:
DAEMON-262: Autorefresh property page in case service state changed from 
outside manager

Modified:

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.c

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.c?rev=1412073r1=1412072r2=1412073view=diff
==
--- 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.c 
(original)
+++ 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.c 
Wed Nov 21 12:14:55 2012
@@ -524,6 +524,7 @@ BOOL __generalStopSave(HWND hDlg)
 
 void __generalPropertyRefresh(HWND hDlg)
 {
+
 Button_Enable(GetDlgItem(hDlg, IDC_PPSGSTART), FALSE);
 Button_Enable(GetDlgItem(hDlg, IDC_PPSGSTOP), FALSE);
 Button_Enable(GetDlgItem(hDlg, IDC_PPSGPAUSE), FALSE);
@@ -561,6 +562,8 @@ void __generalPropertyRefresh(HWND hDlg)
 }
 
 static BOOL bpropCentered = FALSE;
+static HWND _generalPropertyHwnd = NULL;
+
 LRESULT CALLBACK __generalProperty(HWND hDlg,
UINT uMessage,
WPARAM wParam,
@@ -572,6 +575,7 @@ LRESULT CALLBACK __generalProperty(HWND 
 switch (uMessage) {
 case WM_INITDIALOG:
 {
+_generalPropertyHwnd = hDlg;
 if (!bEnableTry)
 apxCenterWindow(GetParent(hDlg), NULL);
 else if (!bpropCentered)
@@ -1469,6 +1473,7 @@ void ShowServiceProperties(HWND hWnd)
 
 PropertySheetW(psH);
 _propertyOpened = FALSE;
+_generalPropertyHwnd = NULL;
 if (!bEnableTry)
 PostQuitMessage(0);
  bpropCentered = FALSE;
@@ -1611,6 +1616,27 @@ static BOOL saveConfiguration()
 return TRUE;
 }
 
+static BOOL isManagerRunning = FALSE;
+static DWORD WINAPI refreshThread(LPVOID lpParam)
+{
+while (isManagerRunning) {
+/* Refresh property window */
+DWORD os = 0;
+if (_currentEntry)
+os = _currentEntry-stServiceStatus.dwCurrentState;
+_currentEntry = apxServiceEntry(hService, TRUE);
+if (_currentEntry  _currentEntry-stServiceStatus.dwCurrentState != 
os) {
+if (_gui_store-hMainWnd)
+PostMessage(_gui_store-hMainWnd, WM_COMMAND,
+MAKEWPARAM(IDMS_REFRESH, 0), 0);
+if (_generalPropertyHwnd)
+__generalPropertyRefresh(_generalPropertyHwnd);
+}
+Sleep(1000);
+}
+return 0;
+}
+
 /* Main program entry
  * Since we are inependant from CRT
  * the arguments are not used
@@ -1740,6 +1766,8 @@ int WINAPI WinMain(HINSTANCE hInstance,
 apxDisplayError(TRUE, NULL, 0, apxLoadResourceA(IDS_ERRSREG, 0));
 return FALSE;
 }
+isManagerRunning = TRUE;
+CreateThread(NULL, 0, refreshThread, NULL, 0, NULL);
 /* Create main invisible window */
 _gui_store-hMainWnd = CreateWindow(_gui_store-szWndClass,
 apxLoadResource(IDS_APPLICATION, 0),
@@ -1753,7 +1781,6 @@ int WINAPI WinMain(HINSTANCE hInstance,
 }
 if (lpCmdline-dwCmdIndex == 3)
 PostMessage(_gui_store-hMainWnd, WM_COMMAND, IDM_TM_START, 0);
-
 while (GetMessage(msg, NULL, 0, 0))  {
 if(!TranslateAccelerator(_gui_store-hMainWnd,
  _gui_store-hAccel, msg)) {
@@ -1761,6 +1788,7 @@ int WINAPI WinMain(HINSTANCE hInstance,
 DispatchMessage(msg);
 }
 }
+isManagerRunning = FALSE;
 saveConfiguration();
 
 cleanup:

svn commit: r1412439 - in /commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv: prunsrv.manifest prunsrv.rc

2012-11-21 Thread mturk 
Author: mturk
Date: Thu Nov 22 07:34:32 2012
New Revision: 1412439

URL: http://svn.apache.org/viewvc?rev=1412439view=rev
Log:
DAEMON-245: Backport from trunk

Added:

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.manifest
   (with props)
Modified:

commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.rc

Added: 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.manifest
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.manifest?rev=1412439view=auto
==
--- 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.manifest
 (added)
+++ 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.manifest
 Thu Nov 22 07:34:32 2012
@@ -0,0 +1,34 @@
+?xml version=1.0 encoding=UTF-8 standalone=yes?
+!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the License); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an AS IS BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--
+assembly xmlns=urn:schemas-microsoft-com:asm.v1 manifestVersion=1.0
+assemblyIdentity version=3.1.0.0 processorArchitecture=* 
name=Apache.Procrun.Prunsrv type=win32 /
+descriptionApache Commons Daemon Service Runner/description
+dependency
+dependentAssembly
+assemblyIdentity type=win32 name=Microsoft.Windows.Common-Controls 
version=6.0.0.0 processorArchitecture=* publicKeyToken=6595b64144ccf1df 
language=* /
+/dependentAssembly
+/dependency
+trustInfo xmlns=urn:schemas-microsoft-com:asm.v3
+security
+!-- Windows UAC support --
+requestedPrivileges
+requestedExecutionLevel level=requireAdministrator 
uiAccess=false/requestedExecutionLevel
+/requestedPrivileges
+/security
+/trustInfo
+/assembly

Propchange: 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.manifest
--
svn:eol-style = native

Propchange: 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.manifest
--
svn:mime-type = text/xml

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=1412439r1=1412438r2=1412439view=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 
Thu Nov 22 07:34:32 2012
@@ -20,6 +20,7 @@
 #define RSTR_PRUNSRV Commons Daemon Service Runner
 
 IDI_MAINICON ICON   ../../resources/procrunw.ico
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST prunsrv.manifest
 
 1 VERSIONINFO
  FILEVERSION 1,0,11,0

svn commit: r1412441 - /commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt

2012-11-21 Thread mturk 
Author: mturk
Date: Thu Nov 22 07:41:13 2012
New Revision: 1412441

URL: http://svn.apache.org/viewvc?rev=1412441view=rev
Log:
Update release notes

Modified:
commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt

Modified: commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt?rev=1412441r1=1412440r2=1412441view=diff
==
--- commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt Thu Nov 22 07:41:13 
2012
@@ -30,10 +30,10 @@ Commons DAEMON 1.0.3 requires a minimum 
 
 NEW FEATURES:
 
-* DAEMON-264: Change current working directory to / when daemonising (1.0.11)
-  Added -cwd parameter which defaults to /.
-* DAEMON-262: Service configuration dialog needs a refresh button (1.0.11)
-* DAEMON-245: Support privilege escalation on Windows (UAC) (1.0.11)
+* DAEMON-264: Add -cwd to jsvc so that user can specify working
+  directory. It defaults to /. (1.0.11)
+* DAEMON-262: Automatically refresh manager application (1.0.11)
+* DAEMON-245: Support privilege escalation on Windows UAC (1.0.11)
 * DAEMON-221: Add -umask to jsvc so that users don't have to
   recompile the jsvc if different umask is desired (1.0.8)
 * DAEMON-209: Add --LibraryPath to procrun for setting the
@@ -85,7 +85,7 @@ BUG FIXES:
 
 1.0.11: DAEMON-244, DAEMON-246, DAEMON-247, DAEMON-252, DAEMON-253, DAEMON-254,
 DAEMON-255, DAEMON-257, DAEMON-261, DAEMON-263, DAEMON-265, DAEMON-266,
-DAEMON-267 
+DAEMON-267
 
 1.0.10: DAEMON-241, DAEMON-242

  1   2   3   4   5   6   7   8   9   10   >