You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2019/06/28 15:57:12 UTC
[commons-daemon] branch master updated (8125fce -> 4eca45c)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git.
from 8125fce Correct error in a089ee0 that broke the packaging
new e77b35e Re-name per 1.2.0 RC2 feedback
new 6b7dcbb Merege the two README files in the root of the project
new 74d7c30 Add an extension
new 711d597 Fix Javadoc error when building with Java 11
new 4a6878e Fix deprecation warnings when building with Java 9+
new 4eca45c Update Windows building instructions
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README | 7 ---
README.md | 5 +-
pom.xml | 5 +-
.../apache/commons/daemon/DaemonPermission.java | 2 +-
.../commons/daemon/support/DaemonLoader.java | 4 +-
.../commons/daemon/support/DaemonWrapper.java | 2 +-
src/native/unix/man/{README => README.txt} | 0
src/native/windows/README | 57 ----------------------
src/native/windows/README.txt | 50 +++++++++++++++++++
9 files changed, 62 insertions(+), 70 deletions(-)
delete mode 100644 README
rename src/native/unix/man/{README => README.txt} (100%)
delete mode 100644 src/native/windows/README
create mode 100644 src/native/windows/README.txt
[commons-daemon] 02/06: Merege the two README files in the root of
the project
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
commit 6b7dcbbc13f8fbf2d0f34772fc4320fa9bd65a0e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jun 28 16:27:16 2019 +0100
Merege the two README files in the root of the project
---
README | 7 -------
README.md | 5 ++++-
pom.xml | 5 ++++-
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/README b/README
deleted file mode 100644
index 24e2062..0000000
--- a/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Commons Daemon
-=====================
-
-Apache Commons Daemon is a set of utilities and Java support classes
-for running Java applications as server processes.
-Commonly known as 'daemon' processes in Unix terminology (hence the name),
-on Windows they are called 'services'.
diff --git a/README.md b/README.md
index 9bc6d28..69c3294 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,10 @@ Apache Commons Daemon
[](https://maven-badges.herokuapp.com/maven-central/commons-daemon/commons-daemon/)
[](https://javadoc.io/doc/commons-daemon/commons-daemon/1.2.0)
-Apache Commons Daemon software provides an alternative invocation mechanism for unix-daemon-like Java code.
+Apache Commons Daemon software is a set of utilities and Java support
+ classes for running Java applications as server processes. These are
+ commonly known as 'daemon' processes in Unix terminology (hence the
+ name). On Windows they are called 'services'.
Documentation
-------------
diff --git a/pom.xml b/pom.xml
index da3aaf0..dabcece 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,10 @@
which is why the NOTICE file has an earlier date than the inceptionYear -->
<inceptionYear>2002</inceptionYear>
<description>
- Apache Commons Daemon software provides an alternative invocation mechanism for unix-daemon-like Java code.
+ Apache Commons Daemon software is a set of utilities and Java support
+ classes for running Java applications as server processes. These are
+ commonly known as 'daemon' processes in Unix terminology (hence the
+ name). On Windows they are called 'services'.
</description>
<url>http://commons.apache.org/proper/commons-daemon/</url>
[commons-daemon] 03/06: Add an extension
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
commit 74d7c30649a880b9ad0e680961aa3aa2401248ea
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jun 28 16:28:44 2019 +0100
Add an extension
---
src/native/unix/man/{README => README.txt} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/src/native/unix/man/README b/src/native/unix/man/README.txt
similarity index 100%
rename from src/native/unix/man/README
rename to src/native/unix/man/README.txt
[commons-daemon] 04/06: Fix Javadoc error when building with Java 11
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
commit 711d59777d8aaf8659cead8fd337dec039db1421
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jun 28 16:40:36 2019 +0100
Fix Javadoc error when building with Java 11
---
src/main/java/org/apache/commons/daemon/DaemonPermission.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/daemon/DaemonPermission.java b/src/main/java/org/apache/commons/daemon/DaemonPermission.java
index a8eef88..e4bb3d2 100644
--- a/src/main/java/org/apache/commons/daemon/DaemonPermission.java
+++ b/src/main/java/org/apache/commons/daemon/DaemonPermission.java
@@ -35,7 +35,7 @@ import java.util.StringTokenizer;
* special "*" value implies all permissions for the given
* name:
* </p>
- * <table width="100%" border="1">
+ * <table border="1">
* <caption>Supported Actions</caption>
* <tr>
* <th>Target"Name</th>
[commons-daemon] 06/06: Update Windows building instructions
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
commit 4eca45c1342f751f0135803fb709447ede81d2ea
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jun 28 16:56:49 2019 +0100
Update Windows building instructions
---
src/native/windows/README.txt | 85 ++++++++++++++++++++-----------------------
1 file changed, 39 insertions(+), 46 deletions(-)
diff --git a/src/native/windows/README.txt b/src/native/windows/README.txt
index c7e7616..cb4e883 100644
--- a/src/native/windows/README.txt
+++ b/src/native/windows/README.txt
@@ -9,49 +9,42 @@ options, but a trivial build is simply;
nmake CPU=X86 PREFIX=c:\desired\path\of\daemon install
-Needed Tools
-============
-
-Commons Daemon needs the Microsoft Visual C 6/SP5 to
-build the x86 binaries. This is because this compiler
-doesn't create MSVCRTnn.DLL dependencies which will
-be loaded inside running JVM if used.
-For building AMD64/EMT64 binaries use the Platform SDK
-for Windows Server 2003R2.
-
-
-Step by Step
-============
-
-0. These were written for 64-bit XP. YMMV.
-
-1. Install the pre-requisites:
- - Microsoft Visual C 6
- - Microsoft Visual C 6 Service Pack 5
- - Platform SDK for Windows Server 2003 R2
-
-2. Open a new command prompt (to ensure the environment is clean)
- You'll need to do this for each different platform you want to build
-
-3. Configure the Visual C environment variables
- Not necessary if the option to add them to the user's environment was
- selected on install
- %VC6_DIR%\Bin\VCVARS32.BAT
- (e.g. "c:\Program Files (x86)\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT")
-
-4. Configure the Platform SDK environment (optional for X86?)
- - win32
- <PlatformSdkDir>\SetEnv /SRV32 /RETAIL
- - x64
- <PlatformSdkDir>\SetEnv /X64 /RETAIL
- - i64
- <PlatformSdkDir>\SetEnv /SRV64 /RETAIL
-
-5. On 64-bit platforms set the following environment variable
- set EXTRA_CFLAGS=/GS-
-
-6. Build the binary
- - win32
- nmake CPU=X86
- - x64
- nmake CPU=X64
+Release Builds
+==============
+
+We jump through some additional hoops for release builds to avoid additional
+dependencies over and above those DLLs that are known to be present on every
+Windows install. If you build the binaries with a recent version of Visual
+Studio then it is likely the resulting binaries will have additional
+dependencies. You can check this with the Depends.exe tool provided with Visual
+Studio.
+
+Release builds are build with Mladen Turk's (mturk) Custom Microsoft Compiler
+Toolkit Compilation. This can be obtained from:
+https://github.com/mturk/cmsc
+Hash: cb6be932c8c95a46262a64a89e68aae620dfdcee
+Compile as per <cmsc-root>/tools/README.txt
+
+A detailed description of the full environment used for recent release builds is
+provided at:
+https://cwiki.apache.org/confluence/display/TOMCAT/Common+Native+Build+Environment
+
+The steps to produce the Windows binaries is then:
+
+1. cd $GIT_CLONE_DIR\src\native\windows\apps\prunmgr
+
+2. $CMCS_ROOT\setenv.bat /x86
+
+3. nmake -f Makefile
+
+4. cd ..\prunsrv
+
+5. nmake -f Makefile
+
+6. $CMCS_ROOT\setenv.bat /x64
+
+7. nmake -f Makefile
+
+
+It is not necessary to build a 64-bit version of prunmgr since the 32-bit
+version works with both 32-bit and 64-bit services.
[commons-daemon] 05/06: Fix deprecation warnings when building with
Java 9+
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
commit 4a6878e06c01e53fcff3c4084964275c16964fb2
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jun 28 16:40:59 2019 +0100
Fix deprecation warnings when building with Java 9+
---
src/main/java/org/apache/commons/daemon/support/DaemonLoader.java | 4 ++--
src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java b/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java
index f896ccd..a5fd3d8 100644
--- a/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java
+++ b/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java
@@ -83,7 +83,7 @@ public final class DaemonLoader
}
/* Create a new instance of the daemon */
- c.newInstance();
+ c.getConstructor().newInstance();
} catch (final Throwable t) {
/* In case we encounter ANY error, we dump the stack trace and
@@ -185,7 +185,7 @@ public final class DaemonLoader
}
/* Create a new instance of the daemon */
- daemon = c.newInstance();
+ daemon = c.getConstructor().newInstance();
if (isdaemon) {
/* Create a new controller instance */
diff --git a/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java b/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
index 4264515..314f949 100644
--- a/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
+++ b/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
@@ -239,7 +239,7 @@ public class DaemonWrapper implements Daemon
Object obj = null;
if ((inst.getModifiers() & Modifier.STATIC) == 0) {
// We only need object instance for non-static methods.
- obj = main.newInstance();
+ obj = main.getConstructor().newInstance();
}
final Object arg[] = new Object[1];
[commons-daemon] 01/06: Re-name per 1.2.0 RC2 feedback
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
commit e77b35e7c9545a42fed3a1b8cbf43ed868970ce5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jun 28 16:17:06 2019 +0100
Re-name per 1.2.0 RC2 feedback
---
src/native/windows/{README => README.txt} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/src/native/windows/README b/src/native/windows/README.txt
similarity index 100%
rename from src/native/windows/README
rename to src/native/windows/README.txt