aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuanHu <yuan.hu1@zte.com.cn>2016-10-10 09:35:02 +0800
committerYuanHu <yuan.hu1@zte.com.cn>2016-10-10 09:35:02 +0800
commitee65f05a4e92530a887ab169baf6208e0d19658c (patch)
tree70906705118b1a1749eb0e8028df000cff932e96
parent959c15db300c39b10ccab1df41496118b6df8eac (diff)
Change the default parser type from zte to aria.
Change-Id: I5ef4941c63ee34cd35abcdaab1eeac77bdca8384 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
-rw-r--r--catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/ModelParserFactory.java3
-rw-r--r--catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml2
2 files changed, 2 insertions, 3 deletions
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