Update configurations for version 5.10.0

wso2-attic · Mar 18, 2020 · 47d46fd · 47d46fd
1 parent 69e6e61
commit 47d46fd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/modules/is/templates/carbon-home/bin/wso2server.sh.erb b/modules/is/templates/carbon-home/bin/wso2server.sh.erb
@@ -283,10 +283,14 @@ echo "Using Java memory options: $JVM_MEM_OPTS"
 
 JAVA_VER_BASED_OPTS=""
 
+NASHRON_ARGS=""
+
 if [ $java_version_formatted -ge 1100 ]; then
-    JAVA_VER_BASED_OPTS="--add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED"
+ NASHRON_ARGS="--no-deprecation-warning"
+    JAVA_VER_BASED_OPTS="--add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED"
 fi
 
+
 while [ "$status" = "$START_EXIT_STATUS" ]
 do
     $JAVACMD \
@@ -324,6 +328,7 @@ do
     -DenableCorrelationLogs=false \
     -Dhttpclient.hostnameVerifier="DefaultAndLocalhost" \
  -Dorg.apache.xml.security.ignoreLineBreaks=false \
+ -Dnashorn.args="$NASHRON_ARGS" \
     -Dcarbon.new.config.dir.path="$CARBON_HOME/repository/resources/conf" \
     org.wso2.carbon.bootstrap.Bootstrap $*
     status=$?

diff --git a/modules/is/templates/carbon-home/repository/conf/deployment.toml.erb b/modules/is/templates/carbon-home/repository/conf/deployment.toml.erb
@@ -77,7 +77,7 @@ data_source="jdbc/WSO2ConsentDS"
 
 [keystore.primary]
 password = "<%= @security_keystore_password %>"
-file_name = "<%= @security_keystore_location %>"
+name = "<%= @security_keystore_location %>"
 type = "<%= @security_keystore_type %>"
 alias = "<%= @security_keystore_key_alias %>"
 key_password = "<%= @security_keystore_key_password %>"