Fix platform logic installation

Platform logic on SDNC should install the CCSDK platform logic package
merged with the graphs for SDNC.  Instead, it was overwriting CCSDK
package and installing only local SDNC version.

Change-Id: Iada6779b942ff608987486bd10fed9f147018f74
Issue-ID: SDNC-96
Signed-off-by: Dan Timoney <dtimoney@att.com>

Former-commit-id: 048b31a4b390ff4a749c4d8e7dcd271f12da177e

4 files changed, 0 insertions, 90 deletions

diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml
deleted file mode 100644
index 71ac1188..00000000
--- a/platform-logic/sliapi/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<parent>
-		<groupId>org.onap.sdnc.oam</groupId>
-		<artifactId>platform-logic</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<packaging>pom</packaging>
-	<groupId>org.onap.sdnc.oam</groupId>
-	<artifactId>platform-logic-sliapi</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-
-	<name>Platform Logic : SLI-API</name>
-	<description>Contains platform-level service logic for the SLI-API</description>
-
-
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.6</version>
-				<executions>
-					<execution>
-						<id>copy-version</id>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals><!-- here the phase you need -->
-						<phase>validate</phase>
-						<configuration>
-							<outputDirectory>../target/graphs/sliapi</outputDirectory>
-							<resources>
-								<resource>
-									<directory>src/main/xml</directory>
-									<includes>
-										<include>*.xml</include>
-									</includes>
-									<filtering>true</filtering>
-								</resource>
-								<resource>
-									<directory>src/main/resources</directory>
-									<includes>
-										<include>graph.versions</include>
-									</includes>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
diff --git a/platform-logic/sliapi/src/main/json/sli_healthcheck.json b/platform-logic/sliapi/src/main/json/sli_healthcheck.json
deleted file mode 100644
index e9394675..00000000
--- a/platform-logic/sliapi/src/main/json/sli_healthcheck.json
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-[{"id":"dbe3f1ee.ed5bb8","type":"dgstart","name":"DGSTART","outputs":1,"x":130,"y":52,"z":"95339741.be0da","wires":[["e5677e2c.75636"]]},{"id":"e5677e2c.75636","type":"service-logic","name":"sli ${project.version}","module":"sli","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.att.com/sdnctl/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.att.com/sdnctl/svclogic ./svclogic.xsd' module='sli' version='${project.version}'>","outputs":1,"x":169,"y":117,"z":"95339741.be0da","wires":[["2abd790.d32b188"]]},{"id":"2abd790.d32b188","type":"method","name":"method healthcheck","xml":"<method rpc='healthcheck' mode='sync'>\n","comments":"","outputs":1,"x":212,"y":184,"z":"95339741.be0da","wires":[["33013f8c.9c1dc8"]]},{"id":"33013f8c.9c1dc8","type":"set","name":"set return message","xml":"<set>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='SDN-C is healthy'/>\n<parameter name='ack-final' value='Y'/>\n","comments":"","x":263,"y":264,"z":"95339741.be0da","wires":[]}]
diff --git a/platform-logic/sliapi/src/main/resources/graph.versions b/platform-logic/sliapi/src/main/resources/graph.versions
deleted file mode 100644
index d0cdbdc3..00000000
--- a/platform-logic/sliapi/src/main/resources/graph.versions
+++ /dev/null
@@ -1 +0,0 @@
-sli healthcheck ${project.version} sync
diff --git a/platform-logic/sliapi/src/main/xml/sli_healthcheck.xml b/platform-logic/sliapi/src/main/xml/sli_healthcheck.xml
deleted file mode 100644
index c176767e..00000000
--- a/platform-logic/sliapi/src/main/xml/sli_healthcheck.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-  ============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
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd" module='sli' version='${project.version}'><method rpc='healthcheck' mode='sync'>
-<set>
-<parameter name='error-code' value='200' />
-<parameter name='error-message' value='SDN-C is healthy'/>
-<parameter name='ack-final' value='Y'/>
-</set></method></service-logic>