From: Marcus G K Williams <marcus.williams@intel.com>
Date: Wed, 16 Aug 2017 02:13:35 +0000 (-0700)
Subject: Update sli-adaptor/mdsal-resource package names
X-Git-Tag: v0.1.0~51
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=448566611416c33d58dbd73d40f9bdc1acf40404;p=ccsdk%2Fsli%2Fadaptors.git

Update sli-adaptor/mdsal-resource package names

Update package
names from org.openecomp.sdnc.adaptors.* ->
onap.ccsdk.sli.adaptors.* Update groupIds from
org.openecomp.sdnc.adaptors -> onap.ccsdk.sli.adaptors

Issue-Id: CCSDK-19
Change-Id: I4aba920e51de27c47b1f936ccb3fc89fa81ed4b0
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
---

diff --git a/mdsal-resource/features/src/main/resources/features.xml b/mdsal-resource/features/src/main/resources/features.xml
index 85aa6304..5a2bae1b 100644
--- a/mdsal-resource/features/src/main/resources/features.xml
+++ b/mdsal-resource/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.adaptors/mdsal-resource-provider/${project.version}</bundle>
+        <bundle>mvn:org.onap.ccsdk.sli.adaptors/mdsal-resource-provider/${project.version}</bundle>
     </feature>
 
 </features>
diff --git a/mdsal-resource/provider/pom.xml b/mdsal-resource/provider/pom.xml
index 4ab921a8..5a61d762 100755
--- a/mdsal-resource/provider/pom.xml
+++ b/mdsal-resource/provider/pom.xml
@@ -66,10 +66,10 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>org.openecomp.sdnc.sli.resource.mdsal</Bundle-SymbolicName>
-                        <Bundle-Activator>org.openecomp.sdnc.sli.resource.mdsal.MdsalResourceActivator</Bundle-Activator>
-                        <Export-Package>org.openecomp.sdnc.sli.resource.mdsal</Export-Package>
-                        <Import-Package>org.openecomp.sdnc.sli.*,org.osgi.framework.*,org.slf4j.*,com.mysql.jdbc.*</Import-Package>
+                        <Bundle-SymbolicName>org.onap.ccsdk.sli.adaptors.resource.mdsal</Bundle-SymbolicName>
+                        <Bundle-Activator>org.onap.ccsdk.sli.adaptors.resource.mdsal.MdsalResourceActivator</Bundle-Activator>
+                        <Export-Package>org.onap.ccsdk.sli.adaptors.resource.mdsal</Export-Package>
+                        <Import-Package>org.onap.ccsdk.sli.adaptors.*,org.osgi.framework.*,org.slf4j.*,com.mysql.jdbc.*</Import-Package>
                         <!-- <Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mysql-connector-java|xml-apis</Embed-Dependency> -->
                         <Import-Package>*</Import-Package>
                         <Embed-Transitive>true</Embed-Transitive>
diff --git a/mdsal-resource/provider/src/main/java/org/openecomp/sdnc/sli/resource/mdsal/ConfigResource.java b/mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/ConfigResource.java
similarity index 98%
rename from mdsal-resource/provider/src/main/java/org/openecomp/sdnc/sli/resource/mdsal/ConfigResource.java
rename to mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/ConfigResource.java
index 344707f4..9cade887 100644
--- a/mdsal-resource/provider/src/main/java/org/openecomp/sdnc/sli/resource/mdsal/ConfigResource.java
+++ b/mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/ConfigResource.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.resource.mdsal;
+package org.onap.ccsdk.sli.adaptors.resource.mdsal;
 
 import java.util.Map;
 
diff --git a/mdsal-resource/provider/src/main/java/org/openecomp/sdnc/sli/resource/mdsal/MdsalResourceActivator.java b/mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/MdsalResourceActivator.java
similarity index 84%
rename from mdsal-resource/provider/src/main/java/org/openecomp/sdnc/sli/resource/mdsal/MdsalResourceActivator.java
rename to mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/MdsalResourceActivator.java
index 7f6e7fc5..004e6822 100644
--- a/mdsal-resource/provider/src/main/java/org/openecomp/sdnc/sli/resource/mdsal/MdsalResourceActivator.java
+++ b/mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/MdsalResourceActivator.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.resource.mdsal;
+package org.onap.ccsdk.sli.adaptors.resource.mdsal;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -76,11 +76,11 @@ public class MdsalResourceActivator implements BundleActivator {
 
         }
 
-        String sdncUser = props.getProperty("org.openecomp.sdnc.sli.resource.mdsal.sdnc-user", "admin");
-        String sdncPasswd = props.getProperty("org.openecomp.sdnc.sli.resource.mdsal.sdnc-passwd", "admin");
-        String sdncHost = props.getProperty("org.openecomp.sdnc.sli.resource.mdsal.sdnc-host", "localhost");
-        String sdncProtocol = props.getProperty("org.openecomp.sdnc.sli.resource.mdsal.sdnc-protocol", "https");
-        String sdncPort = props.getProperty("org.openecomp.sdnc.sli.resource.mdsal.sdnc-port", "8443");
+        String sdncUser = props.getProperty("org.onap.ccsdk.sli.adaptors.resource.mdsal.sdnc-user", "admin");
+        String sdncPasswd = props.getProperty("org.onap.ccsdk.sli.adaptors.resource.mdsal.sdnc-passwd", "admin");
+        String sdncHost = props.getProperty("org.onap.ccsdk.sli.adaptors.resource.mdsal.sdnc-host", "localhost");
+        String sdncProtocol = props.getProperty("org.onap.ccsdk.sli.adaptors.resource.mdsal.sdnc-protocol", "https");
+        String sdncPort = props.getProperty("org.onap.ccsdk.sli.adaptors.resource.mdsal.sdnc-port", "8443");
 
         // Advertise MD-SAL resource adaptors
         SvcLogicResource impl = new ConfigResource(sdncProtocol, sdncHost, sdncPort, sdncUser, sdncPasswd);
diff --git a/mdsal-resource/provider/src/main/java/org/openecomp/sdnc/sli/resource/mdsal/OperationalResource.java b/mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/OperationalResource.java
similarity index 98%
rename from mdsal-resource/provider/src/main/java/org/openecomp/sdnc/sli/resource/mdsal/OperationalResource.java
rename to mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/OperationalResource.java
index 5d6ee066..92a7b6be 100644
--- a/mdsal-resource/provider/src/main/java/org/openecomp/sdnc/sli/resource/mdsal/OperationalResource.java
+++ b/mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/OperationalResource.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.resource.mdsal;
+package org.onap.ccsdk.sli.adaptors.resource.mdsal;
 
 import java.util.Map;
 
diff --git a/mdsal-resource/provider/src/main/java/org/openecomp/sdnc/sli/resource/mdsal/RestService.java b/mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/RestService.java
similarity index 99%
rename from mdsal-resource/provider/src/main/java/org/openecomp/sdnc/sli/resource/mdsal/RestService.java
rename to mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/RestService.java
index 21e7514b..2991e6be 100644
--- a/mdsal-resource/provider/src/main/java/org/openecomp/sdnc/sli/resource/mdsal/RestService.java
+++ b/mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/RestService.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.resource.mdsal;
+package org.onap.ccsdk.sli.adaptors.resource.mdsal;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
diff --git a/mdsal-resource/provider/src/main/resources/svclogic.properties b/mdsal-resource/provider/src/main/resources/svclogic.properties
index 887697bd..0abadc5c 100644
--- a/mdsal-resource/provider/src/main/resources/svclogic.properties
+++ b/mdsal-resource/provider/src/main/resources/svclogic.properties
@@ -19,8 +19,8 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.sdnc.sli.dbtype = jdbc
-org.openecomp.sdnc.sli.jdbc.url = jdbc:mysql://dbhost:3306/sdnctl
-org.openecomp.sdnc.sli.jdbc.database = sdnctl
-org.openecomp.sdnc.sli.jdbc.user = sdnctl
-org.openecomp.sdnc.sli.jdbc.password = gamma
+org.onap.ccsdk.sli.adaptors.dbtype = jdbc
+org.onap.ccsdk.sli.adaptors.jdbc.url = jdbc:mysql://dbhost:3306/sdnctl
+org.onap.ccsdk.sli.adaptors.jdbc.database = sdnctl
+org.onap.ccsdk.sli.adaptors.jdbc.user = sdnctl
+org.onap.ccsdk.sli.adaptors.jdbc.password = gamma