From 97d50e1447337be674351a7a3b626c8a28d6939b Mon Sep 17 00:00:00 2001 From: huangjian Date: Wed, 28 Sep 2016 09:59:08 +0800 Subject: Running wso2bpel-ext has fail. And fix register to MSB issue Change-Id: I1f513a600358b71108373b3024ffa3b94f611449 IssueId: OCS-72 Signed-off-by: huangjian --- .../distribution/standalone/src/main/assembly/run.sh | 4 ++-- .../wso2bpel-core/wso2bpel-mgr/lib/jersey-server.jar | Bin 951701 -> 0 bytes .../org/openo/carbon/bpel/common/ServiceRegistrer.java | 4 ++++ .../wso2bpel-mgr/src/main/resources/api-doc/index.html | 2 +- .../src/main/resources/api-doc/swagger-ui.js | 2 +- wso2bpel-ext/wso2bpel-parent/wso2bpelparent/pom.xml | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) delete mode 100644 wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/lib/jersey-server.jar diff --git a/wso2bpel-ext/wso2bpel-core/distribution/standalone/src/main/assembly/run.sh b/wso2bpel-ext/wso2bpel-core/distribution/standalone/src/main/assembly/run.sh index 6046356..03c8e56 100644 --- a/wso2bpel-ext/wso2bpel-core/distribution/standalone/src/main/assembly/run.sh +++ b/wso2bpel-ext/wso2bpel-core/distribution/standalone/src/main/assembly/run.sh @@ -1,4 +1,4 @@ -# +# # # Copyright 2016 [ZTE] and others. # @@ -28,7 +28,7 @@ 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 -class_path="$RUNHOME/:dependency\*:$RUNHOME/wso2bpel-service.jar" +class_path="$RUNHOME/:$RUNHOME/lib/*:$RUNHOME/wso2bpel-service.jar" echo @class_path@ $class_path "$JAVA" $JAVA_OPTS -classpath "$class_path" org.openo.carbon.bpel.Wso2BpelApplication server "$RUNHOME/conf/wso2bpel.yml" diff --git a/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/lib/jersey-server.jar b/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/lib/jersey-server.jar deleted file mode 100644 index 893e2dc..0000000 Binary files a/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/lib/jersey-server.jar and /dev/null differ diff --git a/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/src/main/java/org/openo/carbon/bpel/common/ServiceRegistrer.java b/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/src/main/java/org/openo/carbon/bpel/common/ServiceRegistrer.java index 2fe3817..2ffaf49 100644 --- a/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/src/main/java/org/openo/carbon/bpel/common/ServiceRegistrer.java +++ b/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/src/main/java/org/openo/carbon/bpel/common/ServiceRegistrer.java @@ -24,6 +24,10 @@ public class ServiceRegistrer implements Runnable { private static final Logger LOG = LoggerFactory.getLogger(ServiceRegistrer.class); private final ServiceRegisterEntity wso2bpelEntity = new ServiceRegisterEntity(); + public ServiceRegistrer() { + initServiceEntity(); + } + @Override public void run() { LOG.info("start wso2bpelEntity microservice register"); diff --git a/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/src/main/resources/api-doc/index.html b/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/src/main/resources/api-doc/index.html index 6c9fff0..de81f55 100644 --- a/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/src/main/resources/api-doc/index.html +++ b/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/src/main/resources/api-doc/index.html @@ -84,7 +84,7 @@