diff options
| author |   huangjian <huang.jian12@zte.com.cn> | 2016-09-28 09:59:08 +0800 |
|---|---|---|
| committer | huangjian <huang.jian12@zte.com.cn> | 2016-09-28 09:59:08 +0800 |
| commit | 97d50e1447337be674351a7a3b626c8a28d6939b (patch) | |
| tree | b25eccb8d11e494bce5da8efefa34801a00b7e10 | |
| parent | bc536c771a675bae597d0f8d9533e0a6022adb2b (diff) | |
Running wso2bpel-ext has fail. And fix register to MSB issue
Change-Id: I1f513a600358b71108373b3024ffa3b94f611449
IssueId: OCS-72
Signed-off-by: huangjian <huang.jian12@zte.com.cn>
6 files changed, 9 insertions, 5 deletions
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 Binary files differdeleted file mode 100644 index 893e2dc..0000000 --- a/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/lib/jersey-server.jar +++ /dev/null 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 @@ <body class="swagger-section"> <div id='header'> <div class="swagger-ui-wrap"> - <a id="logo" >Sample</a> + <a id="logo" >OPEN-O wso2bpel-ext</a> <form id='api_selector'> <div class='input'><input placeholder="http://example.com/api" id="input_baseUrl" name="baseUrl" type="text"/></div> <div class='input'><input placeholder="api_key" id="input_apiKey" name="apiKey" type="text"/></div> diff --git a/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/src/main/resources/api-doc/swagger-ui.js b/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/src/main/resources/api-doc/swagger-ui.js index c7c9f78..5828b13 100644 --- a/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/src/main/resources/api-doc/swagger-ui.js +++ b/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/src/main/resources/api-doc/swagger-ui.js @@ -535,7 +535,7 @@ this["Handlebars"]["templates"]["main"] = Handlebars.template({"1":function(dept + "\n "; },"14":function(depth0,helpers,partials,data) { var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression; - return " <span style=\"float:right\"><a href=\"" + return " <span style=\"float:right;display:none\"><a href=\"" + escapeExpression(((helper = (helper = helpers.validatorUrl || (depth0 != null ? depth0.validatorUrl : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"validatorUrl","hash":{},"data":data}) : helper))) + "/debug?url=" + escapeExpression(((helper = (helper = helpers.url || (depth0 != null ? depth0.url : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"url","hash":{},"data":data}) : helper))) diff --git a/wso2bpel-ext/wso2bpel-parent/wso2bpelparent/pom.xml b/wso2bpel-ext/wso2bpel-parent/wso2bpelparent/pom.xml index f21c9ec..399fd40 100644 --- a/wso2bpel-ext/wso2bpel-parent/wso2bpelparent/pom.xml +++ b/wso2bpel-ext/wso2bpel-parent/wso2bpelparent/pom.xml @@ -32,7 +32,7 @@ <dropwizard.version>0.8.0</dropwizard.version> <swagger.version>1.5.3</swagger.version> <lombok.version>1.16.4</lombok.version> - <jersey.version>2.16</jersey.version> + <jersey.version>2.22.2</jersey.version> <jaxrs.consumer.version>5.0</jaxrs.consumer.version> <gson.version>2.2.4</gson.version> <junit.version>4.10</junit.version> |