Remove remaining references to openecomp

Remove remaining references to openecomp from properties and sample files

Change-Id: I985bae5e80ae130ffb512c9574f13172252bf6f8
Issue-ID: CCSDK-11
Signed-off-by: Dan Timoney <dtimoney@att.com>

4 files changed, 23 insertions, 27 deletions

diff --git a/sli/provider/pom.xml b/sli/provider/pom.xml
index df6c7bcd..25632f15 100755
--- a/sli/provider/pom.xml
+++ b/sli/provider/pom.xml
@@ -73,14 +73,10 @@
 						<Export-Package>org.onap.ccsdk.sli.core.sli.provider;version=${project.version}</Export-Package>
 
 						<DynamicImport-Package>*</DynamicImport-Package>
-					    <!--
-						<Import-Package>org.openecomp.sdnc.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.vim25.*,org.apache.xerces.*,com.mysql.jdbc.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*</Import-Package>
-                        -->
+
 
                         <Import-Package>org.onap.ccsdk.sli.core.sli;version="${project.version}",*</Import-Package>
-                        <!--
-						<Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|jcl-over-slf4j|xml-apis|mysql-connector-java</Embed-Dependency>
-						-->
+
 						<Embed-Dependency>*;scope=compile;artifactId=commons-lang|commons-lang3</Embed-Dependency>
 
 						<Embed-Transitive>true</Embed-Transitive>
diff --git a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicService.java b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicService.java
index cfba5866..22c475d8 100644
--- a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicService.java
+++ b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicService.java
@@ -7,9 +7,9 @@
  * 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.
@@ -26,9 +26,9 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 
 public interface SvcLogicService {
-	
-	public static final String NAME = "org.openecomp.sdnc.sli.provider.SvcLogicService";
-	
+
+	public static final String NAME = "org.onap.ccsdk.sli.core.sli.provider.SvcLogicService";
+
 	// public SvcLogicContext execute(SvcLogicGraph graph, SvcLogicContext ctx) throws SvcLogicException;
 	/**
 	 * Check for existence of a directed graph
@@ -40,10 +40,10 @@ public interface SvcLogicService {
 	 * @throws SvcLogicException
 	 */
 	public boolean hasGraph(String module, String rpc, String version, String mode) throws SvcLogicException;
-	
+
 	/**
 	 *  Execute a directed graph
-	 *  
+	 *
 	 * @param module - module name
 	 * @param rpc - rpc name
 	 * @param version - version.  If null, use active version
@@ -51,16 +51,16 @@ public interface SvcLogicService {
 	 * @param parms - parameters, used to set SvcLogicContext attributes
 	 * @return final values of attributes from SvcLogicContext, as Properties
 	 * @throws SvcLogicException
-	 * 
-	 * 
+	 *
+	 *
 	 *  @deprecated use execute(String module, String rpc, String version, String mode, DOMDataBroker dataBroker) instead
 	 */
 	@Deprecated
 	public Properties execute(String module, String rpc, String version, String mode, Properties parms) throws SvcLogicException;
-	
+
 	/**
 	 * Execute a directed graph
-	 *  
+	 *
 	 * @param module - module name
 	 * @param rpc - rpc name
 	 * @param version - version.  If null, use active version
@@ -71,5 +71,5 @@ public interface SvcLogicService {
 	 * @throws SvcLogicException
 	 */
 	public Properties execute(String module, String rpc, String version, String mode, Properties parms, DOMDataBroker domDataBroker) throws SvcLogicException;
-	
+
 }
diff --git a/sli/provider/src/test/resources/l3sdn_logic_v10.xml b/sli/provider/src/test/resources/l3sdn_logic_v10.xml
index 56e1a81e..3bf8ef68 100644
--- a/sli/provider/src/test/resources/l3sdn_logic_v10.xml
+++ b/sli/provider/src/test/resources/l3sdn_logic_v10.xml
@@ -18,9 +18,9 @@
   -->
 
 
-<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic"
+<service-logic xmlns="http://www.onap.org/sdnc/svclogic"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd"
+    xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd"
     module="neutron" version="1.0.0">
 
     <method rpc="canCreateNetwork" mode="sync">
diff --git a/sli/provider/src/test/resources/svclogic.properties b/sli/provider/src/test/resources/svclogic.properties
index fa7a2041..df814e01 100644
--- a/sli/provider/src/test/resources/svclogic.properties
+++ b/sli/provider/src/test/resources/svclogic.properties
@@ -7,9 +7,9 @@
 # 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.
@@ -18,8 +18,8 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.sdnc.sli.dbtype = jdbc
-org.openecomp.sdnc.sli.jdbc.url = jdbc:mysql://localhost: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.dbtype = jdbc
+org.onap.ccsdk.sli.jdbc.url = jdbc:mysql://localhost:3306/sdnctl
+org.onap.ccsdk.sli.jdbc.database = sdnctl
+org.onap.ccsdk.sli.jdbc.user = sdnctl
+org.onap.ccsdk.sli.jdbc.password = gamma