From c709caf5a54b78caaa8d69726d2442ce3cedc4d7 Mon Sep 17 00:00:00 2001 From: ThisaraWeerakoon Date: Mon, 21 Sep 2026 10:27:39 +0530 Subject: [PATCH] Remove the JDK-9-incompatible -Djava.endorsed.dirs flag from wrapper configs and tool scripts. --- modules/distribution/src/main/bin/ciphertool.bat | 4 +--- modules/distribution/src/main/bin/ciphertool.sh | 1 - .../src/main/bin/synapse-config-migrator.sh | 3 --- repository/conf/sample-server-wrapper.conf | 15 +++++++-------- repository/conf/wrapper.conf | 7 +++---- 5 files changed, 11 insertions(+), 19 deletions(-) diff --git a/modules/distribution/src/main/bin/ciphertool.bat b/modules/distribution/src/main/bin/ciphertool.bat index 68ba84e0b..f0d6d3387 100644 --- a/modules/distribution/src/main/bin/ciphertool.bat +++ b/modules/distribution/src/main/bin/ciphertool.bat @@ -81,9 +81,7 @@ echo Using SYNAPSE_HOME: %SYNAPSE_HOME% echo Using JAVA_HOME: %JAVA_HOME% set _RUNJAVA="%JAVA_HOME%\bin\java" -set JAVA_ENDORSED=".\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed" - -%_RUNJAVA% %JAVA_OPTS% -cp "%SYNAPSE_CLASSPATH%" %_XDEBUG% -Djava.endorsed.dirs=%JAVA_ENDORSED% org.apache.synapse.securevault.tool.CipherTool %* +%_RUNJAVA% %JAVA_OPTS% -cp "%SYNAPSE_CLASSPATH%" %_XDEBUG% org.apache.synapse.securevault.tool.CipherTool %* endlocal :end diff --git a/modules/distribution/src/main/bin/ciphertool.sh b/modules/distribution/src/main/bin/ciphertool.sh index 68abd165d..55afbb922 100644 --- a/modules/distribution/src/main/bin/ciphertool.sh +++ b/modules/distribution/src/main/bin/ciphertool.sh @@ -101,5 +101,4 @@ fi $JAVA_HOME/bin/java \ -classpath "$SYNAPSE_CLASSPATH" \ --Djava.endorsed.dirs="$SYNAPSE_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \ org.apache.synapse.securevault.tool.CipherTool $* diff --git a/modules/distribution/src/main/bin/synapse-config-migrator.sh b/modules/distribution/src/main/bin/synapse-config-migrator.sh index 4bb753b1f..953628839 100644 --- a/modules/distribution/src/main/bin/synapse-config-migrator.sh +++ b/modules/distribution/src/main/bin/synapse-config-migrator.sh @@ -104,8 +104,6 @@ if $cygwin; then CLASSPATH=`cygpath --path --windows "$CLASSPATH"` JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"` fi -# endorsed dir -SYNAPSE_ENDORSED=$SYNAPSE_HOME/lib/endorsed MIGRATING_CONFIG=$SYNAPSE_HOME/repository/conf/synapse.xml if $1; then @@ -126,7 +124,6 @@ mv $MIGRATING_CONFIG $MIGRATING_CONFIG.back $JAVA_HOME/bin/java -server -Xms128M -Xmx128M \ $TEMP_PROPS \ -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XMLGrammarCachingConfiguration \ - -Djava.endorsed.dirs=$SYNAPSE_ENDORSED \ -Djava.io.tmpdir=$SYNAPSE_HOME/work/temp/synapse \ -classpath $SYNAPSE_CLASSPATH \ org.apache.synapse.migrator.ConfigurationMigrator \ diff --git a/repository/conf/sample-server-wrapper.conf b/repository/conf/sample-server-wrapper.conf index 56feddcd9..3192f3ddd 100644 --- a/repository/conf/sample-server-wrapper.conf +++ b/repository/conf/sample-server-wrapper.conf @@ -30,10 +30,9 @@ wrapper.java.library.path.1=../../lib wrapper.java.additional.1=-Dhttp_port wrapper.java.additional.2=-Dhttps_port wrapper.java.additional.3=-Dserver_name -wrapper.java.additional.4=-Djava.endorsed.dirs=../../lib/endorsed -wrapper.java.additional.5=-Dlog4j.configuration=file:../../lib/log4j.properties -wrapper.java.additional.6=-Djava.io.tmpdir=../../work/temp/sampleServer -wrapper.java.additional.7= +wrapper.java.additional.4=-Dlog4j.configuration=file:../../lib/log4j.properties +wrapper.java.additional.5=-Djava.io.tmpdir=../../work/temp/sampleServer +wrapper.java.additional.6= # Initial Java Heap Size (in MB) - compute according to system wrapper.java.initmemory=128 @@ -46,11 +45,11 @@ wrapper.app.parameter.1=samples.util.SampleAxis2Server wrapper.app.parameter.2=-repo %AXIS2_HOME%repository wrapper.app.parameter.3=-conf %AXIS2_HOME%repository\conf\axis2.xml -#wrapper will be initiated from this class(8 and 9 are required parameters) +#wrapper will be initiated from this class(7 and 8 are required parameters) #wrapper.app.parameter.1=samples.util.Bootstrap -#wrapper additional parameters(8 and 9 required) to overcome windows long classpath issue using Bootstrap -#wrapper.java.additional.8=-Djar.class.paths=../../lib,../../repository/components/plugins -#wrapper.java.additional.9=-Dsystem.home=. +#wrapper additional parameters(7 and 8 required) to overcome windows long classpath issue using Bootstrap +#wrapper.java.additional.7=-Djar.class.paths=../../lib,../../repository/components/plugins +#wrapper.java.additional.8=-Dsystem.home=. #******************************************************************** # Wrapper Logging Properties diff --git a/repository/conf/wrapper.conf b/repository/conf/wrapper.conf index 17bffa99e..42187b021 100644 --- a/repository/conf/wrapper.conf +++ b/repository/conf/wrapper.conf @@ -28,11 +28,10 @@ wrapper.java.library.path.1=lib # Java Additional Parameters wrapper.java.additional.1=-Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XMLGrammarCachingConfiguration -wrapper.java.additional.2=-Djava.endorsed.dirs=lib/endorsed -wrapper.java.additional.3=-Djava.io.tmpdir=work/temp/synapse -wrapper.java.additional.4= +wrapper.java.additional.2=-Djava.io.tmpdir=work/temp/synapse +wrapper.java.additional.3= # ----- Uncoment this to enable SSL debug options ----------- -#wrapper.java,additional.5=-Djavax.net.debug=all +#wrapper.java,additional.4=-Djavax.net.debug=all # Initial Java Heap Size (in MB) wrapper.java.initmemory=128