diff options
author | huangjian <huang.jian12@zte.com.cn> | 2016-10-24 20:51:05 +0800 |
---|---|---|
committer | huangjian <huang.jian12@zte.com.cn> | 2016-10-24 20:51:05 +0800 |
commit | 9da7df516b79ba14675bbe42a90f0e2055c2fc63 (patch) | |
tree | 92cfadb3756ec0128ef5193b78bfd2bf55f2078f /wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/src/main/java/org/openo/carbon/bpel/resources/BpsProcess.java | |
parent | 44492c28f948c143a85cf71341b8cf440f3f261a (diff) |
Deploy plan file to WSO2 get error
Change-Id: Ic3d83c1a1a9330810353257860c8fa7a2446bf75
Issue-id: OCS-128
Signed-off-by: huangjian <huang.jian12@zte.com.cn>
Diffstat (limited to 'wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/src/main/java/org/openo/carbon/bpel/resources/BpsProcess.java')
-rw-r--r-- | wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/src/main/java/org/openo/carbon/bpel/resources/BpsProcess.java | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/src/main/java/org/openo/carbon/bpel/resources/BpsProcess.java b/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/src/main/java/org/openo/carbon/bpel/resources/BpsProcess.java index c86a01e..148e309 100644 --- a/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/src/main/java/org/openo/carbon/bpel/resources/BpsProcess.java +++ b/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/src/main/java/org/openo/carbon/bpel/resources/BpsProcess.java @@ -63,7 +63,7 @@ import org.apache.axis2.transport.http.HttpTransportProperties.Authenticator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.glassfish.jersey.media.multipart.MultiPartFeature; -import org.openo.carbon.bpel.config.ConfigManager; +import org.openo.carbon.bpel.common.Config; import org.openo.carbon.bpel.util.JsonUtil; import org.openo.carbon.bpel.util.SoapUtil; import org.openo.carbon.bpel.util.Xml2JsonUtil; @@ -79,7 +79,7 @@ import com.fasterxml.jackson.databind.JsonNode; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -@Path("/openoapi/wso2bpel/v1") +@Path("/") @Api(tags = {"wso2 bpel api"}) public class BpsProcess { @@ -100,7 +100,8 @@ public class BpsProcess { private synchronized String getConfig(String key) { if (configMap == null) { configMap = new HashMap<String, String>(); - String uploadFilePath = ConfigManager.getInstance().getProperty("wso2.uploadfile.path"); + //Config.getConfigration().getMsbServerAddr(); + /* String uploadFilePath = ConfigManager.getInstance().getProperty("wso2.uploadfile.path"); String jksFile = ConfigManager.getInstance().getProperty("wso2.ssl.jks.file"); String trustStorePassword = ConfigManager.getInstance().getProperty("wso2.ssl.trustStorePassword"); @@ -109,7 +110,14 @@ public class BpsProcess { String httpPassword = ConfigManager.getInstance().getProperty("wso2.http.authenticator.password"); String host = ConfigManager.getInstance().getProperty("wso2.host"); - String port = ConfigManager.getInstance().getProperty("wso2.http.port"); + String port = ConfigManager.getInstance().getProperty("wso2.http.port");*/ + String uploadFilePath = Config.getConfigration().getWso2UploadFilePath(); + String jksFile = Config.getConfigration().getWso2SslJksFile(); + String trustStorePassword = Config.getConfigration().getWso2SslJksPassword(); + String httpUsername = Config.getConfigration().getWso2AuthUserName(); + String httpPassword = Config.getConfigration().getWso2AuthPassword(); + String host = Config.getConfigration().getWso2Host(); + String port = Config.getConfigration().getWso2HostPort(); configMap.put("uploadFilePath", uploadFilePath); configMap.put("jksFile", jksFile); configMap.put("trustStorePassword", trustStorePassword); @@ -121,7 +129,7 @@ public class BpsProcess { if (configMap.containsKey(key)) { return configMap.get(key); } else { - return ConfigManager.getInstance().getProperty(key); + return ""; } } |