Author: markt
Date: Thu Nov 2 11:40:57 2017
New Revision: 1814065
URL: http://svn.apache.org/viewvc?rev=1814065&view=rev
Log:
Fix DAEMON-374
Add support for Java 9 commoand line arguments to jsvc.
Patch provided by Rashmi Ranjan Mohanty
Modified:
commons/proper/daemon/trunk/src/changes/changes.xml
commons/proper/daemon/trunk/src/native/unix/native/arguments.c
commons/proper/daemon/trunk/src/native/unix/native/help.c
Modified: commons/proper/daemon/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/changes/changes.xml?rev=1814065&r1=1814064&r2=1814065&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/changes/changes.xml (original)
+++ commons/proper/daemon/trunk/src/changes/changes.xml Thu Nov 2 11:40:57 2017
@@ -127,6 +127,9 @@
Java 9 and later JREs and JDKs. Do this after checking the keys used by
Oracle provided Java 8 and earlier JREs and JDKs.
</action>
+ <action issue="DAEMON-374" type="fix" dev="markt" due-to="Rashmi Ranjan
Mohanty">
+ Add support for Java 9 commoand line arguments to jsvc.
+ </action>
</release>
</body>
</document>
Modified: commons/proper/daemon/trunk/src/native/unix/native/arguments.c
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/native/arguments.c?rev=1814065&r1=1814064&r2=1814065&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/native/arguments.c (original)
+++ commons/proper/daemon/trunk/src/native/unix/native/arguments.c Thu Nov 2
11:40:57 2017
@@ -388,6 +388,34 @@ static arg_data *parse(int argc, char *a
else if (!strncmp(argv[x], "-javaagent:", 11)) {
args->opts[args->onum++] = strdup(argv[x]);
}
+ /* Java 9 specific options */
+ else if (!strncmp(argv[x], "--add-modules=", 14)) {
+ args->opts[args->onum++] = strdup(argv[x]);
+ }
+ else if (!strncmp(argv[x], "--module-path=", 14)) {
+ args->opts[args->onum++] = strdup(argv[x]);
+ }
+ else if (!strncmp(argv[x], "--upgrade-module-path=", 22)) {
+ args->opts[args->onum++] = strdup(argv[x]);
+ }
+ else if (!strncmp(argv[x], "--add-reads=", 12)) {
+ args->opts[args->onum++] = strdup(argv[x]);
+ }
+ else if (!strncmp(argv[x], "--add-exports=", 14)) {
+ args->opts[args->onum++] = strdup(argv[x]);
+ }
+ else if (!strncmp(argv[x], "--add-opens=", 12)) {
+ args->opts[args->onum++] = strdup(argv[x]);
+ }
+ else if (!strncmp(argv[x], "--limit-modules=", 16)) {
+ args->opts[args->onum++] = strdup(argv[x]);
+ }
+ else if (!strncmp(argv[x], "--patch-module=", 15)) {
+ args->opts[args->onum++] = strdup(argv[x]);
+ }
+ else if (!strncmp(argv[x], "--illegal-access=", 17)) {
+ args->opts[args->onum++] = strdup(argv[x]);
+ }
else if (*argv[x] == '-') {
log_error("Invalid option %s",argv[x]);
return NULL;
Modified: commons/proper/daemon/trunk/src/native/unix/native/help.c
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/native/help.c?rev=1814065&r1=1814064&r2=1814065&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/native/help.c (original)
+++ commons/proper/daemon/trunk/src/native/unix/native/help.c Thu Nov 2
11:40:57 2017
@@ -99,6 +99,24 @@ void help(home_data *data)
printf(" stop the service using the file given in the -pidfile
option\n");
printf(" -keepstdin\n");
printf(" does not redirect stdin to /dev/null\n");
+ printf(" --add-modules=<module name>\n");
+ printf(" Java 9 --add-modules option. Passed as it is to JVM\n");
+ printf(" --module-path=<module path>\n");
+ printf(" Java 9 --module-path option. Passed as it is to JVM\n");
+ printf(" --upgrade-module-path=<module path>\n");
+ printf(" Java 9 --upgrade-module-path option. Passed as it is to
JVM\n");
+ printf(" --add-reads=<module name>\n");
+ printf(" Java 9 --add-reads option. Passed as it is to JVM\n");
+ printf(" --add-exports=<module name>\n");
+ printf(" Java 9 --add-exports option. Passed as it is to JVM\n");
+ printf(" --add-opens=<module name>\n");
+ printf(" Java 9 --add-opens option. Passed as it is to JVM\n");
+ printf(" --limit-modules=<module name>\n");
+ printf(" Java 9 --limit-modules option. Passed as it is to JVM\n");
+ printf(" --patch-module=<module name>\n");
+ printf(" Java 9 --patch-module option. Passed as it is to JVM\n");
+ printf(" --illegal-access=<value>\n");
+ printf(" Java 9 --illegal-access option. Passed as it is to JVM.
Refer java help for possible values.\n");
printf("\njsvc (Apache Commons Daemon) " JSVC_VERSION_STRING "\n");
printf("Copyright (c) 1999-2016 Apache Software Foundation.\n");
