From: YuanHu Date: Mon, 10 Oct 2016 01:35:02 +0000 (+0800) Subject: Change the default parser type from zte to aria. X-Git-Tag: release/sun~33 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ee65f05a4e92530a887ab169baf6208e0d19658c;p=vfc%2Fnfvo%2Fcatalog.git Change the default parser type from zte to aria. Change-Id: I5ef4941c63ee34cd35abcdaab1eeac77bdca8384 Signed-off-by: YuanHu --- diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/ModelParserFactory.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/ModelParserFactory.java index ce494b3a..5e9ef1aa 100644 --- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/ModelParserFactory.java +++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/ModelParserFactory.java @@ -45,8 +45,7 @@ public class ModelParserFactory { } private ModelParserFactory() { - // PackageParseMap.put(EnumPackageFormat.TOSCA_XML, new - // ToscaXmlModelParser()); + // PackageParseMap.put(EnumPackageFormat.TOSCA_XML, new ToscaXmlModelParser()); if (isAriaParser()) { pkgType2ParseMap.put(EnumPackageFormat.TOSCA_YAML, new AriaModelParser()); } else { diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml index 998bb8c0..c4459173 100644 --- a/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml +++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml @@ -22,7 +22,7 @@ msbServerAddr: http://127.0.0.1:80 httpServerAddr: http://127.0.0.1:8201 -parserType: zte +parserType: aria #catalogue path to store csar temperarily cataloguePath: ./catalog