[SDNC-14] Roll version

Roll version to 1.1.2-SNAPSHOT with root pom version 1.1.2

Change-Id: Ib0a16857eff37e894c9b47179897759e4fa75271
Signed-off-by: Dan Timoney <dtimoney@att.com>

25 files changed, 622 insertions, 626 deletions

diff --git a/dblib/features/pom.xml b/dblib/features/pom.xml
index 995a1c5..70f3129 100755
--- a/dblib/features/pom.xml
+++ b/dblib/features/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>dblib</artifactId>
 		<groupId>org.openecomp.sdnc.core</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>dblib-features</artifactId>
 	<name>DBLIB Adaptor - Features</name>
diff --git a/dblib/installer/pom.xml b/dblib/installer/pom.xml
index a6705c4..775bf13 100755
--- a/dblib/installer/pom.xml
+++ b/dblib/installer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>dblib</artifactId>
         <groupId>org.openecomp.sdnc.core</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.2-SNAPSHOT</version>
     </parent>
     <artifactId>dblib-installer</artifactId>
     <name>DBLIB Adaptor - Karaf  Installer</name>
diff --git a/dblib/pom.xml b/dblib/pom.xml
index 3ca9236..b779a4a 100755
--- a/dblib/pom.xml
+++ b/dblib/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.openecomp.sdnc.core</groupId>
         <artifactId>sdnc-core</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.2-SNAPSHOT</version>
     </parent>
 
 
@@ -16,7 +16,7 @@
     <name>DBLIB Adaptor</name>
     <description>The DBLIB adaptor allows service logic to access persistent data in a local sql database</description>
 
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
 
     <build>
     <plugins>
diff --git a/dblib/provider/pom.xml b/dblib/provider/pom.xml
index e07d27c..1f88cdc 100755
--- a/dblib/provider/pom.xml
+++ b/dblib/provider/pom.xml
@@ -4,10 +4,10 @@
 	<parent>
 		<groupId>org.openecomp.sdnc.core</groupId>
 		<artifactId>dblib</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>dblib-provider</artifactId>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.2-SNAPSHOT</version>
 	<packaging>bundle</packaging>
 	<name>DBLIB Adaptor - Provider</name>
 	<url>http://maven.apache.org</url>
diff --git a/filters/features/pom.xml b/filters/features/pom.xml
index 74cdc3b..7a368ca 100755
--- a/filters/features/pom.xml
+++ b/filters/features/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>filters</artifactId>
 		<groupId>org.openecomp.sdnc.core</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>filters-features</artifactId>
 	<name>Filters - Features</name>
diff --git a/filters/installer/pom.xml b/filters/installer/pom.xml
index cc2bdfb..5c26219 100755
--- a/filters/installer/pom.xml
+++ b/filters/installer/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.openecomp.sdnc.core</groupId>
 		<artifactId>filters</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>filters-installer</artifactId>
 	<name>Filters - Karaf  Installer</name>
diff --git a/filters/pom.xml b/filters/pom.xml
index 52d6453..27a5f52 100644
--- a/filters/pom.xml
+++ b/filters/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openecomp.sdnc.core</groupId>
         <artifactId>sdnc-core</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -16,7 +16,7 @@
     <name>Filters</name>
     <description>Servlet filter to implement ECOMP logging spec</description>
 
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
 
 
 
diff --git a/filters/provider/pom.xml b/filters/provider/pom.xml
index 9c6efb9..2c4589e 100755
--- a/filters/provider/pom.xml
+++ b/filters/provider/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.openecomp.sdnc.core</groupId>
 		<artifactId>filters</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>filters-provider</artifactId>
 	<packaging>bundle</packaging>
diff --git a/pom.xml b/pom.xml
index 6b0badd..9d6d917 100755
--- a/pom.xml
+++ b/pom.xml
@@ -10,14 +10,12 @@
 	<url>https://wiki.openecomp.org</url>
 	<description>The SDN-C core components contains the SLI, dblib and root pom</description>
 
-<!--
 	<parent>
 		<groupId>org.openecomp.sdnc.core</groupId>
 		<artifactId>root</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 		<relativePath>rootpom/pom.xml</relativePath>
 	</parent>
--->
 
 	<issueManagement>
 		<system>JIRA</system>
@@ -170,7 +168,6 @@
 		</plugins>
 
 	</build>
-<!--
 	<modules>
 		<module>dblib</module>
 		<module>sli</module>
@@ -178,11 +175,10 @@
 		<module>sliPluginUtils</module>
 		<module>sliapi</module>
 	</modules>
--->
 	<organization>
 		<name>OpenECOMP</name>
 	</organization>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.2-SNAPSHOT</version>
 
 
 </project>
diff --git a/sli/common/pom.xml b/sli/common/pom.xml
index 8aa805f..2a7c780 100755
--- a/sli/common/pom.xml
+++ b/sli/common/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sli</artifactId>
 		<groupId>org.openecomp.sdnc.core</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>sli-common</artifactId>
 	<packaging>bundle</packaging>
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicParser.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicParser.java
index 3aa4068..398c28d 100644
--- a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicParser.java
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicParser.java
@@ -1,598 +1,598 @@
-/*-

+/*-
  * ============LICENSE_START=======================================================
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
  * 						reserved.
  * ================================================================================
- * 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

+ * 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.
- * ============LICENSE_END=========================================================

- */

-

-package org.openecomp.sdnc.sli;

-

-import java.io.File;

-import java.io.InputStream;

-import java.net.URL;

-import java.util.LinkedList;

-

-import javax.xml.XMLConstants;

-import javax.xml.parsers.SAXParser;

-import javax.xml.parsers.SAXParserFactory;

-import javax.xml.validation.Schema;

-import javax.xml.validation.SchemaFactory;

-

-import org.slf4j.Logger;

-import org.slf4j.LoggerFactory;

-import org.xml.sax.Attributes;

-import org.xml.sax.Locator;

-import org.xml.sax.SAXException;

-import org.xml.sax.SAXNotRecognizedException;

-import org.xml.sax.SAXParseException;

-import org.xml.sax.helpers.DefaultHandler;

-

-/**

- * @author dt5972

- *

- */

-public class SvcLogicParser {

-

-    SvcLogicStore store = null;

-    static final String JAXP_SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";

-    static final String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema";

-    static final String JAXP_SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";

-    static final String JAXP_DYNAMIC_VALIDATION = "http://apache.org/xml/features/validation/dynamic";

-    static final String JAXP_SCHEMA_VALIDATION = "http://apache.org/xml/features/validation/schema";

-

-    private static final String LOAD_MESSAGE = "Getting SvcLogicGraph from database - ";

-    private static final String LOAD_ERROR_MESSAGE = "SvcLogicGraph not found - ";

-    private static final String ACTIVATION_ERROR_MESSAGE = "Could not activate SvcLogicGraph - ";

-    private static final String PRINT_ERROR_MESSAGE = "Could not print SvcLogicGraph - ";

-    private static final String SVC_LOGIC_STORE_ERROR = "Could not get service logic store";

-

-    private static final Logger LOGGER = LoggerFactory.getLogger(SvcLogicParser.class);

-    private static final String SLI_VALIDATING_PARSER = "org.openecomp.sdnc.sli.parser.validate";

-    private static final String SVCLOGIC_XSD = "/svclogic.xsd";

-

-    private class SvcLogicHandler extends DefaultHandler {

-    private Locator locator = null;

-    private String module = null;

-    private String version = null;

-    private LinkedList<SvcLogicGraph> graphs = null;

-    private SvcLogicGraph curGraph = null;

-    private SvcLogicNode curNode = null;

-    private LinkedList<SvcLogicNode> nodeStack = null;

-    private int curNodeId = 0;

-    private String outcomeValue = null;

-    private LinkedList<String> outcomeStack = null;

-    private SvcLogicStore svcLogicStore = null;

-

-    public SvcLogicHandler(LinkedList<SvcLogicGraph> graphs, SvcLogicStore store) {

-        this.graphs = graphs;

-        this.curNode = null;

-        this.nodeStack = new LinkedList<>();

-        this.outcomeStack = new LinkedList<>();

-        this.curNodeId = 1;

-        this.outcomeValue = null;

-        this.svcLogicStore = store;

-

-    }

-

-    @Override

-	public void setDocumentLocator(Locator locator) {

-        this.locator = locator;

-    }

-

-    @Override

-    public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {

-

-        // Handle service-logic (graph) tag

-        if ("service-logic".equalsIgnoreCase(qName)) {

-

-        module = attributes.getValue("module");

-        if (module == null || module.length() == 0) {

-            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Missing 'module' attribute from service-logic tag");

-        }

-

-        version = attributes.getValue("version");

-        if (version == null || version.length() == 0) {

-            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Missing 'version' attribute from service-logic tag");

-        }

-

-        return;

-        }

-

-        if ("method".equalsIgnoreCase(qName)) {

-        if (curGraph != null) {

-            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Cannot nest module tags");

-        }

-        curGraph = new SvcLogicGraph();

-        curGraph.setModule(module);

-        curGraph.setVersion(version);

-        this.curNodeId = 1;

-

-        String attrValue = attributes.getValue("rpc");

-        if (attrValue == null || attrValue.length() == 0) {

-            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Missing 'rpc' attribute for method tag");

-        }

-        curGraph.setRpc(attrValue);

-

-        attrValue = attributes.getValue("mode");

-        if (attrValue == null || attrValue.length() == 0) {

-            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Missing 'mode' attribute for method tag");

-        }

-        curGraph.setMode(attrValue);

-

-        return;

-

-        }

-

-        // Handle outcome (edge) tag

-        if ("outcome".equalsIgnoreCase(qName)) {

-        String refValue = attributes.getValue("ref");

-

-        if (refValue != null) {

-            SvcLogicNode refNode = curGraph.getNamedNode(refValue);

-

-            if (refNode != null) {

-            try {

-                curNode.addOutcome(attributes.getValue("value"), refNode);

-            } catch (SvcLogicException e) {

-                throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Cannot add outcome", e);

-            }

-            } else {

-            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "ref to unknown node " + refValue);

-            }

-            return;

-        }

-

-        if (outcomeValue != null) {

-            outcomeStack.push(outcomeValue);

-        }

-        outcomeValue = attributes.getValue("value");

-

-        return;

-        }

-

-        // Handle parameter tag

-        if ("parameter".equalsIgnoreCase(qName)) {

-        String parmName = attributes.getValue("name");

-        String parmValue = attributes.getValue("value");

-

-        if (parmName != null && parmName.length() > 0 && parmValue != null) {

-            try {

-

-            curNode.mapParameter(parmName, parmValue);

-            } catch (Exception e) {

-            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + " cannot set parameter " + parmName + " to " + parmValue + " [" + e.getMessage() + "]");

-            }

-        }

-

-        return;

-        }

-

-        // Handle node tags

-

-        String nodeName = attributes.getValue("name");

-        SvcLogicNode thisNode = null;

-

-        try {

-        if (!svcLogicStore.isValidNodeType(qName)) {

-            throw new SAXNotRecognizedException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Unknown tag " + qName);

-        }

-        } catch (Exception e) {

-        throw new SAXNotRecognizedException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Cannot validate node type " + qName);

-        }

-

-        try {

-        if (nodeName != null && nodeName.length() > 0) {

-            thisNode = new SvcLogicNode(curNodeId++, qName, nodeName, curGraph);

-        } else {

-            thisNode = new SvcLogicNode(curNodeId++, qName, curGraph);

-        }

-

-        if (curGraph.getRootNode() == null) {

-            curGraph.setRootNode(thisNode);

-        }

-        } catch (SvcLogicException e) {

-        throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + e.getMessage());

-

-        }

-

-        int numAttributes = attributes.getLength();

-

-        for (int i = 0; i < numAttributes; i++) {

-        String attrName = attributes.getQName(i);

-        if (!"name".equalsIgnoreCase(attrName)) {

-            try {

-

-            String attrValueStr = attributes.getValue(i);

-            SvcLogicExpression attrValue = null;

-            if (attrValueStr.trim().startsWith("`")) {

-                int lastParen = attrValueStr.lastIndexOf("`");

-                String evalExpr = attrValueStr.trim().substring(1, lastParen);

-                attrValue = SvcLogicExpressionFactory.parse(evalExpr);

-

-            } else {

-                if (Character.isDigit(attrValueStr.charAt(0))) {

-                attrValue = new SvcLogicAtom("NUMBER", attrValueStr);

-                } else {

-                attrValue = new SvcLogicAtom("STRING", attrValueStr);

-                }

-            }

-            thisNode.setAttribute(attrName, attrValue);

-            } catch (Exception e) {

-            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Cannot set attribute " + attrName, e);

-            }

-        }

-        }

-

-        if (curNode != null) {

-        try {

-            if ("block".equalsIgnoreCase(curNode.getNodeType()) || "for".equalsIgnoreCase(curNode.getNodeType()) || "while".equalsIgnoreCase(curNode.getNodeType())) {

-            curNode.addOutcome("" + (curNode.getNumOutcomes() + 1), thisNode);

-            } else {

-            if (outcomeValue == null) {

-                throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + curNode.getNodeType() + " node expects outcome, instead found " + thisNode.getNodeType());

-            }

-            curNode.addOutcome(outcomeValue, thisNode);

-            }

-        } catch (SvcLogicException e) {

-            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + e.getMessage());

-        }

-        nodeStack.push(curNode);

-        }

-        curNode = thisNode;

-

-    }

-

-    @Override

-    public void endElement(String uri, String localName, String qName) throws SAXException {

-

-        // Handle close of service-logic tag

-        if ("service-logic".equalsIgnoreCase(qName)) {

-        // Nothing more to do

-        return;

-        }

-

-        // Handle close of method tag

-        if ("method".equalsIgnoreCase(qName)) {

-        graphs.add(curGraph);

-        curGraph = null;

-        return;

-        }

-

-        // Handle close of outcome tag

-        if ("outcome".equalsIgnoreCase(qName)) {

-        // Finished this outcome - pop the outcome stack

-        if (outcomeStack.isEmpty()) {

-            outcomeValue = null;

-        } else {

-            outcomeValue = outcomeStack.pop();

-        }

-        return;

-        }

-

-        // Handle close of parameter tag - do nothing

-        if ("parameter".equalsIgnoreCase(qName)) {

-        return;

-        }

-

-        // Handle close of a node tag

-        if (nodeStack.isEmpty()) {

-        curNode = null;

-        } else {

-        curNode = nodeStack.pop();

-        }

-    }

-

-    @Override

-    public void error(SAXParseException arg0) throws SAXException {

-        throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + arg0.getMessage());

-    }

-

-    }

-

-    public SvcLogicParser(SvcLogicStore store) {

-    this.store = store;

-    }

-

-    public SvcLogicParser(String propFile) {

-

-    try {

-        this.store = SvcLogicStoreFactory.getSvcLogicStore(propFile);

-    } catch (Exception e) {

-        LOGGER.error(SVC_LOGIC_STORE_ERROR, e);

-

-    }

-

-    }

-

-    public SvcLogicParser(InputStream propStr) {

-

-    try {

-        this.store = SvcLogicStoreFactory.getSvcLogicStore(propStr);

-    } catch (Exception e) {

-        LOGGER.error(SVC_LOGIC_STORE_ERROR, e);

-

-    }

-

-    }

-

-    public LinkedList<SvcLogicGraph> parse(String fileName) throws SvcLogicException {

-    LinkedList<SvcLogicGraph> graphs = null;

-

-    URL xsdUrl = null;

-    Schema schema = null;

-    String validateSchema = System.getProperty(SLI_VALIDATING_PARSER, "true");

-

-    if (validateSchema != null || validateSchema.equalsIgnoreCase("true")) {

-        xsdUrl = getClass().getResource(SVCLOGIC_XSD);

-

-    }

-

-    if (xsdUrl != null) {

-        try {

-        SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);

-        schema = schemaFactory.newSchema(xsdUrl);

-        } catch (Exception e) {

-        LOGGER.warn("Could not validate using schema " + xsdUrl.getPath(), e);

-        }

-    } else {

-        LOGGER.warn("Could not find resource " + SVCLOGIC_XSD);

-    }

-

-    try {

-        SAXParserFactory factory = SAXParserFactory.newInstance();

-

-        if (schema != null) {

-        factory.setNamespaceAware(true);

-        factory.setSchema(schema);

-        }

-        SAXParser saxParser = factory.newSAXParser();

-

-        if (saxParser.isValidating()) {

-        LOGGER.info("Validating against schema " + xsdUrl.getPath());

-        }

-        graphs = new LinkedList<>();

-

-        saxParser.parse(fileName, new SvcLogicHandler(graphs, store));

-

-    } catch (Exception e) {

-        String msg = e.getMessage();

-        if (msg != null) {

-        LOGGER.error(msg);

-        throw new SvcLogicException("Compiler error: " + fileName + " @ " + msg);

-        } else {

-        LOGGER.info("Caught exception parsing " + fileName, e);

-        throw new SvcLogicException("Compiler error: " + fileName, e);

-        }

-    }

-

-    return graphs;

-    }

-

-    public static void main(String argv[]) {

-

-    if (argv.length == 0) {

-        SvcLogicParser.usage();

-    }

-

-    if ("load".equalsIgnoreCase(argv[0])) {

-        if (argv.length == 3) {

-        String xmlfile = argv[1];

-        String propfile = argv[2];

-

-        SvcLogicStore store = SvcLogicParser.getStore(propfile);

-        try {

-            SvcLogicParser.load(xmlfile, store);

-        } catch (Exception e) {

-            LOGGER.error(e.getMessage(), e);

-        }

-        } else {

-        SvcLogicParser.usage();

-        }

-    } else if ("print".equalsIgnoreCase(argv[0])) {

-        String version = null;

-        String propfile = null;

-

-        switch (argv.length) {

-        case 6:

-        version = argv[4];

-        propfile = argv[5];

-        case 5:

-        if (propfile == null) {

-            propfile = argv[4];

-        }

-        SvcLogicStore store = SvcLogicParser.getStore(propfile);

-        SvcLogicParser.print(argv[1], argv[2], argv[3], version, store);

-        break;

-        default:

-        SvcLogicParser.usage();

-        }

-    } else if ("get-source".equalsIgnoreCase(argv[0])) {

-

-        switch (argv.length) {

-        case 6:

-        SvcLogicStore store = SvcLogicParser.getStore(argv[5]);

-        SvcLogicParser.getSource(argv[1], argv[2], argv[3], argv[4], store);

-        break;

-        default:

-        SvcLogicParser.usage();

-        }

-    } else if ("activate".equalsIgnoreCase(argv[0])) {

-        if (argv.length == 6) {

-        SvcLogicStore store = SvcLogicParser.getStore(argv[5]);

-        SvcLogicParser.activate(argv[1], argv[2], argv[3], argv[4], store);

-        } else {

-        SvcLogicParser.usage();

-        }

-    } else if ("validate".equalsIgnoreCase(argv[0])) {

-        if (argv.length == 3) {

-        String xmlfile = argv[1];

-        String propfile = argv[2];

-

-        System.setProperty(SLI_VALIDATING_PARSER, "true");

-        SvcLogicStore store = SvcLogicParser.getStore(propfile);

-        try {

-            SvcLogicParser.validate(xmlfile, store);

-        } catch (Exception e) {

-            LOGGER.error(e.getMessage(), e);

-        }

-        } else {

-        SvcLogicParser.usage();

-        }

-    }

-

-    System.exit(0);

-    }

-

-    private static SvcLogicStore getStore(String propfile) {

-

-    SvcLogicStore store = null;

-

-    try {

-        store = SvcLogicStoreFactory.getSvcLogicStore(propfile);

-    } catch (Exception e) {

-        LOGGER.error(SVC_LOGIC_STORE_ERROR, e);

-        System.exit(1);

-    }

-

-    return store;

-

-    }

-

-    public static void load(String xmlfile, SvcLogicStore store) throws SvcLogicException {

-    File xmlFile = new File(xmlfile);

-    if (!xmlFile.canRead()) {

-        throw new ConfigurationException("Cannot read xml file (" + xmlfile + ")");

-    }

-

-    SvcLogicParser parser = new SvcLogicParser(store);

-    LinkedList<SvcLogicGraph> graphs = null;

-    try {

-        graphs = parser.parse(xmlfile);

-    } catch (Exception e) {

-        throw new SvcLogicException(e.getMessage(), e);

-    }

-

-    if (graphs == null) {

-        throw new SvcLogicException("Could not parse " + xmlfile);

-    }

-

-    for (SvcLogicGraph graph : graphs) {

-

-        String module = graph.getModule();

-        String rpc = graph.getRpc();

-        String version = graph.getVersion();

-        String mode = graph.getMode();

-        try {

-        LOGGER.info("Saving SvcLogicGraph to database (module:" + module + ",rpc:" + rpc + ",version:" + version + ",mode:" + mode + ")");

-        store.store(graph);

-        } catch (Exception e) {

-        throw new SvcLogicException(e.getMessage(), e);

-        }

-

-    }

-

-    }

-

-    public static void validate(String xmlfile, SvcLogicStore store) throws SvcLogicException {

-    File xmlFile = new File(xmlfile);

-    if (!xmlFile.canRead()) {

-        throw new ConfigurationException("Cannot read xml file (" + xmlfile + ")");

-    }

-

-    SvcLogicParser parser = new SvcLogicParser(store);

-    LinkedList<SvcLogicGraph> graphs = null;

-    try {

-        LOGGER.info("Validating " + xmlfile);

-        graphs = parser.parse(xmlfile);

-    } catch (Exception e) {

-        throw new SvcLogicException(e.getMessage(), e);

-    }

-

-    if (graphs == null) {

-        throw new SvcLogicException("Could not parse " + xmlfile);

-    } else {

-        LOGGER.info("Compilation successful for " + xmlfile);

-    }

-

-    }

-

-    private static void print(String module, String rpc, String mode, String version, SvcLogicStore store) {

-    String details = "(module:" + module + ", rpc:" + rpc + ", version:" + version + ", mode:" + mode + ")";

-

-    try {

-        LOGGER.info(LOAD_MESSAGE + details);

-

-        SvcLogicGraph graph = store.fetch(module, rpc, version, mode);

-        if (graph == null) {

-        LOGGER.error(LOAD_ERROR_MESSAGE + details);

-        System.exit(1);

-        }

-        graph.printAsGv(System.out);

-    } catch (Exception e) {

-        LOGGER.error(PRINT_ERROR_MESSAGE + details, e);

-        System.exit(1);

-    }

-

-    }

-

-    private static void getSource(String module, String rpc, String mode, String version, SvcLogicStore store) {

-    String details = "(module:" + module + ", rpc:" + rpc + ", version:" + version + ", mode:" + mode + ")";

-

-    try {

-        LOGGER.info(LOAD_MESSAGE + details);

-

-        SvcLogicGraph graph = store.fetch(module, rpc, version, mode);

-        if (graph == null) {

-        LOGGER.error(LOAD_ERROR_MESSAGE + details);

-        System.exit(1);

-        }

-        graph.printAsXml(System.out);

-    } catch (Exception e) {

-        LOGGER.error(PRINT_ERROR_MESSAGE + details, e);

-        System.exit(1);

-    }

-

-    }

-

-    private static void activate(String module, String rpc, String version, String mode, SvcLogicStore store) {

-    String details = "(module:" + module + ", rpc:" + rpc + ", version:" + version + ", mode:" + mode + ")";

-

-    try {

-        LOGGER.info(LOAD_MESSAGE + details);

-

-        SvcLogicGraph graph = store.fetch(module, rpc, version, mode);

-        if (graph == null) {

-        LOGGER.error(LOAD_ERROR_MESSAGE + details);

-        System.exit(1);

-        }

-        store.activate(graph);

-    } catch (Exception e) {

-        LOGGER.error(ACTIVATION_ERROR_MESSAGE + details, e);

-        System.exit(1);

-    }

-

-    }

-

-    private static void usage() {

-    System.err.println("Usage: SvcLogicParser load <xml-file> <prop-file>");

-    System.err.println(" OR    SvcLogicParser print <module> <rpc> <mode> [<version>] <prop-file>");

-    System.err.println(" OR    SvcLogicParser get-source <module> <rpc> <mode> <version> <prop-file>");

-    System.err.println(" OR    SvcLogicParser activate <module> <rpc> <version> <mode>");

-    System.exit(1);

-    }

-

-}

+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+import java.io.File;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.LinkedList;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.helpers.DefaultHandler;
+
+/**
+ * @author dt5972
+ *
+ */
+public class SvcLogicParser {
+
+    SvcLogicStore store = null;
+    static final String JAXP_SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
+    static final String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema";
+    static final String JAXP_SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
+    static final String JAXP_DYNAMIC_VALIDATION = "http://apache.org/xml/features/validation/dynamic";
+    static final String JAXP_SCHEMA_VALIDATION = "http://apache.org/xml/features/validation/schema";
+
+    private static final String LOAD_MESSAGE = "Getting SvcLogicGraph from database - ";
+    private static final String LOAD_ERROR_MESSAGE = "SvcLogicGraph not found - ";
+    private static final String ACTIVATION_ERROR_MESSAGE = "Could not activate SvcLogicGraph - ";
+    private static final String PRINT_ERROR_MESSAGE = "Could not print SvcLogicGraph - ";
+    private static final String SVC_LOGIC_STORE_ERROR = "Could not get service logic store";
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(SvcLogicParser.class);
+    private static final String SLI_VALIDATING_PARSER = "org.openecomp.sdnc.sli.parser.validate";
+    private static final String SVCLOGIC_XSD = "/svclogic.xsd";
+
+    private class SvcLogicHandler extends DefaultHandler {
+    private Locator locator = null;
+    private String module = null;
+    private String version = null;
+    private LinkedList<SvcLogicGraph> graphs = null;
+    private SvcLogicGraph curGraph = null;
+    private SvcLogicNode curNode = null;
+    private LinkedList<SvcLogicNode> nodeStack = null;
+    private int curNodeId = 0;
+    private String outcomeValue = null;
+    private LinkedList<String> outcomeStack = null;
+    private SvcLogicStore svcLogicStore = null;
+
+    public SvcLogicHandler(LinkedList<SvcLogicGraph> graphs, SvcLogicStore store) {
+        this.graphs = graphs;
+        this.curNode = null;
+        this.nodeStack = new LinkedList<>();
+        this.outcomeStack = new LinkedList<>();
+        this.curNodeId = 1;
+        this.outcomeValue = null;
+        this.svcLogicStore = store;
+
+    }
+
+    @Override
+	public void setDocumentLocator(Locator locator) {
+        this.locator = locator;
+    }
+
+    @Override
+    public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+
+        // Handle service-logic (graph) tag
+        if ("service-logic".equalsIgnoreCase(qName)) {
+
+        module = attributes.getValue("module");
+        if (module == null || module.length() == 0) {
+            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Missing 'module' attribute from service-logic tag");
+        }
+
+        version = attributes.getValue("version");
+        if (version == null || version.length() == 0) {
+            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Missing 'version' attribute from service-logic tag");
+        }
+
+        return;
+        }
+
+        if ("method".equalsIgnoreCase(qName)) {
+        if (curGraph != null) {
+            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Cannot nest module tags");
+        }
+        curGraph = new SvcLogicGraph();
+        curGraph.setModule(module);
+        curGraph.setVersion(version);
+        this.curNodeId = 1;
+
+        String attrValue = attributes.getValue("rpc");
+        if (attrValue == null || attrValue.length() == 0) {
+            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Missing 'rpc' attribute for method tag");
+        }
+        curGraph.setRpc(attrValue);
+
+        attrValue = attributes.getValue("mode");
+        if (attrValue == null || attrValue.length() == 0) {
+            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Missing 'mode' attribute for method tag");
+        }
+        curGraph.setMode(attrValue);
+
+        return;
+
+        }
+
+        // Handle outcome (edge) tag
+        if ("outcome".equalsIgnoreCase(qName)) {
+        String refValue = attributes.getValue("ref");
+
+        if (refValue != null) {
+            SvcLogicNode refNode = curGraph.getNamedNode(refValue);
+
+            if (refNode != null) {
+            try {
+                curNode.addOutcome(attributes.getValue("value"), refNode);
+            } catch (SvcLogicException e) {
+                throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Cannot add outcome", e);
+            }
+            } else {
+            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "ref to unknown node " + refValue);
+            }
+            return;
+        }
+
+        if (outcomeValue != null) {
+            outcomeStack.push(outcomeValue);
+        }
+        outcomeValue = attributes.getValue("value");
+
+        return;
+        }
+
+        // Handle parameter tag
+        if ("parameter".equalsIgnoreCase(qName)) {
+        String parmName = attributes.getValue("name");
+        String parmValue = attributes.getValue("value");
+
+        if (parmName != null && parmName.length() > 0 && parmValue != null) {
+            try {
+
+            curNode.mapParameter(parmName, parmValue);
+            } catch (Exception e) {
+            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + " cannot set parameter " + parmName + " to " + parmValue + " [" + e.getMessage() + "]");
+            }
+        }
+
+        return;
+        }
+
+        // Handle node tags
+
+        String nodeName = attributes.getValue("name");
+        SvcLogicNode thisNode = null;
+
+        try {
+        if (!svcLogicStore.isValidNodeType(qName)) {
+            throw new SAXNotRecognizedException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Unknown tag " + qName);
+        }
+        } catch (Exception e) {
+        throw new SAXNotRecognizedException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Cannot validate node type " + qName);
+        }
+
+        try {
+        if (nodeName != null && nodeName.length() > 0) {
+            thisNode = new SvcLogicNode(curNodeId++, qName, nodeName, curGraph);
+        } else {
+            thisNode = new SvcLogicNode(curNodeId++, qName, curGraph);
+        }
+
+        if (curGraph.getRootNode() == null) {
+            curGraph.setRootNode(thisNode);
+        }
+        } catch (SvcLogicException e) {
+        throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + e.getMessage());
+
+        }
+
+        int numAttributes = attributes.getLength();
+
+        for (int i = 0; i < numAttributes; i++) {
+        String attrName = attributes.getQName(i);
+        if (!"name".equalsIgnoreCase(attrName)) {
+            try {
+
+            String attrValueStr = attributes.getValue(i);
+            SvcLogicExpression attrValue = null;
+            if (attrValueStr.trim().startsWith("`")) {
+                int lastParen = attrValueStr.lastIndexOf("`");
+                String evalExpr = attrValueStr.trim().substring(1, lastParen);
+                attrValue = SvcLogicExpressionFactory.parse(evalExpr);
+
+            } else {
+                if (Character.isDigit(attrValueStr.charAt(0))) {
+                attrValue = new SvcLogicAtom("NUMBER", attrValueStr);
+                } else {
+                attrValue = new SvcLogicAtom("STRING", attrValueStr);
+                }
+            }
+            thisNode.setAttribute(attrName, attrValue);
+            } catch (Exception e) {
+            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Cannot set attribute " + attrName, e);
+            }
+        }
+        }
+
+        if (curNode != null) {
+        try {
+            if ("block".equalsIgnoreCase(curNode.getNodeType()) || "for".equalsIgnoreCase(curNode.getNodeType()) || "while".equalsIgnoreCase(curNode.getNodeType())) {
+            curNode.addOutcome("" + (curNode.getNumOutcomes() + 1), thisNode);
+            } else {
+            if (outcomeValue == null) {
+                throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + curNode.getNodeType() + " node expects outcome, instead found " + thisNode.getNodeType());
+            }
+            curNode.addOutcome(outcomeValue, thisNode);
+            }
+        } catch (SvcLogicException e) {
+            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + e.getMessage());
+        }
+        nodeStack.push(curNode);
+        }
+        curNode = thisNode;
+
+    }
+
+    @Override
+    public void endElement(String uri, String localName, String qName) throws SAXException {
+
+        // Handle close of service-logic tag
+        if ("service-logic".equalsIgnoreCase(qName)) {
+        // Nothing more to do
+        return;
+        }
+
+        // Handle close of method tag
+        if ("method".equalsIgnoreCase(qName)) {
+        graphs.add(curGraph);
+        curGraph = null;
+        return;
+        }
+
+        // Handle close of outcome tag
+        if ("outcome".equalsIgnoreCase(qName)) {
+        // Finished this outcome - pop the outcome stack
+        if (outcomeStack.isEmpty()) {
+            outcomeValue = null;
+        } else {
+            outcomeValue = outcomeStack.pop();
+        }
+        return;
+        }
+
+        // Handle close of parameter tag - do nothing
+        if ("parameter".equalsIgnoreCase(qName)) {
+        return;
+        }
+
+        // Handle close of a node tag
+        if (nodeStack.isEmpty()) {
+        curNode = null;
+        } else {
+        curNode = nodeStack.pop();
+        }
+    }
+
+    @Override
+    public void error(SAXParseException arg0) throws SAXException {
+        throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + arg0.getMessage());
+    }
+
+    }
+
+    public SvcLogicParser(SvcLogicStore store) {
+    this.store = store;
+    }
+
+    public SvcLogicParser(String propFile) {
+
+    try {
+        this.store = SvcLogicStoreFactory.getSvcLogicStore(propFile);
+    } catch (Exception e) {
+        LOGGER.error(SVC_LOGIC_STORE_ERROR, e);
+
+    }
+
+    }
+
+    public SvcLogicParser(InputStream propStr) {
+
+    try {
+        this.store = SvcLogicStoreFactory.getSvcLogicStore(propStr);
+    } catch (Exception e) {
+        LOGGER.error(SVC_LOGIC_STORE_ERROR, e);
+
+    }
+
+    }
+
+    public LinkedList<SvcLogicGraph> parse(String fileName) throws SvcLogicException {
+    LinkedList<SvcLogicGraph> graphs = null;
+
+    URL xsdUrl = null;
+    Schema schema = null;
+    String validateSchema = System.getProperty(SLI_VALIDATING_PARSER, "true");
+
+    if (validateSchema != null || validateSchema.equalsIgnoreCase("true")) {
+        xsdUrl = getClass().getResource(SVCLOGIC_XSD);
+
+    }
+
+    if (xsdUrl != null) {
+        try {
+        SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+        schema = schemaFactory.newSchema(xsdUrl);
+        } catch (Exception e) {
+        LOGGER.warn("Could not validate using schema " + xsdUrl.getPath(), e);
+        }
+    } else {
+        LOGGER.warn("Could not find resource " + SVCLOGIC_XSD);
+    }
+
+    try {
+        SAXParserFactory factory = SAXParserFactory.newInstance();
+
+        if (schema != null) {
+        factory.setNamespaceAware(true);
+        factory.setSchema(schema);
+        }
+        SAXParser saxParser = factory.newSAXParser();
+
+        if (saxParser.isValidating()) {
+        LOGGER.info("Validating against schema " + xsdUrl.getPath());
+        }
+        graphs = new LinkedList<>();
+
+        saxParser.parse(fileName, new SvcLogicHandler(graphs, store));
+
+    } catch (Exception e) {
+        String msg = e.getMessage();
+        if (msg != null) {
+        LOGGER.error(msg);
+        throw new SvcLogicException("Compiler error: " + fileName + " @ " + msg);
+        } else {
+        LOGGER.info("Caught exception parsing " + fileName, e);
+        throw new SvcLogicException("Compiler error: " + fileName, e);
+        }
+    }
+
+    return graphs;
+    }
+
+    public static void main(String argv[]) {
+
+    if (argv.length == 0) {
+        SvcLogicParser.usage();
+    }
+
+    if ("load".equalsIgnoreCase(argv[0])) {
+        if (argv.length == 3) {
+        String xmlfile = argv[1];
+        String propfile = argv[2];
+
+        SvcLogicStore store = SvcLogicParser.getStore(propfile);
+        try {
+            SvcLogicParser.load(xmlfile, store);
+        } catch (Exception e) {
+            LOGGER.error(e.getMessage(), e);
+        }
+        } else {
+        SvcLogicParser.usage();
+        }
+    } else if ("print".equalsIgnoreCase(argv[0])) {
+        String version = null;
+        String propfile = null;
+
+        switch (argv.length) {
+        case 6:
+        version = argv[4];
+        propfile = argv[5];
+        case 5:
+        if (propfile == null) {
+            propfile = argv[4];
+        }
+        SvcLogicStore store = SvcLogicParser.getStore(propfile);
+        SvcLogicParser.print(argv[1], argv[2], argv[3], version, store);
+        break;
+        default:
+        SvcLogicParser.usage();
+        }
+    } else if ("get-source".equalsIgnoreCase(argv[0])) {
+
+        switch (argv.length) {
+        case 6:
+        SvcLogicStore store = SvcLogicParser.getStore(argv[5]);
+        SvcLogicParser.getSource(argv[1], argv[2], argv[3], argv[4], store);
+        break;
+        default:
+        SvcLogicParser.usage();
+        }
+    } else if ("activate".equalsIgnoreCase(argv[0])) {
+        if (argv.length == 6) {
+        SvcLogicStore store = SvcLogicParser.getStore(argv[5]);
+        SvcLogicParser.activate(argv[1], argv[2], argv[3], argv[4], store);
+        } else {
+        SvcLogicParser.usage();
+        }
+    } else if ("validate".equalsIgnoreCase(argv[0])) {
+        if (argv.length == 3) {
+        String xmlfile = argv[1];
+        String propfile = argv[2];
+
+        System.setProperty(SLI_VALIDATING_PARSER, "true");
+        SvcLogicStore store = SvcLogicParser.getStore(propfile);
+        try {
+            SvcLogicParser.validate(xmlfile, store);
+        } catch (Exception e) {
+            LOGGER.error(e.getMessage(), e);
+        }
+        } else {
+        SvcLogicParser.usage();
+        }
+    }
+
+    System.exit(0);
+    }
+
+    private static SvcLogicStore getStore(String propfile) {
+
+    SvcLogicStore store = null;
+
+    try {
+        store = SvcLogicStoreFactory.getSvcLogicStore(propfile);
+    } catch (Exception e) {
+        LOGGER.error(SVC_LOGIC_STORE_ERROR, e);
+        System.exit(1);
+    }
+
+    return store;
+
+    }
+
+    public static void load(String xmlfile, SvcLogicStore store) throws SvcLogicException {
+    File xmlFile = new File(xmlfile);
+    if (!xmlFile.canRead()) {
+        throw new ConfigurationException("Cannot read xml file (" + xmlfile + ")");
+    }
+
+    SvcLogicParser parser = new SvcLogicParser(store);
+    LinkedList<SvcLogicGraph> graphs = null;
+    try {
+        graphs = parser.parse(xmlfile);
+    } catch (Exception e) {
+        throw new SvcLogicException(e.getMessage(), e);
+    }
+
+    if (graphs == null) {
+        throw new SvcLogicException("Could not parse " + xmlfile);
+    }
+
+    for (SvcLogicGraph graph : graphs) {
+
+        String module = graph.getModule();
+        String rpc = graph.getRpc();
+        String version = graph.getVersion();
+        String mode = graph.getMode();
+        try {
+        LOGGER.info("Saving SvcLogicGraph to database (module:" + module + ",rpc:" + rpc + ",version:" + version + ",mode:" + mode + ")");
+        store.store(graph);
+        } catch (Exception e) {
+        throw new SvcLogicException(e.getMessage(), e);
+        }
+
+    }
+
+    }
+
+    public static void validate(String xmlfile, SvcLogicStore store) throws SvcLogicException {
+    File xmlFile = new File(xmlfile);
+    if (!xmlFile.canRead()) {
+        throw new ConfigurationException("Cannot read xml file (" + xmlfile + ")");
+    }
+
+    SvcLogicParser parser = new SvcLogicParser(store);
+    LinkedList<SvcLogicGraph> graphs = null;
+    try {
+        LOGGER.info("Validating " + xmlfile);
+        graphs = parser.parse(xmlfile);
+    } catch (Exception e) {
+        throw new SvcLogicException(e.getMessage(), e);
+    }
+
+    if (graphs == null) {
+        throw new SvcLogicException("Could not parse " + xmlfile);
+    } else {
+        LOGGER.info("Compilation successful for " + xmlfile);
+    }
+
+    }
+
+    private static void print(String module, String rpc, String mode, String version, SvcLogicStore store) {
+    String details = "(module:" + module + ", rpc:" + rpc + ", version:" + version + ", mode:" + mode + ")";
+
+    try {
+        LOGGER.info(LOAD_MESSAGE + details);
+
+        SvcLogicGraph graph = store.fetch(module, rpc, version, mode);
+        if (graph == null) {
+        LOGGER.error(LOAD_ERROR_MESSAGE + details);
+        System.exit(1);
+        }
+        graph.printAsGv(System.out);
+    } catch (Exception e) {
+        LOGGER.error(PRINT_ERROR_MESSAGE + details, e);
+        System.exit(1);
+    }
+
+    }
+
+    private static void getSource(String module, String rpc, String mode, String version, SvcLogicStore store) {
+    String details = "(module:" + module + ", rpc:" + rpc + ", version:" + version + ", mode:" + mode + ")";
+
+    try {
+        LOGGER.info(LOAD_MESSAGE + details);
+
+        SvcLogicGraph graph = store.fetch(module, rpc, version, mode);
+        if (graph == null) {
+        LOGGER.error(LOAD_ERROR_MESSAGE + details);
+        System.exit(1);
+        }
+        graph.printAsXml(System.out);
+    } catch (Exception e) {
+        LOGGER.error(PRINT_ERROR_MESSAGE + details, e);
+        System.exit(1);
+    }
+
+    }
+
+    private static void activate(String module, String rpc, String version, String mode, SvcLogicStore store) {
+    String details = "(module:" + module + ", rpc:" + rpc + ", version:" + version + ", mode:" + mode + ")";
+
+    try {
+        LOGGER.info(LOAD_MESSAGE + details);
+
+        SvcLogicGraph graph = store.fetch(module, rpc, version, mode);
+        if (graph == null) {
+        LOGGER.error(LOAD_ERROR_MESSAGE + details);
+        System.exit(1);
+        }
+        store.activate(graph);
+    } catch (Exception e) {
+        LOGGER.error(ACTIVATION_ERROR_MESSAGE + details, e);
+        System.exit(1);
+    }
+
+    }
+
+    private static void usage() {
+    System.err.println("Usage: SvcLogicParser load <xml-file> <prop-file>");
+    System.err.println(" OR    SvcLogicParser print <module> <rpc> <mode> [<version>] <prop-file>");
+    System.err.println(" OR    SvcLogicParser get-source <module> <rpc> <mode> <version> <prop-file>");
+    System.err.println(" OR    SvcLogicParser activate <module> <rpc> <version> <mode>");
+    System.exit(1);
+    }
+
+}
diff --git a/sli/features/pom.xml b/sli/features/pom.xml
index d308105..8a5ed80 100755
--- a/sli/features/pom.xml
+++ b/sli/features/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>sli</artifactId>
 		<groupId>org.openecomp.sdnc.core</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>sli-features</artifactId>
 	<name>SLI - Features</name>
diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml
index b26767f..d2d105b 100755
--- a/sli/installer/pom.xml
+++ b/sli/installer/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>sli</artifactId>
 		<groupId>org.openecomp.sdnc.core</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>sli-installer</artifactId>
 	<name>SLI - Karaf  Installer</name>
diff --git a/sli/pom.xml b/sli/pom.xml
index 49f1fe1..1e979aa 100755
--- a/sli/pom.xml
+++ b/sli/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openecomp.sdnc.core</groupId>
 		<artifactId>sdnc-core</artifactId>
-        	<version>1.1.1-SNAPSHOT</version>
+        	<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
@@ -59,7 +59,7 @@
 	<organization>
 		<name>openECOMP</name>
 	</organization>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.2-SNAPSHOT</version>
 
 
 </project>
diff --git a/sli/provider/pom.xml b/sli/provider/pom.xml
index 12886b0..cc1b728 100755
--- a/sli/provider/pom.xml
+++ b/sli/provider/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.openecomp.sdnc.core</groupId>
 		<artifactId>sli</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>sli-provider</artifactId>
 	<packaging>bundle</packaging>
diff --git a/sli/recording/pom.xml b/sli/recording/pom.xml
index f539668..f49992b 100755
--- a/sli/recording/pom.xml
+++ b/sli/recording/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openecomp.sdnc.core</groupId>
     <artifactId>sli</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
   </parent>
   <artifactId>sli-recording</artifactId>
   <packaging>bundle</packaging>
diff --git a/sliPluginUtils/features/pom.xml b/sliPluginUtils/features/pom.xml
index d1c9614..54b909a 100755
--- a/sliPluginUtils/features/pom.xml
+++ b/sliPluginUtils/features/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>sliPluginUtils</artifactId>
 		<groupId>org.openecomp.sdnc.core</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 
 	<name>SliPluginUtils Plugin - Features</name>
diff --git a/sliPluginUtils/installer/pom.xml b/sliPluginUtils/installer/pom.xml
index 5562535..e1044cb 100755
--- a/sliPluginUtils/installer/pom.xml
+++ b/sliPluginUtils/installer/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>sliPluginUtils</artifactId>
 		<groupId>org.openecomp.sdnc.core</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>sliPluginUtils-installer</artifactId>
 	<name>SLI Plugin Utilities - Karaf  Installer</name>
diff --git a/sliPluginUtils/pom.xml b/sliPluginUtils/pom.xml
index d94e361..dec05f2 100755
--- a/sliPluginUtils/pom.xml
+++ b/sliPluginUtils/pom.xml
@@ -3,7 +3,7 @@
 
 	<groupId>org.openecomp.sdnc.core</groupId>
 	<artifactId>sliPluginUtils</artifactId>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modelVersion>4.0.0</modelVersion>
 
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.openecomp.sdnc.core</groupId>
 		<artifactId>sdnc-core</artifactId>
-        	<version>1.1.1-SNAPSHOT</version>
+        	<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<name>Service Logic Interface Plugin Utilities</name>
 	<description>A package of static utility functions to be used when developing SLI plugins</description>
diff --git a/sliPluginUtils/provider/pom.xml b/sliPluginUtils/provider/pom.xml
index c7468e9..c640cb5 100755
--- a/sliPluginUtils/provider/pom.xml
+++ b/sliPluginUtils/provider/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.openecomp.sdnc.core</groupId>
 		<artifactId>sliPluginUtils</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 
 	<name>SliPluginUtils Plugin - Provider</name>
diff --git a/sliapi/features/pom.xml b/sliapi/features/pom.xml
index 4bef99d..7165505 100755
--- a/sliapi/features/pom.xml
+++ b/sliapi/features/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>sliapi</artifactId>
 		<groupId>org.openecomp.sdnc.core</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>sliapi-features</artifactId>
 
diff --git a/sliapi/installer/pom.xml b/sliapi/installer/pom.xml
index 38646e5..0c09bf2 100755
--- a/sliapi/installer/pom.xml
+++ b/sliapi/installer/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>sliapi</artifactId>
 		<groupId>org.openecomp.sdnc.core</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>sliapi-installer</artifactId>
 	<packaging>pom</packaging>
diff --git a/sliapi/model/pom.xml b/sliapi/model/pom.xml
index 4c933b2..793aba8 100755
--- a/sliapi/model/pom.xml
+++ b/sliapi/model/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>sliapi</artifactId>
 		<groupId>org.openecomp.sdnc.core</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>sliapi-model</artifactId>
 	<packaging>bundle</packaging>
diff --git a/sliapi/pom.xml b/sliapi/pom.xml
index c6a9b93..b4d32ed 100755
--- a/sliapi/pom.xml
+++ b/sliapi/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>org.openecomp.sdnc.core</groupId>
 		<artifactId>sdnc-core</artifactId>
-        	<version>1.1.1-SNAPSHOT</version>
+        	<version>1.1.2-SNAPSHOT</version>
 	</parent>
 
 	<packaging>pom</packaging>
 	<groupId>org.openecomp.sdnc.core</groupId>
 	<artifactId>sliapi</artifactId>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.2-SNAPSHOT</version>
 
 	<properties>
 		<feature-name>sliapi</feature-name>
diff --git a/sliapi/provider/pom.xml b/sliapi/provider/pom.xml
index 4d78fa5..ccc8852 100755
--- a/sliapi/provider/pom.xml
+++ b/sliapi/provider/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>sliapi</artifactId>
 		<groupId>org.openecomp.sdnc.core</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>sliapi-provider</artifactId>
 	<packaging>bundle</packaging>