Update SDNC NB to depend on CCSDK

Refactor code to use CCSDK

Issue-Id: SDNC-50
Change-Id: If637d1a0609ec5ae9df60939f72eb64888e61e71
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>

7 files changed, 27 insertions, 27 deletions

diff --git a/vnftools/features/pom.xml b/vnftools/features/pom.xml
index e17ec6a9..452737fa 100644
--- a/vnftools/features/pom.xml
+++ b/vnftools/features/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>vnftools</artifactId>
-		<groupId>org.openecomp.sdnc.northbound</groupId>
+		<groupId>org.onap.sdnc.northbound</groupId>
 		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>vnftools-features</artifactId>
@@ -15,7 +15,7 @@
 
 
 		<dependency>
-			<groupId>org.openecomp.sdnc.northbound</groupId>
+			<groupId>org.onap.sdnc.northbound</groupId>
 			<artifactId>vnftools-provider</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/vnftools/features/src/main/resources/features.xml b/vnftools/features/src/main/resources/features.xml
index f90e4018..742efb47 100644
--- a/vnftools/features/src/main/resources/features.xml
+++ b/vnftools/features/src/main/resources/features.xml
@@ -32,7 +32,7 @@
         <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
         <feature>sdnc-sli</feature>
-        <bundle>mvn:org.openecomp.sdnc.northbound/vnftools-provider/${project.version}</bundle>
+        <bundle>mvn:org.onap.sdnc.northbound/vnftools-provider/${project.version}</bundle>
     </feature>
 
 </features>
diff --git a/vnftools/installer/pom.xml b/vnftools/installer/pom.xml
index 50d49756..196b6bd8 100755
--- a/vnftools/installer/pom.xml
+++ b/vnftools/installer/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>vnftools</artifactId>
-		<groupId>org.openecomp.sdnc.northbound</groupId>
+		<groupId>org.onap.sdnc.northbound</groupId>
 		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>vnftools-installer</artifactId>
@@ -14,14 +14,14 @@
 	<properties>
 		<application.name>sdnc-vnftools</application.name>
 		<features.boot>sdnc-vnftools</features.boot>
-		<features.repositories>mvn:org.openecomp.sdnc.northbound/vnftools-features/${project.version}/xml/features</features.repositories>
+		<features.repositories>mvn:org.onap.sdnc.northbound/vnftools-features/${project.version}/xml/features</features.repositories>
 		<include.transitive.dependencies>false</include.transitive.dependencies>
 	</properties>
 
 	<dependencies>
 
 		<dependency>
-			<groupId>org.openecomp.sdnc.northbound</groupId>
+			<groupId>org.onap.sdnc.northbound</groupId>
 			<artifactId>vnftools-features</artifactId>
 			<version>${project.version}</version>
 			<classifier>features</classifier>
@@ -35,7 +35,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.sdnc.northbound</groupId>
+			<groupId>org.onap.sdnc.northbound</groupId>
 			<artifactId>vnftools-provider</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -100,7 +100,7 @@
 							<useRepositoryLayout>true</useRepositoryLayout>
 							<addParentPoms>false</addParentPoms>
 							<copyPom>false</copyPom>
-							<includeGroupIds>org.openecomp.sdnc</includeGroupIds>
+							<includeGroupIds>org.onap.sdnc</includeGroupIds>
 							<excludeArtifactIds>sli-common,sli-provider,dblib-common,dblib-provider,sliPluginUtils-provider</excludeArtifactIds>
 							<scope>provided</scope>
 						</configuration>
diff --git a/vnftools/pom.xml b/vnftools/pom.xml
index e8f5f035..c9ed9790 100644
--- a/vnftools/pom.xml
+++ b/vnftools/pom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
-		<groupId>org.openecomp.sdnc.northbound</groupId>
+		<groupId>org.onap.sdnc.northbound</groupId>
 		<artifactId>sdnc-northbound</artifactId>
 		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
-	<groupId>org.openecomp.sdnc.northbound</groupId>
+	<groupId>org.onap.sdnc.northbound</groupId>
 	<artifactId>vnftools</artifactId>
 
 	<properties>
@@ -24,7 +24,7 @@
 
                 <dependencies>
                         <dependency>
-                                <groupId>org.openecomp.sdnc.northbound</groupId>
+                                <groupId>org.onap.sdnc.northbound</groupId>
                                 <artifactId>vnftools-features</artifactId>
                                 <classifier>features</classifier>
                                 <type>xml</type>
@@ -32,7 +32,7 @@
                         </dependency>
 
                         <dependency>
-                                <groupId>org.openecomp.sdnc.northbound</groupId>
+                                <groupId>org.onap.sdnc.northbound</groupId>
                                 <artifactId>vnftools-provider</artifactId>
                                 <version>${project.version}</version>
                         </dependency>
diff --git a/vnftools/provider/pom.xml b/vnftools/provider/pom.xml
index 22512d0f..146453ef 100644
--- a/vnftools/provider/pom.xml
+++ b/vnftools/provider/pom.xml
@@ -2,7 +2,7 @@
 <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>
 	<parent>
-		<groupId>org.openecomp.sdnc.northbound</groupId>
+		<groupId>org.onap.sdnc.northbound</groupId>
 		<artifactId>vnftools</artifactId>
 		<version>1.2.0-SNAPSHOT</version>
 	</parent>
@@ -21,13 +21,13 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.sdnc.core</groupId>
+			<groupId>org.onap.ccsdk.sli.core</groupId>
 			<artifactId>sli-common</artifactId>
 			<version>${sdnctl.sli.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.sdnc.core</groupId>
+			<groupId>org.onap.ccsdk.sli.core</groupId>
 			<artifactId>sli-provider</artifactId>
 			<version>${sdnctl.sli.version}</version>
 			<scope>compile</scope>
@@ -49,7 +49,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.sdnc.core</groupId>
+			<groupId>org.onap.ccsdk.sli.core</groupId>
 			<artifactId>sliPluginUtils-provider</artifactId>
 			<version>${sdnctl.slipluginutils.version}</version>
 			<type>jar</type>
@@ -68,10 +68,10 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
-						<Bundle-SymbolicName>org.openecomp.sdnc.vnftools</Bundle-SymbolicName>
-						<Bundle-Activator>org.openecomp.sdnc.vnftools.VnfToolsActivator</Bundle-Activator>
-						<Export-Package>org.openecomp.sdnc.vnftools</Export-Package>
-						<Import-Package>org.openecomp.sdnc.*,org.osgi.framework.*,org.slf4j.*,java.net.*,org.apache.commons.*</Import-Package>
+						<Bundle-SymbolicName>org.onap.sdnc.vnftools</Bundle-SymbolicName>
+						<Bundle-Activator>org.onap.sdnc.vnftools.VnfToolsActivator</Bundle-Activator>
+						<Export-Package>org.onap.sdnc.vnftools</Export-Package>
+						<Import-Package>org.onap.sdnc.*,org.osgi.framework.*,org.slf4j.*,java.net.*,org.apache.commons.*</Import-Package>
 						<Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|mysql-connector-java|slf4j-api|jcl-over-slf4j|xml-apis|InetAddress|commons-lang3</Embed-Dependency>
 						<Embed-Transitive>true</Embed-Transitive>
 					</instructions>
diff --git a/vnftools/provider/src/main/java/org/openecomp/sdnc/vnftools/VnfTools.java b/vnftools/provider/src/main/java/org/onap/sdnc/vnftools/VnfTools.java
index 33acace9..b3497bd5 100644
--- a/vnftools/provider/src/main/java/org/openecomp/sdnc/vnftools/VnfTools.java
+++ b/vnftools/provider/src/main/java/org/onap/sdnc/vnftools/VnfTools.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.vnftools;
+package org.onap.sdnc.vnftools;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -29,10 +29,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-import org.openecomp.sdnc.sli.SvcLogicContext;
-import org.openecomp.sdnc.sli.SvcLogicException;
-import org.openecomp.sdnc.sli.SvcLogicJavaPlugin;
-import org.openecomp.sdnc.sli.SliPluginUtils.SliPluginUtils;
+import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
+import org.onap.ccsdk.sli.core.sli.SvcLogicException;
+import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
+import org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/vnftools/provider/src/main/java/org/openecomp/sdnc/vnftools/VnfToolsActivator.java b/vnftools/provider/src/main/java/org/onap/sdnc/vnftools/VnfToolsActivator.java
index 23338d5d..5a06b07c 100644
--- a/vnftools/provider/src/main/java/org/openecomp/sdnc/vnftools/VnfToolsActivator.java
+++ b/vnftools/provider/src/main/java/org/onap/sdnc/vnftools/VnfToolsActivator.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.vnftools;
+package org.onap.sdnc.vnftools;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -27,7 +27,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.sdnc.sli.ConfigurationException;
+import org.onap.ccsdk.sli.core.sli.ConfigurationException;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;