Prune migrated components from sdnc/northbound

Prune components that were migrated from sdnc/northbound to ccsdk by
removing code and replacing with a README.md that redirects the reader
to the appropriate CCSDK repo

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

22 files changed, 3 insertions, 2994 deletions

diff --git a/ueb-listener/README.md b/ueb-listener/README.md
new file mode 100644
index 00000000..842ddb16
--- /dev/null
+++ b/ueb-listener/README.md
@@ -0,0 +1,3 @@
+UEB-LISTENER MOVED TO CCSDK!
+
+The code for ueb-listener moved to the ccsdk/sli/northbound repository
diff --git a/ueb-listener/pom.xml b/ueb-listener/pom.xml
deleted file mode 100755
index 2e479fbc..00000000
--- a/ueb-listener/pom.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-        <groupId>org.openecomp.sdnc.northbound</groupId>
-	<packaging>jar</packaging>
-	<artifactId>ueb-listener</artifactId>
-	<version>1.1.2-SNAPSHOT</version>
-
-	<name>UEB Listener</name>
-	<description>UEB Listener</description>
-	<parent>
-		<groupId>org.openecomp.sdnc.northbound</groupId>
-		<artifactId>sdnc-northbound</artifactId>
-		<version>1.1.2-SNAPSHOT</version>
-	</parent>
-	<properties>
-		<sdc.client.version>1.1.7-SNAPSHOT</sdc.client.version>
-		<fasterxml.jackson.version>2.9.0.pr1</fasterxml.jackson.version>
-		<skip.SWM>true</skip.SWM>
-		<ueb.listener.base>/opt/app/ueb-listener</ueb.listener.base>
-		<maven.build.timestamp.format>yyMMdd-HHmmss</maven.build.timestamp.format>
-		<build.number>${maven.build.timestamp}</build.number>
-		<SWM_VERSION>${project.version}-${build.number}</SWM_VERSION>
-	</properties>
-
-	<dependencies>
-
-		<dependency>
-			<groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
-			<artifactId>sdc-distribution-client</artifactId>
-			<version>${sdc.client.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>1.7.10</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.6.1</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.17</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<version>${fasterxml.jackson.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>${fasterxml.jackson.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
-  		<dependency>
-			<groupId>org.openecomp.sdnc.core</groupId>
-			<artifactId>dblib-provider</artifactId>
- 			<version>${sdnctl.dblib.version}</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-
-			<!-- ================================================== -->
-			<!-- Set the JDK compiler version. -->
-			<!-- ================================================== -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.5.1</version>
-				<inherited>true</inherited>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.6</version>
-				<configuration>
-					<archive>
-						<manifest>
-							<addClasspath>true</addClasspath>
-							<mainClass>org.openecomp.sdnc.uebclient.SdncUebClient</mainClass>
-						</manifest>
-					</archive>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.6</version>
-				<executions>
-					<execution>
-						<id>create-zip</id>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<phase>package</phase>
-						<configuration>
-							<attach>true</attach>
-							<finalName>${project.artifactId}.${project.version}</finalName>
-							<attach>true</attach>
-							<descriptors>
-								<descriptor>src/assembly/assemble_zip.xml</descriptor>
-							</descriptors>
-							<appendAssemblyId>false</appendAssemblyId>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-		</plugins>
-	</build>
-
-</project>
diff --git a/ueb-listener/src/assembly/assemble_zip.xml b/ueb-listener/src/assembly/assemble_zip.xml
deleted file mode 100644
index ca89fc1f..00000000
--- a/ueb-listener/src/assembly/assemble_zip.xml
+++ /dev/null
@@ -1,63 +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=========================================================
-  -->
-
-<!-- Defines how we build the .zip file which is our distribution. -->
-
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>assemble_zip</id>
-	<formats>
-		<format>zip</format>
-	</formats>
-
-	<includeBaseDirectory>false</includeBaseDirectory>
-
-	<fileSets>
-		<fileSet>
-			<directory>src/main/bin</directory>
-			<outputDirectory>bin</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>target</directory>
-			<outputDirectory>lib</outputDirectory>
-			<includes>
-				<include>*.jar</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/resources</directory>
-			<outputDirectory>lib</outputDirectory>
-			<includes>
-				<include>*.xslt</include>
-				<include>*.properties</include>
-			</includes>
-		</fileSet>
-	</fileSets>
-	<dependencySets>
-		<dependencySet>
-			<outputDirectory>lib</outputDirectory>
-			<useProjectArtifact>true</useProjectArtifact>
-			<scope>runtime</scope>
-		</dependencySet>
-	</dependencySets>
-</assembly>
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncARModel.java b/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncARModel.java
deleted file mode 100644
index 48579318..00000000
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncARModel.java
+++ /dev/null
@@ -1,53 +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=========================================================
- */
-
-package org.openecomp.sdnc.uebclient;
-
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
-import org.openecomp.sdc.toscaparser.api.Metadata;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SdncARModel extends SdncBaseModel {
-	
-	private static final Logger LOG = LoggerFactory
-			.getLogger(SdncARModel.class);
-
-	public SdncARModel(ISdcCsarHelper sdcCsarHelper, NodeTemplate nodeTemplate) {
-
-		super(sdcCsarHelper, nodeTemplate);
-		
-		// extract metadata
-		Metadata metadata = nodeTemplate.getMetadata();
-		addParameter("type", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_TYPE));
-		
-		// extract properties
-		//addParameter("role", extractValue (sdcCsarHelper, nodeTemplate, SdcPropertyNames.PROPERTY_NAME_ROLE));
-		//addParameter("type", extractValue (nodeTemplate, SdcPropertyNames.PROPERTY_NAME_TYPE)); - wrong location, get from metadata
-		addParameter("ecomp_generated_naming", extractBooleanValue (nodeTemplate, SdcPropertyNames.PROPERTY_NAME_VFCNAMING_ECOMPGENERATEDNAMING));
-		addParameter("naming_policy", extractValue (nodeTemplate, SdcPropertyNames.PROPERTY_NAME_VFCNAMING_NAMINGPOLICY));
-		//addParameter("depending_service", extractValue (sdcCsarHelper, nodeTemplate, SdcPropertyNames.PROPERTY_NAME_DEPENDINGSERVICE));
-		//addParameter("service_dependency", extractValue (sdcCsarHelper, nodeTemplate, SdcPropertyNames.PROPERTY_NAME_SERVICEDEPENDENCY));
-	}
-
-}
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncArtifactMap.java b/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncArtifactMap.java
deleted file mode 100644
index 77c28c8f..00000000
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncArtifactMap.java
+++ /dev/null
@@ -1,134 +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=========================================================
- */
-
-package org.openecomp.sdnc.uebclient;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SdncArtifactMap {
-
-	private static final Logger LOG = LoggerFactory
-			.getLogger(SdncArtifactMap.class);
-
-	public class SdncArtifactType {
-		private String tag;
-		private String artifactType;
-		private String rpc;
-		private int pass;
-
-		public String getTag() {
-			return tag;
-		}
-		public String getArtifactType() {
-			return artifactType;
-		}
-		public String getRpc() {
-			return rpc;
-		}
-
-		public int getPass() {
-			return pass;
-		}
-
-        public String getRpcUrl(String base) {
-			return(base+rpc);
-        }
-
-		private SdncArtifactType(String tag, String rpc, String pass) {
-			this.tag = tag;
-			this.rpc = rpc;
-			try {
-				this.pass = Integer.parseInt(pass);
-			} catch (Exception e) {
-				LOG.error("Invalid pass value for artifact map entry ("+tag+","+rpc+","+pass+")");
-			}
-		}
-	}
-
-
-
-	private Map<String, SdncArtifactType> mapItems = new HashMap<String, SdncArtifactType>();
-
-	private int NumPasses = 1;
-
-	public int getNumPasses() {
-		return NumPasses;
-	}
-
-	public void load(String fileName) {
-
-		File mapFile = new File(fileName);
-
-		if (mapFile.exists() && mapFile.canRead()) {
-
-			BufferedReader rdr = null;
-			try {
-
-				rdr = new BufferedReader(new FileReader(mapFile));
-
-				for (String ln ; (ln = rdr.readLine()) != null ; ) {
-					String[] lnFields = ln.split(",");
-					if (lnFields.length == 3) {
-						SdncArtifactType entry = new SdncArtifactType(lnFields[0], lnFields[1], lnFields[2]);
-						mapItems.put(entry.getTag(), entry);
-						if (entry.getPass() + 1 > NumPasses ) {
-							NumPasses = entry.getPass() + 1;
-						}
-					}
-				}
-
-
-			} catch (Exception e) {
-				LOG.error("Caught exception reading artifact map", e);
-				return;
-			} finally {
-				if (rdr != null) {
-					try {
-						rdr.close();
-					} catch (IOException e) {
-
-					}
-				}
-			}
-		}
-	}
-
-	public SdncArtifactType getMapping(String tag) {
-		if (mapItems.containsKey(tag)) {
-			return(mapItems.get(tag));
-		} else {
-			return(null);
-		}
-	}
-
-	public static SdncArtifactMap getInstance() {
-		return new SdncArtifactMap();
-	}
-
-}
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncBaseModel.java b/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncBaseModel.java
deleted file mode 100644
index 927d8360..00000000
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncBaseModel.java
+++ /dev/null
@@ -1,297 +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=========================================================
- */
-
-package org.openecomp.sdnc.uebclient;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
-import org.openecomp.sdc.toscaparser.api.Group;
-import org.openecomp.sdc.toscaparser.api.Metadata;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SdncBaseModel {
-	
-	private static final Logger LOG = LoggerFactory
-			.getLogger(SdncBaseModel.class);
-	
-	protected String customizationUUID = null;
-	protected String invariantUUID = null;
-	protected String model_yaml = null;	
-	protected String version = null;	
-	
-	protected Map<String, String> params = null;
-	protected ISdcCsarHelper sdcCsarHelper = null;
-
-	public SdncBaseModel() {
-		
-	}
-	
-	public SdncBaseModel(ISdcCsarHelper sdcCsarHelper, Metadata metadata) {
-
-		params = new HashMap<String, String>();
-		this.sdcCsarHelper = sdcCsarHelper;
-		
-		// extract service metadata
-		invariantUUID = extractValue(metadata, SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID);
-		addParameter("invariant_uuid",invariantUUID);
-		addParameter("version",extractValue(metadata, SdcPropertyNames.PROPERTY_NAME_VERSION));
-		addParameter("name",extractValue(metadata, SdcPropertyNames.PROPERTY_NAME_NAME));
-		addParameter("description",extractValue(metadata, SdcPropertyNames.PROPERTY_NAME_DESCRIPTION));
-		addParameter("type",extractValue(metadata, SdcPropertyNames.PROPERTY_NAME_TYPE));
-		addParameter("category",extractValue(metadata, SdcPropertyNames.PROPERTY_NAME_CATEGORY));
-	}
-
-	public SdncBaseModel(ISdcCsarHelper sdcCsarHelper, NodeTemplate nodeTemplate) {
-
-		params = new HashMap<String, String>();
-		this.sdcCsarHelper = sdcCsarHelper;
-
-		// extract nodeTemplate metadata
-		Metadata metadata = nodeTemplate.getMetadata();
-		customizationUUID = extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID);
-		addParameter("invariant_uuid", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID));
-		addParameter("uuid", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_UUID));
-		addParameter("version", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_VERSION)); 
-	}
-
-	public SdncBaseModel(ISdcCsarHelper sdcCsarHelper, Group group) {
-
-		params = new HashMap<String, String>();
-		this.sdcCsarHelper = sdcCsarHelper;
-
-		// extract group metadata
-		Metadata metadata = group.getMetadata();
-		//customizationUUID = extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_VFMODULECUSTOMIZATIONUUID); - returning null
-		customizationUUID = extractValue (metadata, "vfModuleModelCustomizationUUID");
-		addParameter("invariant_uuid", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_VFMODULEMODELINVARIANTUUID));			
-		addParameter("uuid", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_VFMODULEMODELUUID));			
-		addParameter("version", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_VFMODULEMODELVERSION));			
-	}
-
-	protected void addParameter (String name, String value) {
-		if (value != null && !value.isEmpty()) {
-			params.put(name, "\"" + value + "\"");
-		}
-	}
-
-	protected void addIntParameter (String name, String value) {
-		if (value != null && !value.isEmpty()) {
-			params.put(name, value);
-		}
-	}
-	
-	public static void addIntParameter (String name, String value, Map<String, String> params) {
-		if (value != null && !value.isEmpty()) {
-			params.put(name, value);
-		}
-	}
-	
-	public static void addParameter (String name, String value, Map<String, String> params) {
-		if (value != null && !value.isEmpty()) {
-			params.put(name, "\"" + value + "\"");
-		}
-	}
-	
-	protected String extractValue (Metadata metadata, String name) {
-		String value = sdcCsarHelper.getMetadataPropertyValue(metadata, name);
-		if (value != null) {
-			return value;
-		} else {
-			return "";
-		}	
-	}
-
-	public static String extractValue (ISdcCsarHelper sdcCsarHelper, Metadata metadata, String name) {
-		String value = sdcCsarHelper.getMetadataPropertyValue(metadata, name);
-		if (value != null) {
-			return value;
-		} else {
-			return "";
-		}	
-	}
-
-	protected String extractValue (NodeTemplate nodeTemplate, String name) {
-		String value = sdcCsarHelper.getNodeTemplatePropertyLeafValue(nodeTemplate, name);
-		if (value != null) {
-			return value;
-		} else {
-			return "";
-		}
-	}
-
-	public static String extractValue (ISdcCsarHelper sdcCsarHelper, NodeTemplate nodeTemplate, String name) {
-		String value = sdcCsarHelper.getNodeTemplatePropertyLeafValue(nodeTemplate, name);
-		if (value != null) {
-			return value;
-		} else {
-			return "";
-		}
-	}
-
-	protected String extractBooleanValue (NodeTemplate nodeTemplate, String name) {
-		String value = sdcCsarHelper.getNodeTemplatePropertyLeafValue(nodeTemplate, name);
-		if (value != null && !value.isEmpty()) {
-			return value.contains("true") ? "Y" : "N";
-		} else {
-			return "";
-		}
-	}
-
-	public static String extractBooleanValue (ISdcCsarHelper sdcCsarHelper, NodeTemplate nodeTemplate, String name) {
-		String value = sdcCsarHelper.getNodeTemplatePropertyLeafValue(nodeTemplate, name);
-		if (value != null && !value.isEmpty()) {
-			return value.contains("true") ? "Y" : "N";
-		} else {
-			return "";
-		}
-	}
-
-	protected String extractValue (Group group, String name) {
-		String value = sdcCsarHelper.getGroupPropertyLeafValue(group, name);
-		if (value != null) {
-			return value;
-		} else {
-			return "";
-		}
-	}
-
-	protected String extractBooleanValue (Group group, String name) {
-		String value = sdcCsarHelper.getGroupPropertyLeafValue(group, name);
-		if (value != null && !value.isEmpty()) {
-			return value.contains("true") ? "Y" : "N";
-		} else {
-			return "";
-		}
-	}
-
-	protected String extractInputDefaultValue (String name) {
-		String value = sdcCsarHelper.getServiceInputLeafValueOfDefault(name);
-		if (value != null) {
-			return value;
-		} else {
-			return "";
-		}
-	}
-
-	protected String extractBooleanInputDefaultValue (String name) {
-		String value = sdcCsarHelper.getServiceInputLeafValueOfDefault(name);
-		if (value != null && !value.isEmpty()) {
-			return value.contains("true") ? "Y" : "N";
-		} else {
-			return "";
-		}
-	}
-
-	public static String extractInputDefaultValue (ISdcCsarHelper sdcCsarHelper, String name) {
-		String value = sdcCsarHelper.getServiceInputLeafValueOfDefault(name);
-		if (value != null) {
-			return value;
-		} else {
-			return "";
-		}
-	}
-
-	public static String extractBooleanInputDefaultValue (ISdcCsarHelper sdcCsarHelper, String name) {
-		String value = sdcCsarHelper.getServiceInputLeafValueOfDefault(name);
-		if (value != null && !value.isEmpty()) {
-			return value.contains("true") ? "Y" : "N";
-		} else {
-			return "";
-		}
-	}
-
-	public static String extractSubstitutionMappingTypeName (ISdcCsarHelper sdcCsarHelper) {
-		String value = sdcCsarHelper.getServiceSubstitutionMappingsTypeName();
-		if (value != null) {
-			return value;
-		} else {
-			return "";
-		}
-	}
-
-	public String getCustomizationUUID() {
-		return ("\"" + customizationUUID + "\"");
-	}
-	public String getCustomizationUUIDNoQuotes() {
-		return (customizationUUID);
-	}
-	public void setCustomizationUUID(String customizationUUID) {
-		this.customizationUUID = customizationUUID;
-	}
-	
-	public String getSql(String tableName, String model_yaml) {
-		
-		StringBuilder sb = new StringBuilder();
-		sb.append("INSERT into " + tableName + " (customization_uuid, model_yaml, ");
-		
-		int paramCount = 0;
-		for (String paramKey :  params.keySet()) {
-			paramCount++;
-		    sb.append(paramKey);
-		    if (paramCount < params.size()) sb.append(", ");
-		}
-		
-		sb.append(") values (" + getCustomizationUUID() + ", \"" + model_yaml + "\", ");
-
-		paramCount = 0;
-		for (String paramKey :  params.keySet()) {
-			paramCount++;
-			String paramValue = params.get(paramKey);
-		    sb.append(paramValue);
-		    if (paramCount < params.size()) sb.append(", ");
-		}
-
-		sb.append(");");
-		return sb.toString();
-	}
-	
-	public static String getSql(String tableName, String keyName, String keyValue, String model_yaml, Map<String, String> params) {
-		
-		StringBuilder sb = new StringBuilder();
-		sb.append("INSERT into " + tableName + " (" + keyName + ", ");
-		
-		int paramCount = 0;
-		for (String paramKey :  params.keySet()) {
-			paramCount++;
-		    sb.append(paramKey);
-		    if (paramCount < params.size()) sb.append(", ");
-		}
-		
-		sb.append(") values (" + keyValue + ", ");
-
-		paramCount = 0;
-		for (String paramKey :  params.keySet()) {
-			paramCount++;
-			String paramValue = params.get(paramKey);
-		    sb.append(paramValue);
-		    if (paramCount < params.size()) sb.append(", ");
-		}
-
-		sb.append(");");
-		return sb.toString();
-	}
-	
-}
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncNodeModel.java b/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncNodeModel.java
deleted file mode 100644
index 8aa5915f..00000000
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncNodeModel.java
+++ /dev/null
@@ -1,145 +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=========================================================
- */
-
-package org.openecomp.sdnc.uebclient;
-
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SdncNodeModel extends SdncBaseModel {
-	
-	private static final Logger LOG = LoggerFactory
-			.getLogger(SdncNodeModel.class);
-	
-	private String serviceUUID = null;
-	private String ecompGeneratedNaming = null;
-	private String [] bindingUuids = null; 
-	
-	// Using ASDC TOSCA Parser 17.07
-	public SdncNodeModel(ISdcCsarHelper sdcCsarHelper, NodeTemplate nodeTemplate) {
-		
-		super(sdcCsarHelper, nodeTemplate);
-
-		// extract inputs
-		String ecompGeneratedNaming = extractBooleanInputDefaultValue(SdcPropertyNames.PROPERTY_NAME_SERVICENAMING_DEFAULT_ECOMPGENERATEDNAMING);
-		addParameter("ecomp_generated_naming",ecompGeneratedNaming);
-		addParameter("naming_policy", extractInputDefaultValue(SdcPropertyNames.PROPERTY_NAME_SERVICENAMING_DEFAULT_NAMINGPOLICY));
-		
-		// extract properties
-		addParameter("network_type", extractValue (nodeTemplate, SdcPropertyNames.PROPERTY_NAME_NETWORKTYPE));
-		addParameter("network_role", extractValue (nodeTemplate, SdcPropertyNames.PROPERTY_NAME_NETWORKROLE));
-		addParameter("network_scope", extractValue (nodeTemplate, SdcPropertyNames.PROPERTY_NAME_NETWORKSCOPE));
-		addParameter("network_technology", extractValue (nodeTemplate, SdcPropertyNames.PROPERTY_NAME_NETWORKTECHNOLOGY));
-
-		// extract properties - network_assignments
-		addParameter("is_shared_network", extractBooleanValue (nodeTemplate, SdcPropertyNames.PROPERTY_NAME_NETWORKASSIGNMENTS_ISSHAREDNETWORK));
-		addParameter("is_external_network", extractBooleanValue (nodeTemplate, SdcPropertyNames.PROPERTY_NAME_NETWORKASSIGNMENTS_ISEXTERNALNETWORK));
-
-		// extract properties - network_assignments - ipv4_subnet_default_assignment
-		String useIpv4 = extractBooleanValue(nodeTemplate, "network_assignments#ipv4_subnet_default_assignment#use_ipv4");
-		addParameter("use_ipv4", useIpv4);
-		addParameter("ipv4_dhcp_enabled", extractBooleanValue(nodeTemplate, "network_assignments#ipv4_subnet_default_assignment#dhcp_enabled"));
-		if (useIpv4.contains("Y")) {
-			addParameter("ipv4_ip_version", "ipv4");
-		}
-		addParameter("ipv4_cidr_mask", extractValue(nodeTemplate, "network_assignments#ipv4_subnet_default_assignment#cidr_mask"));
-		addParameter("eipam_v4_address_plan", extractValue(nodeTemplate, "network_assignments#ipv4_subnet_default_assignment#ip_network_address_plan"));
-		
-		// extract properties - network_assignments - ipv6_subnet_default_assignment
-		String useIpv6 = extractBooleanValue(nodeTemplate, "network_assignments#ipv6_subnet_default_assignment#use_ipv6");
-		addParameter("use_ipv6", useIpv6);
-		addParameter("ipv6_dhcp_enabled", extractBooleanValue(nodeTemplate, "network_assignments#ipv6_subnet_default_assignment#dhcp_enabled"));
-		if (useIpv6.contains("Y")) {
-			addParameter("ipv6_ip_version", "ipv6");
-		}
-		addParameter("ipv6_cidr_mask", extractValue(nodeTemplate, "network_assignments#ipv6_subnet_default_assignment#cidr_mask"));
-		addParameter("eipam_v6_address_plan", extractValue(nodeTemplate, "network_assignments#ipv6_subnet_default_assignment#ip_network_address_plan"));
-		
-		// extract properties - provider_network
-		addParameter("is_provider_network", extractBooleanValue (nodeTemplate, SdcPropertyNames.PROPERTY_NAME_PROVIDERNETWORK_ISPROVIDERNETWORK));
-		addParameter("physical_network_name", extractValue(nodeTemplate, SdcPropertyNames.PROPERTY_NAME_PROVIDERNETWORK_PHYSICALNETWORKNAME));
-
-		// extract properties - network_flows
-		addParameter("is_bound_to_vpn", extractBooleanValue (nodeTemplate, SdcPropertyNames.PROPERTY_NAME_NETWORKFLOWS_ISBOUNDTOVPN));
-
-		// extract properties - network_flows - vpn_bindings
-		String vpnBindingString = extractValue (nodeTemplate, SdcPropertyNames.PROPERTY_NAME_NETWORKFLOWS_VPNBINDING);
-		bindingUuids = vpnBindingString.split(",");
-
-}
-
-	public String getServiceUUID() {
-		return serviceUUID;
-	}
-	public void setServiceUUID(String serviceUUID) {
-		this.serviceUUID = serviceUUID;
-	}
-
-	public String getEcompGeneratedNaming() {
-		return ecompGeneratedNaming;
-	}
-	public void setEcompGeneratedNaming(String ecompGeneratedNaming) {
-		this.ecompGeneratedNaming = ecompGeneratedNaming;
-		if (ecompGeneratedNaming != null && !ecompGeneratedNaming.isEmpty()) {
-			params.put("ecomp_generated_naming", "\"" + ecompGeneratedNaming + "\"");			
-		}
-	}
-
-	public String getSql(String model_yaml) {
-		
-		StringBuilder sb = new StringBuilder();
-		sb.append("INSERT into NETWORK_MODEL (service_uuid, customization_uuid, model_yaml, ");
-		
-		int paramCount = 0;
-		for (String paramKey :  params.keySet()) {
-			paramCount++;
-		    sb.append(paramKey);
-		    if (paramCount < params.size()) sb.append(", ");
-		}
-		
-		sb.append(") values (" + serviceUUID + ", " + getCustomizationUUID() + ", \"" + model_yaml + "\", ");
-
-		paramCount = 0;
-		for (String paramKey :  params.keySet()) {
-			paramCount++;
-			String paramValue = params.get(paramKey);
-		    sb.append(paramValue);
-		    if (paramCount < params.size()) sb.append(", ");
-		}
-
-		sb.append(");");
-		return sb.toString();
-	}
-
-	public String getVpnBindingsSql() {
-		
-		StringBuilder sb = new StringBuilder();
-		for (int i=0; i < bindingUuids.length; i++) {
-			sb.append("INSERT into VPN_BINDINGS (network_customization_uuid, binding_uuid) values (" + getCustomizationUUID() + ", \"" + bindingUuids[i] + "\"); ");
-		}
-
-		return sb.toString();
-	}
-	
-}
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncOdlConnection.java b/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncOdlConnection.java
deleted file mode 100644
index f0c9ba25..00000000
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncOdlConnection.java
+++ /dev/null
@@ -1,159 +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=========================================================
- */
-
-package org.openecomp.sdnc.uebclient;
-
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.Authenticator;
-import java.net.HttpURLConnection;
-import java.net.PasswordAuthentication;
-import java.net.ProtocolException;
-import java.net.URL;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLSession;
-
-import org.apache.commons.codec.binary.Base64;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class SdncOdlConnection {
-	
-	private static final Logger LOG = LoggerFactory
-			.getLogger(SdncOdlConnection.class);
-	
-	private HttpURLConnection httpConn = null;
-	
-	private String url = null;
-	private String user = null;
-	private String password = null;
-	
-	private class SdncAuthenticator extends Authenticator {
-		
-		private String user;
-		private String passwd;
-
-		SdncAuthenticator(String user, String passwd) {
-			this.user = user;
-			this.passwd = passwd;
-		}
-		@Override
-		protected PasswordAuthentication getPasswordAuthentication() {
-			return new PasswordAuthentication(user, passwd.toCharArray());
-		}
-		
-	}
-	
-	private SdncOdlConnection() {
-		
-	}
-	
-	private SdncOdlConnection(String url, String user, String password) {
-		this.url = url;
-		this.user = user;
-		this.password = password;
-		
-		try {
-			URL sdncUrl = new URL(url);
-			Authenticator.setDefault(new SdncAuthenticator(user, password));
-		
-			this.httpConn = (HttpURLConnection) sdncUrl.openConnection();
-		} catch (Exception e) {
-			LOG.error("Unable to create http connection", e);
-		}
-	}
-	
-	public static  SdncOdlConnection newInstance(String url, String user, String password) throws IOException
-	{
-		return (new SdncOdlConnection(url, user, password));
-	}
-		
-
-	
-	public String send(String method, String contentType, String msg) throws IOException {
-
-		LOG.info("Sending REST " + method + " to " + url);
-		LOG.info("Message body:\n" + msg);
-		String authStr = user + ":" + password;
-		String encodedAuthStr = new String(Base64.encodeBase64(authStr.getBytes()));
-
-		httpConn.addRequestProperty("Authentication", "Basic " + encodedAuthStr);
-
-		httpConn.setRequestMethod(method);
-		httpConn.setRequestProperty("Content-Type", contentType);
-		httpConn.setRequestProperty("Accept", contentType);
-
-		httpConn.setDoInput(true);
-		httpConn.setDoOutput(true);
-		httpConn.setUseCaches(false);
-
-		if (httpConn instanceof HttpsURLConnection) {
-			HostnameVerifier hostnameVerifier = new HostnameVerifier() {
-				@Override
-				public boolean verify(String hostname, SSLSession session) {
-					return true;
-				}
-			};
-			((HttpsURLConnection) httpConn).setHostnameVerifier(hostnameVerifier);
-		}
-
-		// Write message
-		httpConn.setRequestProperty("Content-Length", "" + msg.length());
-		DataOutputStream outStr = new DataOutputStream(httpConn.getOutputStream());
-		outStr.write(msg.getBytes());
-		outStr.close();
-
-		// Read response
-		BufferedReader respRdr;
-
-		LOG.info("Response: " + httpConn.getResponseCode() + " " + httpConn.getResponseMessage());
-
-		if (httpConn.getResponseCode() < 300) {
-
-			respRdr = new BufferedReader(new InputStreamReader(httpConn.getInputStream()));
-		} else {
-			respRdr = new BufferedReader(new InputStreamReader(httpConn.getErrorStream()));
-		}
-
-		StringBuffer respBuff = new StringBuffer();
-
-		String respLn;
-
-		while ((respLn = respRdr.readLine()) != null) {
-			respBuff.append(respLn + "\n");
-		}
-		respRdr.close();
-
-		String respString = respBuff.toString();
-
-		LOG.info("Response body :\n" + respString);
-
-		return (respString);
-
-	}
-		
-
-}
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncServiceModel.java b/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncServiceModel.java
deleted file mode 100644
index 8d73083b..00000000
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncServiceModel.java
+++ /dev/null
@@ -1,98 +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=========================================================
- */
-
-package org.openecomp.sdnc.uebclient;
-
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
-import org.openecomp.sdc.toscaparser.api.Metadata;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SdncServiceModel extends SdncBaseModel {
-	
-	private static final Logger LOG = LoggerFactory
-			.getLogger(SdncServiceModel.class);
-	
-	private String UUID = null;
-	private String serviceInstanceNamePrefix = null;
-	private String filename = null;
-	
-	public SdncServiceModel(ISdcCsarHelper sdcCsarHelper, Metadata metadata) {
-		
-		super(sdcCsarHelper, metadata);
-	
-		UUID = extractValue(metadata, SdcPropertyNames.PROPERTY_NAME_UUID);
-		
-		// extract service topology template input data 
-		addParameter("ecomp_naming",extractBooleanInputDefaultValue(SdcPropertyNames.PROPERTY_NAME_SERVICENAMING_DEFAULT_ECOMPGENERATEDNAMING));
-		addParameter("naming_policy",extractInputDefaultValue(SdcPropertyNames.PROPERTY_NAME_SERVICENAMING_DEFAULT_NAMINGPOLICY));
-	}
-
-	public String getServiceUUID() {
-		return ("\"" + UUID + "\"");
-	}
-	public void setServiceUUID(String serviceUUID) {
-		this.UUID = serviceUUID;
-	}
-	public String getServiceInstanceNamePrefix() {
-		return serviceInstanceNamePrefix;
-	}
-	public void setServiceInstanceNamePrefix(String serviceInstanceNamePrefix) {
-		if (serviceInstanceNamePrefix != null && !serviceInstanceNamePrefix.isEmpty()) {
-			this.serviceInstanceNamePrefix = serviceInstanceNamePrefix;
-			params.put("service_instance_name_prefix", "\"" + serviceInstanceNamePrefix + "\"");
-		}
-	}
-	public String getFilename() {
-		return filename;
-	}
-	public void setFilename(String filename) {
-		this.filename = filename;
-	}
-	
-	public String getSql(String model_yaml) {
-		
-		StringBuilder sb = new StringBuilder();
-		sb.append("INSERT into SERVICE_MODEL (service_uuid, model_yaml, filename, ");
-		
-		int paramCount = 0;
-		for (String paramKey :  params.keySet()) {
-			paramCount++;
-		    sb.append(paramKey);
-		    if (paramCount < params.size()) sb.append(", ");
-		}
-		
-		sb.append(") values (" + getServiceUUID() + ", \"" + model_yaml + "\", \"" + filename + "\", ");
-
-		paramCount = 0;
-		for (String paramKey :  params.keySet()) {
-			paramCount++;
-			String paramValue = params.get(paramKey);
-		    sb.append(paramValue);
-		    if (paramCount < params.size()) sb.append(", ");
-		}
-
-		sb.append(");");
-		return sb.toString();
-	}
-	
-}
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncUebCallback.java b/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncUebCallback.java
deleted file mode 100644
index d04704aa..00000000
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncUebCallback.java
+++ /dev/null
@@ -1,1134 +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=========================================================
- */
-
-package org.openecomp.sdnc.uebclient;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.Authenticator;
-import java.net.HttpURLConnection;
-import java.net.PasswordAuthentication;
-import java.net.URL;
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLSession;
-import javax.sql.rowset.CachedRowSet;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathFactory;
-
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.lang3.tuple.Pair;
-import org.openecomp.sdc.api.IDistributionClient;
-import org.openecomp.sdc.api.consumer.IDistributionStatusMessage;
-import org.openecomp.sdc.api.consumer.INotificationCallback;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.INotificationData;
-import org.openecomp.sdc.api.notification.IResourceInstance;
-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
-import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory;
-import org.openecomp.sdc.toscaparser.api.Group;
-import org.openecomp.sdc.toscaparser.api.Metadata;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
-import org.openecomp.sdc.utils.ArtifactTypeEnum;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
-import org.openecomp.sdc.utils.DistributionStatusEnum;
-import org.openecomp.sdnc.sli.resource.dblib.DBResourceManager;
-import org.openecomp.sdnc.uebclient.SdncArtifactMap.SdncArtifactType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.constructor.Constructor;
-
-public class SdncUebCallback implements INotificationCallback {
-
-    private static final Logger LOG = LoggerFactory
-            .getLogger(SdncUebCallback.class);
-
-	private static DBResourceManager jdbcDataSource = null;
-	private static final String SDNC_CONFIG_DIR = "SDNC_CONFIG_DIR";
-
-
-    private class SdncAuthenticator extends Authenticator {
-
-        private final String user;
-        private final String passwd;
-
-        SdncAuthenticator(String user, String passwd) {
-            this.user = user;
-            this.passwd = passwd;
-        }
-        @Override
-        protected PasswordAuthentication getPasswordAuthentication() {
-            return new PasswordAuthentication(user, passwd.toCharArray());
-        }
-
-    }
-
-    private class DeployableArtifact {
-        SdncArtifactType type;
-        IArtifactInfo artifactInfo;
-        String svcName;
-        String resourceName;
-        String artifactName;
-        String artifactVersion;
-        File file;
-
-        public String getArtifactName() {
-            return artifactName;
-        }
-
-
-
-        public String getArtifactVersion() {
-            return artifactVersion;
-        }
-
-
-        public SdncArtifactType getType() {
-            return type;
-        }
-
-
-
-        public IArtifactInfo getArtifactInfo() {
-            return artifactInfo;
-        }
-
-
-        public File getFile() {
-            return file;
-        }
-
-
-
-
-        public DeployableArtifact(SdncArtifactType type, String svcName, String resourceName, IArtifactInfo artifactInfo, File file) {
-            this.type = type;
-            this.artifactInfo = artifactInfo;
-			this.svcName = svcName;
-			this.resourceName = resourceName;
-            this.artifactName = artifactInfo.getArtifactName();
-            this.artifactVersion = artifactInfo.getArtifactVersion();
-            this.file = file;
-        }
-
-
-        public DeployableArtifact(SdncArtifactType type, String svcName, String resourceName, String artifactName, String artifactVersion, File file) {
-            this.type = type;
-            this.artifactInfo = null;
-			this.svcName = svcName;
-			this.resourceName = resourceName;
-            this.artifactName = artifactName;
-            this.artifactVersion = artifactVersion;
-            this.file = file;
-        }
-
-
-
-        public String getSvcName() {
-            return svcName;
-        }
-
-
-
-        public String getResourceName() {
-            return resourceName;
-        }
-
-    }
-
-    private final IDistributionClient client;
-    private final SdncUebConfiguration config;
-
-    private LinkedList<DeployableArtifact> deployList[];
-
-	private static void setJdbcDataSource() throws IOException {
-
-		String propPath = null;
-		String propDir = System.getenv(SDNC_CONFIG_DIR);
-		if (propDir == null) {
-
-			propDir = "/opt/sdnc/data/properties";
-		}
-		propPath = propDir + "/dblib.properties";
-		File propFile = new File(propPath);
-
-		if (!propFile.exists()) {
-
-			throw new FileNotFoundException(
-					"Missing configuration properties file : "
-							+ propFile);
-		}
-
-		Properties props = new Properties();
-		props.load(new FileInputStream(propFile));
-
-		try {
-			jdbcDataSource = DBResourceManager.create(props);
-		} catch(Throwable exc) {
-			LOG.error("", exc);
-		}
-
-		if(((DBResourceManager)jdbcDataSource).isActive()){
-			LOG.warn( "DBLIB: JDBC DataSource has been initialized.");
-		} else {
-			LOG.warn( "DBLIB: JDBC DataSource did not initialize successfully.");
-		}
-	}
-
-	private static void loadArtifactMap() {
-
-	}
-
-    public SdncUebCallback(IDistributionClient client, SdncUebConfiguration config) {
-        this.client = client;
-        this.config = config;
-
-    }
-
-    @Override
-	public void activateCallback(INotificationData data) {
-
-        LOG.info("Received notification : ("+data.getDistributionID()+","+data.getServiceName()+","+data.getServiceVersion()+
-				","+data.getServiceDescription() +  ")");
-
-        String incomingDirName = config.getIncomingDir();
-        String archiveDirName = config.getArchiveDir();
-
-        File incomingDir = null;
-        File archiveDir = null;
-
-        if (!incomingDir.exists()) {
-            incomingDir.mkdirs();
-        }
-
-
-        if (!archiveDir.exists()) {
-            archiveDir.mkdirs();
-        }
-
-        // Process service level artifacts
-        List<IArtifactInfo> artifactList = data.getServiceArtifacts();
-
-        if (artifactList != null) {
-
-            incomingDir = new File(incomingDirName + "/" + escapeFilename(data.getServiceName()));
-            if (!incomingDir.exists()) {
-                incomingDir.mkdirs();
-            }
-
-            archiveDir = new File(archiveDirName + "/" + escapeFilename(data.getServiceName()));
-            if (!archiveDir.exists()) {
-                archiveDir.mkdirs();
-            }
-            for (IArtifactInfo curArtifact : artifactList)
-            {
-
-                LOG.info("Received artifact " + curArtifact.getArtifactName());
-
-				handleArtifact(data, data.getServiceName(), null, null, curArtifact, incomingDir, archiveDir);
-            }
-        }
-
-
-        // Process resource level artifacts
-        for (IResourceInstance curResource : data.getResources()) {
-
-            LOG.info("Received resource : "+curResource.getResourceName());
-            artifactList = curResource.getArtifacts();
-
-            if (artifactList != null) {
-
-                incomingDir = new File(incomingDirName + "/" + escapeFilename(data.getServiceName()) + "/" + escapeFilename(curResource.getResourceName()));
-                if (!incomingDir.exists()) {
-                    incomingDir.mkdirs();
-                }
-
-                archiveDir = new File(archiveDirName + "/" + escapeFilename(data.getServiceName()) + "/" + escapeFilename(curResource.getResourceName()));
-                if (!archiveDir.exists()) {
-                    archiveDir.mkdirs();
-                }
-                for (IArtifactInfo curArtifact : artifactList)
-                {
-
-                    LOG.info("Received artifact " + curArtifact.getArtifactName());
-
-					handleArtifact(data, data.getServiceName(), curResource.getResourceName(), curResource.getResourceType(), curArtifact, incomingDir, archiveDir);
-                }
-            }
-        }
-
-        deployDownloadedFiles(incomingDir, archiveDir, data);
-
-
-    }
-
-
-    public void deployDownloadedFiles(File incomingDir, File archiveDir, INotificationData data) {
-
-        if (incomingDir == null) {
-            incomingDir = new File(config.getIncomingDir());
-
-            if (!incomingDir.exists()) {
-                incomingDir.mkdirs();
-            }
-
-        }
-
-        if (archiveDir == null) {
-            archiveDir = new File(config.getArchiveDir());
-
-            if (!archiveDir.exists()) {
-                archiveDir.mkdirs();
-            }
-        }
-
-        String curFileName = "";
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream(incomingDir.toPath())) {
-            for (Path file: stream) {
-                curFileName = file.toString();
-                handleSuccessfulDownload(null,null, null, null, file.toFile(), archiveDir);
-            }
-        } catch (Exception x) {
-            // IOException can never be thrown by the iteration.
-            // In this snippet, it can only be thrown by newDirectoryStream.
-            LOG.warn("Cannot process spool file "+ curFileName, x);
-        }
-
-        // Deploy scheduled deployments
-        int numPasses = config.getMaxPasses();
-
-        deployList = new LinkedList[numPasses];
-
-        for (int i = 0 ; i < numPasses ; i++) {
-			deployList[i] = new LinkedList<DeployableArtifact>();
-        }
-        for (int pass = 0 ; pass < config.getMaxPasses() ; pass++) {
-
-            if (deployList[pass] != null) {
-                while (! deployList[pass].isEmpty()) {
-                    DeployableArtifact artifact = deployList[pass].pop();
-
-                    DistributionStatusEnum deployResult = DistributionStatusEnum.DEPLOY_ERROR;
-
-
-                    try {
-
-                        deployResult = deploySpoolFile(artifact);
-                    } catch (Exception e) {
-                        LOG.error("Caught exception trying to deploy file", e);
-                    }
-
-
-                    IArtifactInfo artifactInfo = artifact.getArtifactInfo();
-
-					if ((artifactInfo != null) && (data != null)) {
-                        IDistributionClientResult deploymentStatus;
-                            deploymentStatus = client.sendDeploymentStatus(buildStatusMessage(
-                                    client, data, artifactInfo,
-                                    deployResult));
-                    }
-
-                }
-            }
-        }
-    }
-
-	private void handleArtifact(INotificationData data, String svcName, String resourceName, String resourceType, IArtifactInfo artifact, File incomingDir, File archiveDir) {
-
-        // Download Artifact
-        IDistributionClientDownloadResult downloadResult = client
-                .download(artifact);
-
-		if (downloadResult == null) {
-
-			handleFailedDownload(data, artifact);
-			return;
-		}
-
-		byte[] payloadBytes = downloadResult.getArtifactPayload();
-
-		if (payloadBytes == null) {
-			handleFailedDownload(data, artifact);
-			return;
-		}
-
-		String payload = new String(payloadBytes);
-
-
-        File spoolFile = new File(incomingDir.getAbsolutePath() + "/" + artifact.getArtifactName());
-
-        boolean writeSucceeded = false;
-
-        try {
-            FileWriter spoolFileWriter = new FileWriter(spoolFile);
-            spoolFileWriter.write(payload);
-            spoolFileWriter.close();
-            writeSucceeded = true;
-        } catch (Exception e) {
-            LOG.error("Unable to save downloaded file to spool directory ("+ incomingDir.getAbsolutePath() +")", e);
-        }
-
-
-		if (writeSucceeded && (downloadResult.getDistributionActionResult() == DistributionActionResultEnum.SUCCESS)) {
-            handleSuccessfulDownload(data, svcName, resourceName, artifact, spoolFile, archiveDir);
-
-
-        } else {
-            handleFailedDownload(data, artifact);
-        }
-
-    }
-
-    private void handleFailedDownload(INotificationData data,
-            IArtifactInfo relevantArtifact) {
-        // Send Download Status
-        IDistributionClientResult sendDownloadStatus = client
-                .sendDownloadStatus(buildStatusMessage(client, data,
-                        relevantArtifact, DistributionStatusEnum.DOWNLOAD_ERROR));
-    }
-
-    private void handleSuccessfulDownload(INotificationData data, String svcName, String resourceName,
-            IArtifactInfo artifact, File spoolFile, File archiveDir) {
-
-		if ((data != null) && (artifact != null)) {
-            // Send Download Status
-            IDistributionClientResult sendDownloadStatus = client
-                    .sendDownloadStatus(buildStatusMessage(client, data, artifact, DistributionStatusEnum.DOWNLOAD_OK));
-        }
-
-        // If an override file exists, read that instead of the file we just downloaded
-        ArtifactTypeEnum artifactEnum = ArtifactTypeEnum.YANG_XML;
-
-		boolean toscaYamlType = false;
-        if (artifact != null) {
-			String artifactTypeString = artifact.getArtifactType();
-			if (artifactTypeString.contains("TOSCA_TEMPLATE")) {
-				toscaYamlType = true;
-			}
-		} else {
-			if (spoolFile.toString().contains(".yml") || spoolFile.toString().contains(".csar")) {
-				toscaYamlType = true;
-			}
-        }
-        String overrideFileName = config.getOverrideFile();
-		if ((overrideFileName != null) && (overrideFileName.length() > 0)) {
-            File overrideFile = new File(overrideFileName);
-
-            if (overrideFile.exists()) {
-                artifactEnum = ArtifactTypeEnum.YANG_XML;
-                spoolFile = overrideFile;
-            }
-
-        }
-
-		if (toscaYamlType == true) {
-			processToscaYaml (data, svcName, resourceName, artifact, spoolFile, archiveDir);
-
-			try {
-				Path source = spoolFile.toPath();
-				Path targetDir = archiveDir.toPath();
-
-				Files.move(source, targetDir.resolve(source.getFileName()), StandardCopyOption.REPLACE_EXISTING);
-			} catch (IOException e) {
-				LOG.warn("Could not move "+spoolFile.getAbsolutePath()+" to "+archiveDir.getAbsolutePath(), e);
-			}
-
-			return;
-		}
-
-        // Process spool file
-        Document spoolDoc = null;
-        File transformedFile = null;
-
-        // Apply XSLTs and get Doc object
-        try {
-			if (!spoolFile.isDirectory()) {
-            transformedFile = applyXslts(spoolFile);
-			}
-        } catch (Exception e) {
-            LOG.error("Caught exception trying to parse XML file", e);
-        }
-
-        if (transformedFile != null) {
-            try {
-
-                try {
-
-                    DocumentBuilderFactory dbf = DocumentBuilderFactory
-                            .newInstance();
-                    DocumentBuilder db = dbf.newDocumentBuilder();
-
-                    spoolDoc = db.parse(transformedFile);
-                } catch (Exception e) {
-                    LOG.error(
-                            "Caught exception trying to parse transformed XML file "
-                                    + transformedFile.getAbsolutePath(), e);
-                }
-
-            } catch (Exception e) {
-                LOG.error("Caught exception trying to deploy file", e);
-            }
-        }
-
-
-        if (spoolDoc != null) {
-            // Analyze file type
-            SdncArtifactType artifactType = analyzeFileType(artifactEnum,
-                    spoolFile, spoolDoc);
-
-            if (artifactType != null) {
-
-                scheduleDeployment(artifactType, svcName, resourceName, artifact, spoolFile.getName(), transformedFile);
-
-            }
-
-            // SDNGC-2660 : Move file to archive directory even if it is an unrecognized type so that
-            // we do not keep trying and failing to process it.
-            try {
-                Path source = spoolFile.toPath();
-                Path targetDir = archiveDir.toPath();
-
-                Files.move(source, targetDir.resolve(source.getFileName()), StandardCopyOption.REPLACE_EXISTING);
-            } catch (IOException e) {
-                LOG.warn("Could not move "+spoolFile.getAbsolutePath()+" to "+archiveDir.getAbsolutePath(), e);
-            }
-        }
-
-
-    }
-
-
-	private void processToscaYaml(INotificationData data, String svcName, String resourceName,
-			IArtifactInfo artifact, File spoolFile, File archiveDir) {
-		
-		// Use ASDC Dist Client 1.1.5 with TOSCA parsing APIs to extract relevant TOSCA model data
-		
-		// TOSCA data extraction flow 1707:
-		// Use ASDC dist-client to get yaml string - not yet available
-		String model_yaml = null;
-		LOG.info("Process TOSCA YAML file: "+spoolFile.toString());
-		
-		SdcToscaParserFactory factory = SdcToscaParserFactory.getInstance();
-		ISdcCsarHelper sdcCsarHelper = null;
-		try {
-			sdcCsarHelper = factory.getSdcCsarHelper(spoolFile.getAbsolutePath());
-		} catch (SdcToscaParserException e) {
-			LOG.error("Could not create SDC TOSCA Parser ", e);
-			factory.close();
-			return;
-		}
-
-		// Ingest Service Data - 1707
-		Metadata serviceMetadata = sdcCsarHelper.getServiceMetadata();
-		SdncServiceModel serviceModel = new SdncServiceModel(sdcCsarHelper, serviceMetadata);
-		serviceModel.setFilename(spoolFile.toString().substring(spoolFile.toString().lastIndexOf("/")+1));  // will be csar file name
-		serviceModel.setServiceInstanceNamePrefix(SdncBaseModel.extractSubstitutionMappingTypeName(sdcCsarHelper).substring(SdncBaseModel.extractSubstitutionMappingTypeName(sdcCsarHelper).lastIndexOf(".")+1));
-
-		try {
-			cleanUpExistingToscaServiceData(serviceModel.getServiceUUID());
-			LOG.info("Call insertToscaData for SERVICE_MODEL serviceUUID = " + serviceModel.getServiceUUID());
-			insertToscaData(serviceModel.getSql(model_yaml));
-		} catch (IOException e) {
-			LOG.error("Could not insert Tosca YAML data into the SERVICE_MODEL table ", e);
-			factory.close();
-			return;
-		}	
-
-		// Ingest Network (VL) Data - 1707
-		//List<NodeTemplate> vlNodeTemplatesList = sdcCsarHelper.getServiceNodeTemplatesByType("VL");
-		List<NodeTemplate> vlNodeTemplatesList = sdcCsarHelper.getServiceVlList();
-
-		for (NodeTemplate nodeTemplate :  vlNodeTemplatesList) {
-			SdncNodeModel nodeModel = new SdncNodeModel (sdcCsarHelper, nodeTemplate);
-			nodeModel.setServiceUUID(serviceModel.getServiceUUID());
-			nodeModel.setEcompGeneratedNaming(SdncBaseModel.extractBooleanInputDefaultValue(sdcCsarHelper, SdcPropertyNames.PROPERTY_NAME_SERVICENAMING_DEFAULT_ECOMPGENERATEDNAMING));//service_naming#default#ecomp_generated_naming
-			
-			try {
-				cleanUpExistingToscaData("NETWORK_MODEL", "customization_uuid", nodeModel.getCustomizationUUID());
-				cleanUpExistingToscaData("VPN_BINDINGS", "network_customization_uuid", nodeModel.getCustomizationUUID());
-				LOG.info("Call insertToscaData for NETWORK_MODEL customizationUUID = " + nodeModel.getCustomizationUUID());
-				// using ASDC dist-client use method for get yaml string
-				insertToscaData(nodeModel.getSql(model_yaml));
-				insertToscaData(nodeModel.getVpnBindingsSql());
-			} catch (IOException e) {
-				LOG.error("Could not insert Tosca YAML data into the NETWORK_MODEL table ", e);
-			}
-		}
-		
-		// Ingest Allotted Resource Data - 1707
-		List<NodeTemplate> arNodeTemplatesList = sdcCsarHelper.getAllottedResources();
-
-		for (NodeTemplate nodeTemplate :  arNodeTemplatesList) {
-			SdncARModel nodeModel = new SdncARModel (sdcCsarHelper, nodeTemplate);
-			
-			try {
-				cleanUpExistingToscaData("ALLOTTED_RESOURCE_MODEL", "customization_uuid", nodeModel.getCustomizationUUID());
-				LOG.info("Call insertToscaData for ALLOTTED_RESOURCE_MODEL customizationUUID = " + nodeModel.getCustomizationUUID());
-				// using ASDC dist-client use method for get yaml string
-				insertToscaData(nodeModel.getSql("ALLOTTED_RESOURCE_MODEL", model_yaml));
-			} catch (IOException e) {
-				LOG.error("Could not insert Tosca YAML data into the NETWORK_MODEL table ", e);
-			}
-		}
-		
-		// Ingest Network (VF) Data - 1707
-		//List<NodeTemplate> nodeTemplatesList = sdcCsarHelper.getServiceNodeTemplatesByType("VF");
-		List<NodeTemplate> vfNodeTemplatesList = sdcCsarHelper.getServiceVfList();
-
-		for (NodeTemplate nodeTemplate :  vfNodeTemplatesList) {
-			SdncVFModel vfNodeModel = new SdncVFModel (sdcCsarHelper, nodeTemplate);
-			
-			try {
-				cleanUpExistingToscaData("VF_MODEL", "customization_uuid", vfNodeModel.getCustomizationUUID()) ;
-				LOG.info("Call insertToscaData for VF_MODEL customizationUUID = " + vfNodeModel.getCustomizationUUID());
-				insertToscaData(vfNodeModel.getSql("VF_MODEL", model_yaml));
-			} catch (IOException e) {
-				LOG.error("Could not insert Tosca YAML data into the VF_MODEL table ", e);
-			}
-			
-			// For each VF, insert VF_MODULE_MODEL data
-			List<Group> vfModules = sdcCsarHelper.getVfModulesByVf(vfNodeModel.getCustomizationUUIDNoQuotes());
-			for (Group group : vfModules){
-				SdncVFModuleModel vfModuleModel = new SdncVFModuleModel(sdcCsarHelper, group);
-			
-				try {
-					cleanUpExistingToscaData("VF_MODULE_MODEL", "customization_uuid", vfModuleModel.getCustomizationUUID());
-					LOG.info("Call insertToscaData for VF_MODULE_MODEL customizationUUID = " + vfModuleModel.getCustomizationUUID());
-					insertToscaData(vfModuleModel.getSql("VF_MODULE_MODEL", model_yaml));
-				} catch (IOException e) {
-					LOG.error("Could not insert Tosca YAML data into the VF_MODULE_MODEL table ", e);
-				}
-			
-				// For each VF Module, get the VFC list, insert VF_MODULE_TO_VFC_MAPPING data
-				// List<NodeTemplate> groupMembers = sdcCsarHelper.getMembersOfGroup(group); - old version
-				// For each vfcNode (group member) in the groupMembers list, extract vm_type and vm_count.  
-				// Insert vf_module.customizationUUID, vfcNode.customizationUUID and vm_type and vm_count into VF_MODULE_TO_VFC_MAPPING
-				List<NodeTemplate> groupMembers = sdcCsarHelper.getMembersOfVfModule(nodeTemplate, group); // not yet available
-				for (NodeTemplate vfcNode : groupMembers){
-					SdncVFCModel vfcModel = new SdncVFCModel(sdcCsarHelper, vfcNode);
-				
-					try {
-						cleanUpExistingToscaData("VF_MODULE_TO_VFC_MAPPING", "vf_module_customization_uuid", vfModuleModel.getCustomizationUUID());
-						LOG.info("Call insertToscaData for VF_MODULE_TO_VFC_MAPPING customizationUUID = " + vfModuleModel.getCustomizationUUID());
-						insertToscaData("insert into VF_MODULE_TO_VFC_MAPPING (vf_module_customization_uuid, vfc_customization_uuid, vm_type, vm_count) values (" + 
-								vfModuleModel.getCustomizationUUID() + ", " + vfcModel.getCustomizationUUID() + ", \"" + vfcModel.getVmType() + "\", \"" + vfcModel.getVmCount() + "\")");
-					} catch (IOException e) {
-						LOG.error("Could not insert Tosca YAML data into the VF_MODULE_TO_VFC_MAPPING table ", e);
-					}
-
-				}
-
-			}
-			
-			// For each VF, insert VFC_MODEL data
-			List<NodeTemplate> vfcNodes = sdcCsarHelper.getVfcListByVf(vfNodeModel.getCustomizationUUIDNoQuotes());
-			for (NodeTemplate vfcNode : vfcNodes){
-				SdncVFCModel vfcModel = new SdncVFCModel(sdcCsarHelper, vfcNode);
-			
-				try {
-					cleanUpExistingToscaData("VFC_MODEL", "customization_uuid", vfcModel.getCustomizationUUID());
-					LOG.info("Call insertToscaData for VFC_MODEL customizationUUID = " + vfcModel.getCustomizationUUID());
-					insertToscaData(vfcModel.getSql("VFC_MODEL", model_yaml));
-				} catch (IOException e) {
-					LOG.error("Could not insert Tosca YAML data into the VFC_MODEL table ", e);
-				}
-
-			}
-			
-			// For each VF, insert VF_TO_NETWORK_ROLE_MAPPING data
-			List<NodeTemplate> cpNodes = sdcCsarHelper.getCpListByVf(vfNodeModel.getCustomizationUUIDNoQuotes());
-			for (NodeTemplate cpNode : cpNodes){
-		
-				// Insert into VF_TO_NETWORK_ROLE_MAPPING vf_customization_uuid and network_role
-				String cpNetworkRole = sdcCsarHelper.getNodeTemplatePropertyLeafValue(cpNode, "network_role_tag");
-			
-				try {
-					cleanUpExistingToscaData("VF_TO_NETWORK_ROLE_MAPPING", "vf_customization_uuid", vfNodeModel.getCustomizationUUID());
-					LOG.info("Call insertToscaData for VF_TO_NETWORK_ROLE_MAPPING vfCustomizationUUID = " + vfNodeModel.getCustomizationUUID());
-					insertToscaData("insert into VF_TO_NETWORK_ROLE_MAPPING (vf_customization_uuid, network_role) values (" + 
-					vfNodeModel.getCustomizationUUID() + ", \"" + cpNetworkRole + "\")");
-				} catch (IOException e) {
-					LOG.error("Could not insert Tosca YAML data into the VF_TO_NETWORK_ROLE_MAPPING table ", e);
-				}
-				
-				// Insert VFC_TO_NETWORK_ROLE_MAPPING data
-				Map<String, String> mappingParams = new HashMap<String, String>();
-				//String cpNetworkRoleTag = "\"" + sdcCsarHelper.getNodeTemplatePropertyLeafValue(cpNode, SdcPropertyNames.PROPERTY_NAME_NETWORKROLETAG) + "\"";
-				// extract network_role, network_role_tag and virtual_binding from this cpNode
-				SdncBaseModel.addParameter("network_role", SdncBaseModel.extractValue(sdcCsarHelper, cpNode, "network_role"), mappingParams);
-				SdncBaseModel.addParameter("network_role_tag", SdncBaseModel.extractValue(sdcCsarHelper, cpNode, "network_role_tag"), mappingParams);
-				String virtualBinding = "\"" + SdncBaseModel.extractValue(sdcCsarHelper, cpNode, "requirements#virtualBinding") + "\""; 
-
-				// get list of cpNodes and vfcNodes with matching virtualBinding
-				List<Pair<NodeTemplate, NodeTemplate>> matchList = sdcCsarHelper.getNodeTemplatePairsByReqName(sdcCsarHelper.getCpListByVf(vfNodeModel.getCustomizationUUIDNoQuotes()), sdcCsarHelper.getVfcListByVf(vfNodeModel.getCustomizationUUIDNoQuotes()), virtualBinding);				
-				for (Pair<NodeTemplate, NodeTemplate> match : matchList) {  // should be 1 match?
-					
-					// extract values from the left "CP" Node
-					SdncBaseModel.addParameter("ipv4_use_dhcp", SdncBaseModel.extractBooleanValue(sdcCsarHelper, match.getLeft(), SdcPropertyNames.PROPERTY_NAME_NETWORKASSIGNMENTS_IPV4SUBNETDEFAULTASSIGNMENTS_DHCPENABLED), mappingParams);
-					//SdncBaseModel.addParameter("ipv4_ip_version", SdncBaseModel.extractValue(sdcCsarHelper, match.getLeft(), SdcPropertyNames.PROPERTY_NAME_NETWORKASSIGNMENTS_IPV4SUBNETDEFAULTASSIGNMENTS_IPVERSION), mappingParams);
-					SdncBaseModel.addParameter("ipv4_ip_version", "dummy_ipv4_vers", mappingParams);
-					SdncBaseModel.addParameter("ipv6_use_dhcp", SdncBaseModel.extractBooleanValue(sdcCsarHelper, match.getLeft(), SdcPropertyNames.PROPERTY_NAME_NETWORKASSIGNMENTS_IPV6SUBNETDEFAULTASSIGNMENTS_DHCPENABLED), mappingParams);
-					//SdncBaseModel.addParameter("ipv6_ip_version", SdncBaseModel.extractValue(sdcCsarHelper, match.getLeft(), SdcPropertyNames.PROPERTY_NAME_NETWORKASSIGNMENTS_IPV6SUBNETDEFAULTASSIGNMENTS_IPVERSION), mappingParams);
-					SdncBaseModel.addParameter("ipv6_ip_version", "dummy_ipv6_vers", mappingParams);
-					//String extcp_subnetpool_id = "\"" + SdncBaseModel.extractValue(sdcCsarHelper, match.getLeft(), SdcPropertyNames.PROPERTY_NAME_SUBNETPOOLID) + "\""; // need path to subnetpoolid 
-					
-					// extract values from the right "VFC" Node
-					String vfcCustomizationUuid = "\"" + SdncBaseModel.extractValue(sdcCsarHelper, match.getRight().getMetadata(), "customization_uuid") + "\"";
-					SdncBaseModel.addParameter("vm_type", SdncBaseModel.extractValue(sdcCsarHelper, match.getRight(), SdcPropertyNames.PROPERTY_NAME_VMTYPE), mappingParams);
-					SdncBaseModel.addIntParameter("ipv4_count", SdncBaseModel.extractValue(sdcCsarHelper, match.getRight(), SdcPropertyNames.PROPERTY_NAME_NETWORKASSIGNMENTS_IPV4SUBNETDEFAULTASSIGNMENTS_MINSUBNETSCOUNT), mappingParams);
-					SdncBaseModel.addIntParameter("ipv6_count", SdncBaseModel.extractValue(sdcCsarHelper, match.getRight(), SdcPropertyNames.PROPERTY_NAME_NETWORKASSIGNMENTS_IPV6SUBNETDEFAULTASSIGNMENTS_MINSUBNETSCOUNT), mappingParams);
-				
-					try {
-						cleanUpExistingToscaData("VFC_TO_NETWORK_ROLE_MAPPING", "vfc_customization_uuid", vfcCustomizationUuid);
-						LOG.info("Call insertToscaData for VFC_TO_NETWORK_ROLE_MAPPING vfcCustomizationUUID = " + vfcCustomizationUuid);
-						insertToscaData(SdncBaseModel.getSql("VFC_TO_NETWORK_ROLE_MAPPING", "vfc_customization_uuid", vfcCustomizationUuid, "", mappingParams));
-					} catch (IOException e) {
-						LOG.error("Could not insert Tosca YAML data into the VFC_TO_NETWORK_ROLE_MAPPING table ", e);
-					}
-				
-				}	
-				
-			} // CP loop	
-			
-		} // VF loop
-		
-		// Close ASDC TOSCA Parser factory - we are done processing this distribution
-		factory.close();
-		
-		if ((artifact != null) && (data != null)) {
-			LOG.info("Update to SDN-C succeeded");
-			IDistributionClientResult deploymentStatus;
-				deploymentStatus = client.sendDeploymentStatus(buildStatusMessage(
-						client, data, artifact,
-						DistributionStatusEnum.DEPLOY_OK));
-		}
-	
-	}
-	
-	 private void cleanUpExistingToscaData(String tableName, String keyName, String keyValue) throws IOException
-     {
-         
-            if (jdbcDataSource == null) {
-            	 setJdbcDataSource();
-            }
-             try {
-            	int rowCount = 0;
-            	CachedRowSet data = jdbcDataSource.getData("SELECT * from " + tableName + " where " + keyName + " = " + keyValue + ";", null, "");
-            	while(data.next()) { 
-     				rowCount ++; 
-            	}
-            	if (rowCount != 0) {
-                    LOG.info("cleanUpExistingToscaData: " + keyValue);
-               		jdbcDataSource.writeData("DELETE from " + tableName + " where " + keyName + " = " + keyValue + ";", null, null);
-            	}
-            	 
-			} catch (SQLException e) {				
-				LOG.error("Could not clean up existing " + tableName  + " for " + keyValue, e);
-			}    
-			
-     }
-
-	
-	 private void cleanUpExistingToscaServiceData(String serviceUUID) throws IOException
-     {
-         
-            if (jdbcDataSource == null) {
-            	 setJdbcDataSource();
-            }
-             try {
-            	int rowCount = 0;
-            	CachedRowSet data = jdbcDataSource.getData("SELECT * from SERVICE_MODEL where service_uuid = " + serviceUUID + ";", null, "");
-            	while(data.next()) { 
-     				rowCount ++; 
-            	}
-            	if (rowCount != 0) {
-                    LOG.info("cleanUpExistingToscaData: " + serviceUUID);
-               		jdbcDataSource.writeData("DELETE from NETWORK_MODEL where service_uuid = " + serviceUUID + ";", null, null);
-               		jdbcDataSource.writeData("DELETE from SERVICE_MODEL where service_uuid = " + serviceUUID + ";", null, null);
-            	}
-            	 
-			} catch (SQLException e) {				
-				LOG.error("Could not clean up existing NETWORK_MODEL and SERVICE_MODEL for service_UUID " + serviceUUID, e);
-			}    
-			
-     }
-
-	
-	 private void insertToscaData(String toscaDataString) throws IOException
-     {
-            LOG.debug("insertToscaData: " + toscaDataString);
-
-            if (jdbcDataSource == null) {
-            	 setJdbcDataSource();
-            }
-             try {
-
- 				jdbcDataSource.writeData(toscaDataString, null, null);
-
-			} catch (SQLException e) {
-				LOG.error("Could not insert Tosca YAML data into the database ", e);
-			}
-
-     }
-
-
-    private SdncArtifactType analyzeFileType(ArtifactTypeEnum artifactType, File spoolFile, Document spoolDoc) {
-
-        if (artifactType != ArtifactTypeEnum.YANG_XML) {
-            LOG.error("Unexpected artifact type - expecting YANG_XML, got "+artifactType);
-			return (null);
-        }
-
-        // Examine outer tag
-
-        try {
-
-
-            Element root = spoolDoc.getDocumentElement();
-
-            String rootName = root.getTagName();
-
-            if (rootName.contains(":")) {
-                String[] rootNameElems = rootName.split(":");
-                rootName = rootNameElems[rootNameElems.length - 1];
-            }
-
-            if (rootName != null) {
-            	SdncArtifactType mapEntry = config.getMapping(rootName);
-
-
-                if (mapEntry == null) {
-
-                    LOG.error("Unexpected file contents - root tag is "+rootName);
-                }
-				return(mapEntry);
-            } else {
-                LOG.error("Cannot get root tag from file");
-				return(null);
-            }
-
-        } catch (Exception e) {
-            LOG.error("Could not parse YANG_XML file "+spoolFile.getName(), e);
-			return(null);
-        }
-    }
-
-    private void scheduleDeployment(SdncArtifactType type, String svcName, String resourceName, IArtifactInfo artifactInfo, String spoolFileName, File spoolFile) {
-
-        if (type.getPass() < deployList.length) {
-
-            if (artifactInfo != null) {
-                LOG.debug("Scheduling "+artifactInfo.getArtifactName()+" version "+artifactInfo.getArtifactVersion()+" for deployment");
-
-                deployList[type.getPass()].add(new DeployableArtifact(type, svcName, resourceName, artifactInfo, spoolFile));
-            } else {
-                SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss.SSS");//dd/MM/yyyy
-                Date now = new Date();
-                String artifactVersion = sdfDate.format(now);
-                LOG.debug("Scheduling "+spoolFileName+" version "+artifactVersion+" for deployment");
-                String artifactName = spoolFileName;
-                if (artifactInfo != null) {
-                    artifactName = artifactInfo.getArtifactName();
-                }
-                deployList[type.getPass()].add(new DeployableArtifact(type, svcName, resourceName, artifactName, artifactVersion, spoolFile));
-            }
-        } else {
-            LOG.info("Pass for type "+type.getTag()+" is "+type.getPass()+" which is not <= "+deployList.length);
-        }
-    }
-
-
-    private DistributionStatusEnum deploySpoolFile(DeployableArtifact artifact) {
-
-        DistributionStatusEnum deployResult = DistributionStatusEnum.DEPLOY_OK;
-
-        StringBuffer msgBuffer = new StringBuffer();
-
-
-        String namespace = config.getAsdcApiNamespace();
-		if ((namespace == null) || (namespace.length() == 0)) {
-            namespace="com:att:sdnctl:asdcapi";
-        }
-
-        msgBuffer.append("<input xmlns='");
-        msgBuffer.append(namespace);
-        msgBuffer.append("'>\n");
-
-        String svcName = artifact.getSvcName();
-        String resourceName = artifact.getResourceName();
-        String artifactName = artifact.getArtifactName();
-
-        if (svcName != null) {
-            if (resourceName != null) {
-                artifactName = svcName + "/" + resourceName + "/" + artifactName;
-            } else {
-                artifactName = svcName + "/" + artifactName;
-            }
-        }
-
-        msgBuffer.append("<artifact-name>"+artifactName+"</artifact-name>\n");
-        msgBuffer.append("<artifact-version>"+artifact.getArtifactVersion()+"</artifact-version>\n");
-
-
-        try {
-            BufferedReader rdr = new BufferedReader(new FileReader(artifact.getFile()));
-
-            String curLine = rdr.readLine();
-
-            while (curLine != null) {
-
-                if (!curLine.startsWith("<?")) {
-                    msgBuffer.append(curLine+"\n");
-                }
-                curLine = rdr.readLine();
-            }
-            rdr.close();
-
-        } catch (Exception e) {
-            LOG.error("Could not process spool file "+artifact.getFile().getName(), e);
-			return(DistributionStatusEnum.DEPLOY_ERROR);
-        }
-
-        msgBuffer.append("</input>\n");
-
-
-        byte[] msgBytes = msgBuffer.toString().getBytes();
-
-        Document results = postRestXml(artifact.getType().getRpcUrl(config.getAsdcApiBaseUrl()), msgBytes);
-
-        if (results == null) {
-
-            deployResult = DistributionStatusEnum.DEPLOY_ERROR;
-        } else {
-
-            XPathFactory xpf = XPathFactory.newInstance();
-            XPath xp = xpf.newXPath();
-
-            String asdcApiResponseCode = "500";
-
-            try {
-
-                asdcApiResponseCode = xp.evaluate("//asdc-api-response-code[position()=1]/text()", results.getDocumentElement());
-            } catch (Exception e) {
-                LOG.error("Caught exception retrying to evaluate xpath", e);
-            }
-
-            if (asdcApiResponseCode.contains("200")) {
-                LOG.info("Update to SDN-C succeeded");
-                deployResult = DistributionStatusEnum.DEPLOY_OK;
-            } else {
-                LOG.info("Update to SDN-C failed (response code "+asdcApiResponseCode+")");
-
-                if (asdcApiResponseCode.contains("409")) {
-                    deployResult = DistributionStatusEnum.ALREADY_DEPLOYED;
-                } else {
-
-                    deployResult = DistributionStatusEnum.DEPLOY_ERROR;
-                }
-            }
-        }
-
-
-
-		return(deployResult);
-    }
-
-
-
-
-
-    public static IDistributionStatusMessage buildStatusMessage(
-            final IDistributionClient client, final INotificationData data,
-            final IArtifactInfo relevantArtifact,
-            final DistributionStatusEnum status) {
-        IDistributionStatusMessage statusMessage = new IDistributionStatusMessage() {
-
-            @Override
-			public long getTimestamp() {
-                long currentTimeMillis = System.currentTimeMillis();
-                return currentTimeMillis;
-            }
-
-            @Override
-			public DistributionStatusEnum getStatus() {
-                return status;
-            }
-
-            @Override
-			public String getDistributionID() {
-                return data.getDistributionID();
-            }
-
-            @Override
-			public String getConsumerID() {
-                return client.getConfiguration().getConsumerID();
-            }
-
-            @Override
-			public String getArtifactURL() {
-                return relevantArtifact.getArtifactURL();
-            }
-        };
-        return statusMessage;
-
-    }
-
-    private HttpURLConnection getRestXmlConnection(String urlString, String method) throws IOException
-    {
-        URL sdncUrl = new URL(urlString);
-        Authenticator.setDefault(new SdncAuthenticator(config.getSdncUser(), config.getSdncPasswd()));
-
-        HttpURLConnection conn = (HttpURLConnection) sdncUrl.openConnection();
-
-        String authStr = config.getSdncUser()+":"+config.getSdncPasswd();
-        String encodedAuthStr = new String(Base64.encodeBase64(authStr.getBytes()));
-
-        conn.addRequestProperty("Authentication", "Basic "+encodedAuthStr);
-
-        conn.setRequestMethod(method);
-        conn.setRequestProperty("Content-Type", "application/xml");
-        conn.setRequestProperty("Accept", "application/xml");
-
-        conn.setDoInput(true);
-        conn.setDoOutput(true);
-        conn.setUseCaches(false);
-
-		return(conn);
-
-    }
-
-    private Document postRestXml(String urlString, byte[] msgBytes) {
-        Document response = null;
-
-        try {
-			SdncOdlConnection odlConn = SdncOdlConnection.newInstance(urlString, config.getSdncUser(), config.getSdncPasswd());
-
-			String sdncResp = odlConn.send("POST", "application/xml", new String(msgBytes));
-
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            DocumentBuilder db = dbf.newDocumentBuilder();
-
-
-			response = db.parse(new ByteArrayInputStream(sdncResp.getBytes()));
-        } catch (Exception e) {
-			LOG.error("Caught exception posting to ODL tier", e);
-        }
-
-		return(response);
-
-    }
-
-    private File applyXslts(File srcFile) {
-
-        Document doc = null;
-
-
-        File inFile = srcFile;
-        File outFile = null;
-
-        String xsltPathList = config.getXsltPathList();
-
-		if ((xsltPathList == null) || (xsltPathList.length() == 0)) {
-            outFile = inFile;
-        } else {
-
-            String[] xsltPaths = xsltPathList.split(",");
-
-            for (String xsltPath : xsltPaths) {
-                try{
-
-                    outFile = File.createTempFile("tmp", "xml");
-                    TransformerFactory factory = TransformerFactory.newInstance();
-                    Source xslt = new StreamSource(new File(xsltPath));
-                    Transformer transformer = factory.newTransformer(xslt);
-                    Source text = new StreamSource(inFile);
-
-
-                    transformer.transform(text, new StreamResult(outFile));
-
-                    inFile = outFile;
-
-                } catch (Exception e) {
-                    LOG.error("Caught exception trying to apply XSLT template "+xsltPath, e);
-
-                }
-
-            }
-        }
-
-        // After transformations, parse transformed XML
-
-
-		return(outFile);
-    }
-
-    private String escapeFilename(String str) {
-        StringBuffer retval = new StringBuffer();
-
-        for (int i = 0 ; i < str.length() ; i++) {
-            char curchar = str.charAt(i);
-            if (Character.isJavaIdentifierPart(curchar)) {
-                retval.append(curchar);
-            }
-        }
-
-		return(retval.toString());
-
-    }
-
-}
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncUebClient.java b/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncUebClient.java
deleted file mode 100644
index c33d40cd..00000000
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncUebClient.java
+++ /dev/null
@@ -1,65 +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=========================================================
- */
-
-package org.openecomp.sdnc.uebclient;
-
-import org.openecomp.sdc.api.IDistributionClient;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.impl.DistributionClientFactory;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SdncUebClient {
-
-	private static final Logger LOG = LoggerFactory
-			.getLogger(SdncUebConfiguration.class);
-
-	public static void main(String[] args) {
-		IDistributionClient client = DistributionClientFactory
-				.createDistributionClient();
-
-		SdncUebConfiguration config = new SdncUebConfiguration();
-
-		SdncUebCallback cb = new SdncUebCallback(client, config);
-
-		LOG.info("Scanning for local distribution artifacts before starting client");
-		cb.deployDownloadedFiles(null, null, null);
-
-		LOG.info("Initializing ASDC distribution client");
-
-		IDistributionClientResult result = client.init(
-				config, cb);
-
-		LOG.info("Initialized ASDC distribution client - results = "
-				+ result.getDistributionMessageResult());
-
-		if (result.getDistributionActionResult() == DistributionActionResultEnum.SUCCESS) {
-			LOG.info("Starting client...");
-			IDistributionClientResult start = client.start();
-			LOG.info("Client startup result = "
-					+ start.getDistributionMessageResult());
-		}
-
-
-	}
-
-}
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncUebConfiguration.java b/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncUebConfiguration.java
deleted file mode 100644
index d28f7cd4..00000000
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncUebConfiguration.java
+++ /dev/null
@@ -1,280 +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=========================================================
- */
-
-package org.openecomp.sdnc.uebclient;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Properties;
-
-import org.openecomp.sdc.api.consumer.IConfiguration;
-import org.openecomp.sdc.utils.ArtifactTypeEnum;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SdncUebConfiguration implements IConfiguration{
-
-	private static final String SDNC_CONFIG_DIR = "SDNC_CONFIG_DIR";
-	private static final Logger LOG = LoggerFactory
-			.getLogger(SdncUebConfiguration.class);
-
-	private String asdcAddress = null;
-	private String consumerGroup = null;
-	private String consumerID = null;
-	private String environmentName = null;
-	private String password = null;
-	private int pollingInterval = 30;
-	private int pollingTimeout = 15;
-	private List<String> relevantArtifactTypes = null;
-	private String user = null;
-
-	private String sdncUser = null;
-	private String sdncPasswd = null;
-	private String asdcApiBaseUrl = null;
-	private String asdcApiNamespace = null;
-
-	private SdncArtifactMap artifactMap = SdncArtifactMap.getInstance();
-
-	public String getAsdcApiNamespace() {
-		return asdcApiNamespace;
-	}
-
-	private String incomingDir = null;
-
-	private String archiveDir = null;
-
-	private String overrideFile = null;
-
-	private boolean activateServerTLSAuth;
-	private String keyStorePassword;
-	private String keyStorePath;
-
-	private String xsltPathList;
-
-	public String getXsltPathList() {
-		return xsltPathList;
-	}
-
-	public String getOverrideFile() {
-		return overrideFile;
-	}
-
-	public SdncUebConfiguration() {
-
-		try {
-			init();
-		} catch (Exception e) {
-			LOG.error("Cannot initialize SdncUebConfiguration", e);
-		}
-	}
-
-	public void init() throws IOException {
-		String propPath = null;
-		String propDir = System.getenv(SDNC_CONFIG_DIR);
-		if (propDir == null) {
-
-			propDir = "/opt/sdnc/data/properties";
-		}
-		propPath = propDir + "/ueb-listener.properties";
-		File propFile = new File(propPath);
-
-
-		if (!propFile.exists()) {
-
-			throw new FileNotFoundException(
-					"Missing configuration properties file : "
-							+ propFile);
-		}
-
-		Properties props = new Properties();
-		props.load(new FileInputStream(propFile));
-
-		asdcAddress = props.getProperty("org.openecomp.sdnc.uebclient.asdc-address");
-		consumerGroup = props.getProperty("org.openecomp.sdnc.uebclient.consumer-group");
-		consumerID = props.getProperty("org.openecomp.sdnc.uebclient.consumer-id");
-		environmentName = props.getProperty("org.openecomp.sdnc.uebclient.environment-name");
-		password = props.getProperty("org.openecomp.sdnc.uebclient.password");
-		user = props.getProperty("org.openecomp.sdnc.uebclient.user");
-
-		sdncUser = props.getProperty("org.openecomp.sdnc.uebclient.sdnc-user");
-		sdncPasswd = props.getProperty("org.openecomp.sdnc.uebclient.sdnc-passwd");
-		asdcApiBaseUrl = props.getProperty("org.openecomp.sdnc.uebclient.asdc-api-base-url");
-		asdcApiNamespace = props.getProperty("org.openecomp.sdnc.uebclient.asdc-api-namespace");
-
-		incomingDir = props.getProperty("org.openecomp.sdnc.uebclient.spool.incoming");
-		archiveDir = props.getProperty("org.openecomp.sdnc.uebclient.spool.archive");
-		overrideFile = props.getProperty("org.openecomp.sdnc.uebclient.override-file");
-
-		String curval = props.getProperty("org.openecomp.sdnc.uebclient.polling-interval");
-		if ((curval != null) && (curval.length() > 0)) {
-			try {
-				pollingInterval = Integer.parseInt(curval);
-			} catch (Exception e) {
-				LOG.warn("Illegal value for org.openecomp.sdnc.uebclient.polling-interval ("+curval+")");
-			}
-		}
-
-		curval = props.getProperty("org.openecomp.sdnc.uebclient.polling-timeout");
-		if ((curval != null) && (curval.length() > 0)) {
-			try {
-				pollingTimeout = Integer.parseInt(curval);
-			} catch (Exception e) {
-				LOG.warn("Illegal value for org.openecomp.sdnc.uebclient.polling-timeout ("+curval+")");
-			}
-		}
-
-		curval = props.getProperty("org.openecomp.sdnc.uebclient.relevant-artifact-types");
-		if ((curval != null) && (curval.length() > 0)) {
-			String[] artifactTypes = curval.split(",");
-
-			relevantArtifactTypes = new LinkedList<String>();
-
-			for (int i = 0 ; i < artifactTypes.length ; i++) {
-				try {
-					if (ArtifactTypeEnum.valueOf(artifactTypes[i]) != null) {
-							relevantArtifactTypes.add(artifactTypes[i]);
-					} else {
-						LOG.warn("Skipping unrecognized artifact type "+artifactTypes[i]);
-					}
-				} catch (Exception e) {
-
-					LOG.warn("Caught exception validating artifact type "+artifactTypes[i], e);
-				}
-
-			}
-
-		}
-
-		curval = props.getProperty("org.openecomp.sdnc.uebclient.activate-server-tls-auth", "false");
-		activateServerTLSAuth = "true".equalsIgnoreCase(curval);
-		keyStorePath = props.getProperty("org.openecomp.sdnc.uebclient.keystore-path");
-		keyStorePassword = props.getProperty("org.openecomp.sdnc.uebclient.keystore-password");
-		xsltPathList = props.getProperty("org.openecomp.sdnc.uebclient.xslt-path-list");
-
-
-		String artifactMapFile = props.getProperty("org.openecomp.sdnc.uebclient.artifact-map");
-		if (artifactMapFile != null) {
-			artifactMap.load(artifactMapFile);
-		}
-
-	}
-
-	@Override
-	public String getAsdcAddress() {
-		return asdcAddress;
-	}
-
-	@Override
-	public String getConsumerGroup() {
-		return consumerGroup;
-	}
-
-	@Override
-	public String getConsumerID() {
-		return consumerID;
-	}
-
-	@Override
-	public String getEnvironmentName() {
-		return environmentName;
-	}
-
-	@Override
-	public String getPassword() {
-		return password;
-	}
-
-	@Override
-	public int getPollingInterval() {
-		return pollingInterval;
-	}
-
-	@Override
-	public int getPollingTimeout() {
-		return pollingTimeout;
-	}
-
-	@Override
-	public List<String> getRelevantArtifactTypes() {
-		return relevantArtifactTypes;
-	}
-
-	@Override
-	public String getUser() {
-		return user;
-	}
-
-
-	public String getSdncUser() {
-		return sdncUser;
-	}
-
-	public String getSdncPasswd() {
-		return sdncPasswd;
-	}
-
-	public String getAsdcApiBaseUrl() {
-		return asdcApiBaseUrl;
-	}
-
-	@Override
-	public boolean activateServerTLSAuth() {
-		return activateServerTLSAuth;
-	}
-
-	@Override
-	public String getKeyStorePassword() {
-		return keyStorePassword;
-	}
-
-	@Override
-	public String getKeyStorePath() {
-		return keyStorePath;
-	}
-
-	public String getIncomingDir() {
-		return incomingDir;
-	}
-
-	public String getArchiveDir() {
-		return archiveDir;
-	}
-
-	public int getMaxPasses() {
-		return(artifactMap.getNumPasses());
-	}
-
-	public SdncArtifactMap.SdncArtifactType getMapping(String tag) {
-		return(artifactMap.getMapping(tag));
-	}
-
-	@Override
-	public boolean isFilterInEmptyResources() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-
-}
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncVFCModel.java b/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncVFCModel.java
deleted file mode 100644
index c5806f2c..00000000
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncVFCModel.java
+++ /dev/null
@@ -1,69 +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=========================================================
- */
-
-package org.openecomp.sdnc.uebclient;
-
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SdncVFCModel extends SdncBaseModel {
-	
-	private static final Logger LOG = LoggerFactory
-			.getLogger(SdncVFCModel.class);
-	
-	private String vmType = null;
-	private String vmCount = null;
-
-	public SdncVFCModel(ISdcCsarHelper sdcCsarHelper, NodeTemplate nodeTemplate) {
-
-		super(sdcCsarHelper, nodeTemplate);
-		
-		// extract properties
-		vmType = extractValue (nodeTemplate, SdcPropertyNames.PROPERTY_NAME_VMTYPE);
-		//vmCount = extractValue (sdcCsarHelper, nodeTemplate, SdcPropertyNames.PROPERTY_NAME_VMCOUNT); - need path to vm_count
-		vmCount = "1";
-		addParameter("vm_type", vmType);
-		addParameter("vm_type_tag", extractValue (nodeTemplate, SdcPropertyNames.PROPERTY_NAME_VMTYPETAG));
-		addParameter("ecomp_generated_naming", extractBooleanValue (nodeTemplate, SdcPropertyNames.PROPERTY_NAME_VFCNAMING_ECOMPGENERATEDNAMING));
-		addParameter("naming_policy", extractValue (nodeTemplate, SdcPropertyNames.PROPERTY_NAME_VFCNAMING_NAMINGPOLICY));
-		addParameter("nfc_naming_code", extractValue (nodeTemplate, SdcPropertyNames.PROPERTY_NAME_NFCCODE));
-	}
-
-	public String getVmType() {
-		return vmType;
-	}
-
-	public void setVmType(String vmType) {
-		this.vmType = vmType;
-	}
-
-	public String getVmCount() {
-		return vmCount;
-	}
-
-	public void setVmCount(String vmCount) {
-		this.vmCount = vmCount;
-	}
-
-}
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncVFModel.java b/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncVFModel.java
deleted file mode 100644
index b6cd9fb4..00000000
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncVFModel.java
+++ /dev/null
@@ -1,56 +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=========================================================
- */
-
-package org.openecomp.sdnc.uebclient;
-
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
-import org.openecomp.sdc.toscaparser.api.Metadata;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SdncVFModel extends SdncBaseModel {
-	
-	private static final Logger LOG = LoggerFactory
-			.getLogger(SdncVFModel.class);
-
-	public SdncVFModel(ISdcCsarHelper sdcCsarHelper, NodeTemplate nodeTemplate) {
-
-		super(sdcCsarHelper, nodeTemplate);
-
-		// extract metadata
-		Metadata metadata = nodeTemplate.getMetadata();
-		addParameter("name", extractValue(metadata, SdcPropertyNames.PROPERTY_NAME_NAME));
-		addParameter("vendor", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_RESOURCEVENDOR)); 
-		addParameter("vendor_version", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_RESOURCEVENDORRELEASE)); 
-		
-		// extract properties
-		addParameter("ecomp_generated_naming", extractBooleanValue(nodeTemplate, SdcPropertyNames.PROPERTY_NAME_VNFECOMPNAMING_ECOMPGENERATEDNAMING));
-		addParameter("naming_policy", extractValue(nodeTemplate, SdcPropertyNames.PROPERTY_NAME_VNFECOMPNAMING_NAMINGPOLICY));
-		addParameter("nf_type", extractValue(nodeTemplate, SdcPropertyNames.PROPERTY_NAME_NFTYPE));
-		addParameter("nf_role", extractValue(nodeTemplate, SdcPropertyNames.PROPERTY_NAME_NFROLE));
-		addParameter("nf_code", extractValue( nodeTemplate, "nf_naming_code"));
-		addParameter("nf_function", extractValue(nodeTemplate, SdcPropertyNames.PROPERTY_NAME_NFFUNCTION));
-		addParameter("avail_zone_max_count", extractValue(nodeTemplate, SdcPropertyNames.PROPERTY_NAME_AVAILABILITYZONEMAXCOUNT));
-	}
-
-}
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncVFModuleModel.java b/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncVFModuleModel.java
deleted file mode 100644
index 68c72161..00000000
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncVFModuleModel.java
+++ /dev/null
@@ -1,45 +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=========================================================
- */
-
-package org.openecomp.sdnc.uebclient;
-
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
-import org.openecomp.sdc.toscaparser.api.Group;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SdncVFModuleModel extends SdncBaseModel {
-	
-	private static final Logger LOG = LoggerFactory
-			.getLogger(SdncVFModuleModel.class);
-	
-	public SdncVFModuleModel(ISdcCsarHelper sdcCsarHelper, Group group) {
-
-		super(sdcCsarHelper, group);
-		
-		// extract properties
-		addParameter("vf_module_type", extractValue(group, SdcPropertyNames.PROPERTY_NAME_VFMODULETYPE));
-		addIntParameter("availability_zone_count", extractValue(group, SdcPropertyNames.PROPERTY_NAME_AVAILABILITYZONECOUNT));
-		addParameter("ecomp_generated_vm_assignments", extractBooleanValue(group, SdcPropertyNames.PROPERTY_NAME_ECOMPGENERATEDVMASSIGNMENTS));
-	}
-
-}
diff --git a/ueb-listener/src/main/resources/log4j.properties b/ueb-listener/src/main/resources/log4j.properties
deleted file mode 100644
index b7a153c4..00000000
--- a/ueb-listener/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,37 +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=========================================================
-###
-
-log4j.rootLogger=DEBUG,CONSOLE,LOGFILE
-
-# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.Threshold=ERROR
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%p %d{yyyy-MM-dd HH:mm:ss.SSS Z} %c{1} - %m%n
- 
-# LOGFILE is set to be a File appender using a PatternLayout.
-log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender
-log4j.appender.LOGFILE.File=/opt/app/ueb-listener/logs/ueb-listener.log
-log4j.appender.LOGFILE.Append=true
-log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOGFILE.layout.ConversionPattern=%p %d{yyyy-MM-dd HH:mm:ss.SSS Z} %c{1} - %m%n
-log4j.appender.LOGFILE.MaxFileSize=10MB
-log4j.appender.LOGFILE.MaxBackupIndex=10
diff --git a/ueb-listener/src/main/resources/normalizeTagNames.xslt b/ueb-listener/src/main/resources/normalizeTagNames.xslt
deleted file mode 100755
index 6594ccfa..00000000
--- a/ueb-listener/src/main/resources/normalizeTagNames.xslt
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/>
-    <xsl:template match="@*|node()">
-        <xsl:copy>
-            <xsl:apply-templates select="@*|node()" />
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template match="vf-license-model/feature-group-list/feature-group/entitlement-pool-list/entitlement-pool/entitlement-metric/value/text()[.='# of software instances']">num of software instances</xsl:template>
-    <xsl:template match="vf-license-model/feature-group-list/feature-group/entitlement-pool-list/entitlement-pool/firstClassCitizenId"/>
-</xsl:stylesheet>
-
diff --git a/ueb-listener/src/main/resources/removeNs.xslt b/ueb-listener/src/main/resources/removeNs.xslt
deleted file mode 100755
index 7aa927b1..00000000
--- a/ueb-listener/src/main/resources/removeNs.xslt
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/>
-
-    <xsl:template match="*">
-        <xsl:element name="{local-name(.)}">
-            <xsl:apply-templates select="@* | node()" />
-        </xsl:element>
-    </xsl:template>
-    <xsl:template match="@*">
-        <xsl:attribute name="{local-name(.)}">
-      <xsl:value-of select="." />
-    </xsl:attribute>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/ueb-listener/src/main/scripts/start-ueb-listener.sh b/ueb-listener/src/main/scripts/start-ueb-listener.sh
deleted file mode 100644
index 2f089489..00000000
--- a/ueb-listener/src/main/scripts/start-ueb-listener.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-###
-# ============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=========================================================
-###
-
-PROPERTY_DIR=${PROPERTY_DIR:-/opt/sdnc/data/properties}
-
-
-LISTENER=ueb-listener
-
-PIDFILE=/tmp/.${LISTENER}-pid
-UEBLISTENERROOT=${UEBLISTENERROOT:-/opt/app/ueb-listener}
-JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-oracle}
-JAVA_OPTS=${JAVA_OPTS:--Dhttps.protocols=TLSv1.1,TLSv1.2}
-JAVA=${JAVA:-${JAVA_HOME}/bin/java}
-
-# Redirect output from script to $LISTENER.out
-exec >> ${UEBLISTENERROOT}/logs/$LISTENER.out
-exec 2>&1
-
-if [ -f $PIDFILE ]
-then
-  pid=$(cat $PIDFILE)
-  if [ "$pid" != "" ]
-  then
-    if kill -0 $pid
-    then
-      echo "$LISTENER already running"
-      exit 0
-    fi
-  fi
-fi
-
-if [ ! -d ${UEBLISTENERROOT}/logs ]
-then
-  mkdir ${UEBLISTENERROOT}/logs
-fi
-
-for file in ${UEBLISTENERROOT}/lib/*.jar
-do
-  LISTENERCLASSPATH=$LISTENERCLASSPATH:$file
-done
-
-${JAVA} ${JAVA_OPTS} -jar ${UEBLISTENERROOT}/lib/ueb-listener*.jar -Dlog4j.configuration=file:${UEBLISTENERROOT}/lib/log4j.properties -cp ${LISTENERCLASSPATH} &
-
-
-echo $! > $PIDFILE
-
-echo "$LISTENER started!"
-exit 0
diff --git a/ueb-listener/src/main/scripts/stop-ueb-listener.sh b/ueb-listener/src/main/scripts/stop-ueb-listener.sh
deleted file mode 100644
index eccb3f72..00000000
--- a/ueb-listener/src/main/scripts/stop-ueb-listener.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-
-###
-# ============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=========================================================
-###
-
-PROPERTY_DIR=${PROPERTY_DIR:-/opt/sdnc/data/properties}
-
-if [ -f ${PROPERTY_DIR}/dmaap-listener.properties ]
-then
-	LISTENER=dmaap-listener
-else
-	LISTENER=ueb-listener
-fi
-
-PIDFILE=/tmp/.${LISTENER}-pid
-UEBLISTENERROOT=${UEBLISTENERROOT:-/opt/app/ueb-listener}
-
-if [ -f $PIDFILE ]
-then
-  pid=$(cat $PIDFILE)
-  if [ "$pid" != "" ]
-  then
-    if kill -0 $pid
-      then
-  	echo "Stopping $LISTENER"
-        kill $pid && rm $PIDFILE
-        exit 0
-      else
-        echo "$LISTENER not running"
-        exit 1
-      fi
-  else
-      echo "$LISTENER not running"
-      exit 1
-  fi
-fi
-
-
diff --git a/ueb-listener/src/site/apt/index.apt b/ueb-listener/src/site/apt/index.apt
deleted file mode 100644
index db584bfd..00000000
--- a/ueb-listener/src/site/apt/index.apt
+++ /dev/null
@@ -1,46 +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=========================================================
-~~~
-
-      ---
-      UEB Listener
-      ---
-
-
-UEB Listener
-
-    The UEB Listener is a daemon that listens for notifications from SDC, posted to UEB (Universal Event Bus).
-    On receipt of an event, the UEB listener downloads any artifacts posted and examines them to determine if
-    the format (the outer XML tag) matches a supported format.  If so, it posts the file to the ASDC-API REST
-    API in order to update the SDN-C database.
-
-File Locations
-
-    * Root directory : /opt/app/ueb-listener
-
-    * Log files : /opt/app/ueb-listener/logs
-
-    * Incoming files to be processed : /opt/app/ueb-listener/spool/asdc/incoming
-
-    * Files already processed : /opt/app/ueb-listener/spool/asdc/archive
-
-
-
-
diff --git a/ueb-listener/src/site/site.xml b/ueb-listener/src/site/site.xml
deleted file mode 100644
index f940e237..00000000
--- a/ueb-listener/src/site/site.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ============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=========================================================
-  -->
-
-<project>
-
-  <body>
-    <menu ref="modules"/>
-
-    <menu ref="reports"/>
-
-  </body>
-</project>