From 479243ad2b77fd90f55142e2b81db7fb6b1e09e6 Mon Sep 17 00:00:00 2001 From: lizi00164331 Date: Wed, 19 Apr 2017 17:21:44 +0800 Subject: [PATCH] Modify the config of wso2 Issue-ID: OCS-217 Change-Id: I6ab627200ebae31ea77b0da5d608b9f8f52b701e Signed-off-by: lizi00164331 --- .../src/main/assembly/wso2bps-ext/bin/startup.bat | 6 ++++-- .../src/main/assembly/wso2bps-ext/bin/startup.sh | 4 +++- .../src/main/assembly/wso2bps-ext/conf/wso2bpel.yml | 6 +++--- .../org/openo/carbon/bpel/Wso2BpelConfiguration.java | 18 +++++++++++++++--- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/wso2bpel-ext/wso2bpel-core/distribution/standalone/src/main/assembly/wso2bps-ext/bin/startup.bat b/wso2bpel-ext/wso2bpel-core/distribution/standalone/src/main/assembly/wso2bps-ext/bin/startup.bat index 1d32352..95c0b59 100644 --- a/wso2bpel-ext/wso2bpel-core/distribution/standalone/src/main/assembly/wso2bps-ext/bin/startup.bat +++ b/wso2bpel-ext/wso2bpel-core/distribution/standalone/src/main/assembly/wso2bps-ext/bin/startup.bat @@ -20,16 +20,18 @@ title wso2bpel-service set RUNHOME=%~dp0 echo ### RUNHOME: %RUNHOME% echo ### Starting wso2bpel-service +set WSO2_EXT_HOME=%RUNHOME%\.. set JAVA="%JAVA_HOME%\bin\java.exe" set port=8312 set jvm_opts=-Xms50m -Xmx128m rem set jvm_opts=%jvm_opts% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=%port%,server=y,suspend=n -set class_path=%RUNHOME%;..\lib\*;%RUNHOME%..\wso2bpel-service.jar +set jvm_opts=%jvm_opts% -DWSO2_EXT_HOME=%WSO2_EXT_HOME% +set class_path=%RUNHOME%;%WSO2_EXT_HOME%\lib\*;%WSO2_EXT_HOME%\wso2bpel-service.jar echo ### jvm_opts: %jvm_opts% echo ### class_path: %class_path% -%JAVA% -classpath %class_path% %jvm_opts% org.openo.carbon.bpel.Wso2BpelApplication server %RUNHOME%../conf/wso2bpel.yml +%JAVA% -classpath %class_path% %jvm_opts% org.openo.carbon.bpel.Wso2BpelApplication server %WSO2_EXT_HOME%/conf/wso2bpel.yml IF ERRORLEVEL 1 goto showerror exit diff --git a/wso2bpel-ext/wso2bpel-core/distribution/standalone/src/main/assembly/wso2bps-ext/bin/startup.sh b/wso2bpel-ext/wso2bpel-core/distribution/standalone/src/main/assembly/wso2bps-ext/bin/startup.sh index f6cc79d..c8ea31a 100644 --- a/wso2bpel-ext/wso2bpel-core/distribution/standalone/src/main/assembly/wso2bps-ext/bin/startup.sh +++ b/wso2bpel-ext/wso2bpel-core/distribution/standalone/src/main/assembly/wso2bps-ext/bin/startup.sh @@ -16,6 +16,7 @@ DIRNAME=`dirname $0` RUNHOME=`cd $DIRNAME/; pwd` +WSO_EXT_HOME=${RUNHOME}/.. echo @RUNHOME@ $RUNHOME echo @JAVA_HOME@ $JAVA_HOME @@ -24,7 +25,8 @@ echo @JAVA@ $JAVA JAVA_OPTS="-Xms50m -Xmx128m -Djava.awt.headless=true" port=8312 -#JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=$port,server=y,suspend=n" +# JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=$port,server=y,suspend=n" +JAVA_OPTS="$JAVA_OPTS -DWSO2_EXT_HOME=${WSO_EXT_HOME}" echo @JAVA_OPTS@ $JAVA_OPTS class_path="$RUNHOME/:$RUNHOME/../lib/*:$RUNHOME/../wso2bpel-service.jar" diff --git a/wso2bpel-ext/wso2bpel-core/distribution/standalone/src/main/assembly/wso2bps-ext/conf/wso2bpel.yml b/wso2bpel-ext/wso2bpel-core/distribution/standalone/src/main/assembly/wso2bps-ext/conf/wso2bpel.yml index 6cf4c58..b56bb5a 100644 --- a/wso2bpel-ext/wso2bpel-core/distribution/standalone/src/main/assembly/wso2bps-ext/conf/wso2bpel.yml +++ b/wso2bpel-ext/wso2bpel-core/distribution/standalone/src/main/assembly/wso2bps-ext/conf/wso2bpel.yml @@ -25,9 +25,9 @@ wso2Host: localhost wso2HostPort: 9443 wso2AuthUserName: admin wso2AuthPassword: admin -wso2Path: ../../wso2bps -wso2UploadFilePath: ../../wso2bps/tmp/bpeluploads -wso2SslJksFile: ../../wso2bps/repository/resources/security/wso2carbon.jks +wso2Path: ../wso2bps +wso2UploadFilePath: ../wso2bps/tmp/bpeluploads +wso2SslJksFile: ../wso2bps/repository/resources/security/wso2carbon.jks wso2SslJksPassword: wso2carbon diff --git a/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/src/main/java/org/openo/carbon/bpel/Wso2BpelConfiguration.java b/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/src/main/java/org/openo/carbon/bpel/Wso2BpelConfiguration.java index 9c0967e..953a919 100644 --- a/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/src/main/java/org/openo/carbon/bpel/Wso2BpelConfiguration.java +++ b/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/src/main/java/org/openo/carbon/bpel/Wso2BpelConfiguration.java @@ -143,7 +143,11 @@ public class Wso2BpelConfiguration extends Configuration { @JsonProperty public void setWso2Path(String wso2Path) { - this.wso2Path = wso2Path; + if (wso2Path.startsWith("/") == false) { + this.wso2Path = System.getProperty("WSO2_EXT_HOME") + "/" + wso2Path; + } else { + this.wso2Path = wso2Path; + } } @JsonProperty @@ -153,7 +157,11 @@ public class Wso2BpelConfiguration extends Configuration { @JsonProperty public void setWso2UploadFilePath(String wso2UploadFilePath) { - this.wso2UploadFilePath = wso2UploadFilePath; + if (wso2UploadFilePath.startsWith("/") == false) { + this.wso2UploadFilePath = System.getProperty("WSO2_EXT_HOME") + "/" + wso2UploadFilePath; + } else { + this.wso2UploadFilePath = wso2UploadFilePath; + } } @JsonProperty @@ -163,7 +171,11 @@ public class Wso2BpelConfiguration extends Configuration { @JsonProperty public void setWso2SslJksFile(String wso2SslJksFile) { - this.wso2SslJksFile = wso2SslJksFile; + if (wso2SslJksFile.startsWith("/") == false) { + this.wso2SslJksFile = System.getProperty("WSO2_EXT_HOME") + "/" + wso2SslJksFile; + } else { + this.wso2SslJksFile = wso2SslJksFile; + } } @JsonProperty -- 2.16.6