From 2fc88d416c3207c382b9b35f847a25c1114cbdd5 Mon Sep 17 00:00:00 2001 From: 10090474 Date: Sun, 22 Jan 2017 16:06:27 +0800 Subject: Merger the code provide by lvbo chenbo. Change-Id: I6b4b0402dea075e8d4d4629dfef3fe16d7930901 Issue-id: OCS-198 Signed-off-by: 10090474 --- .../wso2bpel-core/distribution/standalone/src/main/assembly/run.bat | 5 ++++- .../standalone/src/main/assembly/wso2bps-ext/bin/startup.sh | 2 +- .../standalone/src/main/assembly/wso2bps-ext/conf/wso2bpel.yml | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) (limited to 'wso2bpel-ext/wso2bpel-core/distribution/standalone') diff --git a/wso2bpel-ext/wso2bpel-core/distribution/standalone/src/main/assembly/run.bat b/wso2bpel-ext/wso2bpel-core/distribution/standalone/src/main/assembly/run.bat index 253a589..9ead5cb 100644 --- a/wso2bpel-ext/wso2bpel-core/distribution/standalone/src/main/assembly/run.bat +++ b/wso2bpel-ext/wso2bpel-core/distribution/standalone/src/main/assembly/run.bat @@ -23,7 +23,10 @@ echo ##RUNHOME %RUNHOME% echo ### Starting wso2bps start /D %RUNHOME%wso2bps bin\wso2server.bat +cd /D %RUNHOME%wso2bps-ext\bin echo ### Starting wso2bps-ext -start /D %RUNHOME%wso2bps-ext bin\startup.bat +start startup.bat + +cd /D %RUNHOME% 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 8f72352..f6cc79d 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 @@ -22,7 +22,7 @@ echo @JAVA_HOME@ $JAVA_HOME JAVA="$JAVA_HOME/bin/java" echo @JAVA@ $JAVA -JAVA_OPTS="-Xms50m -Xmx128m" +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" echo @JAVA_OPTS@ $JAVA_OPTS 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 2fddc7a..e312d10 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 -- cgit 1.2.3-korg