diff options
Diffstat (limited to 'catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/common')
3 files changed, 33 insertions, 2 deletions
diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/common/CommonConstant.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/common/CommonConstant.java index e6992264..1175ade7 100644 --- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/common/CommonConstant.java +++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/common/CommonConstant.java @@ -20,7 +20,7 @@ public class CommonConstant { // Package Status public static final String PACKAGE_STATUS_DELETING = "deleting"; - public static final String PACKAGE_STATUS_DELETE_FAIL = "deletefail"; + public static final String PACKAGE_STATUS_DELETE_FAIL = "deleteFailed"; public static final String PACKAGE_XML_FORMAT = "xml"; diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/common/MsbUtil.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/common/MsbUtil.java index 1a5eac6c..121646b0 100644 --- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/common/MsbUtil.java +++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/common/MsbUtil.java @@ -51,6 +51,7 @@ public class MsbUtil { } public static String getYamlParseBaseUrl() { - return Config.getConfigration().getYamlParseAddr() + "/api/yamlparser/v1"; + return YmalParseBaseAddrConfig.getYmalParseBaseAddr() + "/api/yamlparser/v1"; +// return Config.getConfigration().getYamlParseAddr() + "/api/yamlparser/v1"; } } diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/common/YmalParseBaseAddrConfig.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/common/YmalParseBaseAddrConfig.java new file mode 100644 index 00000000..57d45b1c --- /dev/null +++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/common/YmalParseBaseAddrConfig.java @@ -0,0 +1,30 @@ +/** + * Copyright 2016 [ZTE] and others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openo.commontosca.catalog.common; + +public class YmalParseBaseAddrConfig { + + protected static String yamlParseAddr; + + public static String getYmalParseBaseAddr() { + return yamlParseAddr; + } + + public static void setYmalParseBaseAddr(String yamlParseAddr) { + YmalParseBaseAddrConfig.yamlParseAddr = yamlParseAddr; + } +} |