summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--example-settings.xml28
-rw-r--r--jenkins-settings.xml28
-rwxr-xr-xpom.xml20
-rw-r--r--properties-node/features/src/main/resources/features.xml2
-rw-r--r--properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/PropertiesNode.java (renamed from properties-node/provider/src/main/java/org/openecomp/sdnc/prop/PropertiesNode.java)2
-rw-r--r--properties-node/provider/src/main/resources/META-INF/spring/properties-node-context.xml2
-rw-r--r--properties-node/provider/src/main/resources/META-INF/spring/properties-node-osgi-context.xml2
-rw-r--r--restapi-call-node/features/src/main/resources/features.xml2
-rwxr-xr-xrestapi-call-node/provider/pom.xml2
-rw-r--r--restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/Format.java (renamed from restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/Format.java)2
-rw-r--r--restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/HttpMethod.java (renamed from restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/HttpMethod.java)2
-rw-r--r--restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/HttpResponse.java (renamed from restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/HttpResponse.java)2
-rw-r--r--restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/JsonParser.java (renamed from restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/JsonParser.java)2
-rw-r--r--restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/Parameters.java (renamed from restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/Parameters.java)2
-rw-r--r--restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RestapiCallNode.java (renamed from restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/RestapiCallNode.java)2
-rw-r--r--restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryException.java (renamed from restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/RetryException.java)2
-rw-r--r--restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicy.java (renamed from restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/RetryPolicy.java)2
-rw-r--r--restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicyStore.java (renamed from restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/RetryPolicyStore.java)2
-rw-r--r--restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java (renamed from restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/XmlJsonUtil.java)2
-rw-r--r--restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlParser.java (renamed from restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/XmlParser.java)2
-rw-r--r--restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-context.xml4
-rw-r--r--restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-osgi-context.xml2
-rw-r--r--restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestJsonParser.java (renamed from restapi-call-node/provider/src/test/java/jtest/org/openecomp/sdnc/restapicall/TestJsonParser.java)4
-rw-r--r--restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestRestapiCallNode.java (renamed from restapi-call-node/provider/src/test/java/jtest/org/openecomp/sdnc/restapicall/TestRestapiCallNode.java)4
-rw-r--r--restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestXmlJsonUtil.java (renamed from restapi-call-node/provider/src/test/java/jtest/org/openecomp/sdnc/restapicall/TestXmlJsonUtil.java)4
-rw-r--r--restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestXmlParser.java (renamed from restapi-call-node/provider/src/test/java/jtest/org/openecomp/sdnc/restapicall/TestXmlParser.java)4
-rw-r--r--restapi-call-node/provider/src/test/resources/test.xml12
-rw-r--r--restapi-call-node/provider/src/test/resources/test3.xml4
28 files changed, 74 insertions, 74 deletions
diff --git a/example-settings.xml b/example-settings.xml
index 2e7ce644..06c84eb6 100644
--- a/example-settings.xml
+++ b/example-settings.xml
@@ -13,11 +13,11 @@
<profiles>
<profile>
- <id>openecomp-release</id>
+ <id>onap-release</id>
<repositories>
<repository>
- <id>openecomp-release</id>
- <name>openecomp-release</name>
+ <id>onap-release</id>
+ <name>onap-release</name>
<url>https://ecomp-nexus:8443/repository/maven-releases/</url>
<releases>
<enabled>true</enabled>
@@ -30,8 +30,8 @@
</repositories>
<pluginRepositories>
<pluginRepository>
- <id>openecomp-release</id>
- <name>openecomp-release</name>
+ <id>onap-release</id>
+ <name>onap-release</name>
<url>https://ecomp-nexus:8443/repository/maven-releases/</url>
<releases>
<enabled>true</enabled>
@@ -45,11 +45,11 @@
</profile>
<profile>
- <id>openecomp-snapshots</id>
+ <id>onap-snapshots</id>
<repositories>
<repository>
- <id>openecomp-snapshot</id>
- <name>openecomp-snapshot</name>
+ <id>onap-snapshot</id>
+ <name>onap-snapshot</name>
<url>https://ecomp-nexus:8443/repository/maven-snapshots/</url>
<releases>
<enabled>false</enabled>
@@ -61,8 +61,8 @@
</repositories>
<pluginRepositories>
<pluginRepository>
- <id>openecomp-snapshot</id>
- <name>openecomp-snapshot</name>
+ <id>onap-snapshot</id>
+ <name>onap-snapshot</name>
<url>https://ecomp-nexus:8443/repository/maven-snapshots/</url>
<releases>
<enabled>false</enabled>
@@ -137,8 +137,8 @@
</profiles>
<activeProfiles>
- <activeProfile>openecomp-release</activeProfile>
- <activeProfile>openecomp-snapshots</activeProfile>
+ <activeProfile>onap-release</activeProfile>
+ <activeProfile>onap-snapshots</activeProfile>
<activeProfile>opendaylight-release</activeProfile>
<activeProfile>opendaylight-snapshots</activeProfile>
</activeProfiles>
@@ -150,12 +150,12 @@
<password>PASSWORD</password>
</server>
<server>
- <id>openecomp-release</id>
+ <id>onap-release</id>
<username>USERNAME</username>
<password>PASSWORD</password>
</server>
<server>
- <id>openecomp-snapshot</id>
+ <id>onap-snapshot</id>
<username>USERNAME</username>
<password>PASSWORD</password>
</server>
diff --git a/jenkins-settings.xml b/jenkins-settings.xml
index 344994f8..88f9805f 100644
--- a/jenkins-settings.xml
+++ b/jenkins-settings.xml
@@ -13,11 +13,11 @@
<profiles>
<profile>
- <id>openecomp-release</id>
+ <id>onap-release</id>
<repositories>
<repository>
- <id>openecomp-release</id>
- <name>openecomp-release</name>
+ <id>onap-release</id>
+ <name>onap-release</name>
<url>https://ecomp-nexus:8443/repository/maven-releases/</url>
<releases>
<enabled>true</enabled>
@@ -30,8 +30,8 @@
</repositories>
<pluginRepositories>
<pluginRepository>
- <id>openecomp-release</id>
- <name>openecomp-release</name>
+ <id>onap-release</id>
+ <name>onap-release</name>
<url>https://ecomp-nexus:8443/repository/maven-releases/</url>
<releases>
<enabled>true</enabled>
@@ -45,11 +45,11 @@
</profile>
<profile>
- <id>openecomp-snapshots</id>
+ <id>onap-snapshots</id>
<repositories>
<repository>
- <id>openecomp-snapshot</id>
- <name>openecomp-snapshot</name>
+ <id>onap-snapshot</id>
+ <name>onap-snapshot</name>
<url>https://ecomp-nexus:8443/repository/maven-snapshots/</url>
<releases>
<enabled>false</enabled>
@@ -61,8 +61,8 @@
</repositories>
<pluginRepositories>
<pluginRepository>
- <id>openecomp-snapshot</id>
- <name>openecomp-snapshot</name>
+ <id>onap-snapshot</id>
+ <name>onap-snapshot</name>
<url>https://ecomp-nexus:8443/repository/maven-snapshots/</url>
<releases>
<enabled>false</enabled>
@@ -137,8 +137,8 @@
</profiles>
<activeProfiles>
- <activeProfile>openecomp-release</activeProfile>
- <activeProfile>openecomp-snapshots</activeProfile>
+ <activeProfile>onap-release</activeProfile>
+ <activeProfile>onap-snapshots</activeProfile>
<activeProfile>opendaylight-release</activeProfile>
<activeProfile>opendaylight-snapshots</activeProfile>
</activeProfiles>
@@ -150,12 +150,12 @@
<password>${ecomp.nexus.password}</password>
</server>
<server>
- <id>openecomp-release</id>
+ <id>onap-release</id>
<username>${ecomp.nexus.user}</username>
<password>${ecomp.nexus.password}</password>
</server>
<server>
- <id>openecomp-snapshot</id>
+ <id>onap-snapshot</id>
<username>${ecomp.nexus.user}</username>
<password>${ecomp.nexus.password}</password>
</server>
diff --git a/pom.xml b/pom.xml
index 96436f7e..215f173f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -14,33 +14,33 @@
<artifactId>sdnc-plugins</artifactId>
<name>SDN-C Java Plugins</name>
- <url>https://wiki.openecomp.org</url>
+ <url>https://wiki.onap.org</url>
<description>The SDN-C core components contains the SLI, dblib and root pom</description>
<issueManagement>
<system>JIRA</system>
- <url>https://jira.openecomp.org/</url>
+ <url>https://jira.onap.org/</url>
</issueManagement>
<scm>
- <connection>scm:git:ssh://git@${openecomp.git.host}/sdnc-plugins.git</connection>
- <developerConnection>scm:git:ssh://${openecomp.git.host}:${openecomp.git.port}/${openecomp.git.project}/sdnc-iplugins.git</developerConnection>
- <url>${openecomp.git.protocol}://${openecomp.git.host}/projects/${openecomp.git.project}/repos/sdnc-plugins/browse</url>
+ <connection>scm:git:ssh://git@${onap.git.host}/ccsdk/sli/plugins.git</connection>
+ <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/ccsdk/sli/plugins.git</developerConnection>
+ <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/ccsdk/sli/plugins/browse</url>
<tag>HEAD</tag>
</scm>
<ciManagement>
<system>Jenkins</system>
- <url>https://jenkins.openecomp.org</url>
+ <url>https://jenkins.onap.org</url>
</ciManagement>
<distributionManagement>
<site>
<id>sdnc-javadoc</id>
- <url>dav:https://${openecomp.nexus.host}/content/sites/site/org/onap/sdnc/plugins/${project.artifactId}/${project.version}</url>
+ <url>dav:https://${onap.nexus.host}/content/sites/site/org/onap/sdnc/plugins/${project.artifactId}/${project.version}</url>
</site>
</distributionManagement>
@@ -97,9 +97,9 @@
<version>1.6.7</version>
<extensions>true</extensions>
<configuration>
- <nexusUrl>https://${openecomp.nexus.host}</nexusUrl>
- <stagingProfileId>${openecomp.nexus.staging.profile-id}</stagingProfileId>
- <serverId>${openecomp.nexus.staging.server-id}</serverId>
+ <nexusUrl>https://${onap.nexus.host}</nexusUrl>
+ <stagingProfileId>${onap.nexus.staging.profile-id}</stagingProfileId>
+ <serverId>${onap.nexus.staging.server-id}</serverId>
</configuration>
</plugin>
</plugins>
diff --git a/properties-node/features/src/main/resources/features.xml b/properties-node/features/src/main/resources/features.xml
index e89b333e..2ed98a12 100644
--- a/properties-node/features/src/main/resources/features.xml
+++ b/properties-node/features/src/main/resources/features.xml
@@ -32,7 +32,7 @@
<feature version="${sdnctl.sli.version}">sdnc-sli</feature>
<feature>spring</feature>
<feature>spring-dm</feature>
- <bundle>mvn:org.openecomp.sdnc.plugins/properties-node-provider/${project.version}
+ <bundle>mvn:org.onap.ccsdk.sli.plugins/properties-node-provider/${project.version}
</bundle>
</feature>
diff --git a/properties-node/provider/src/main/java/org/openecomp/sdnc/prop/PropertiesNode.java b/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/PropertiesNode.java
index 9856b194..aa566306 100644
--- a/properties-node/provider/src/main/java/org/openecomp/sdnc/prop/PropertiesNode.java
+++ b/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/PropertiesNode.java
@@ -19,7 +19,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdnc.prop;
+package org.onap.ccsdk.sli.plugins.prop;
import java.io.FileInputStream;
import java.io.IOException;
diff --git a/properties-node/provider/src/main/resources/META-INF/spring/properties-node-context.xml b/properties-node/provider/src/main/resources/META-INF/spring/properties-node-context.xml
index a53ea141..048acc4a 100644
--- a/properties-node/provider/src/main/resources/META-INF/spring/properties-node-context.xml
+++ b/properties-node/provider/src/main/resources/META-INF/spring/properties-node-context.xml
@@ -26,7 +26,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="propertiesNode" class="org.openecomp.sdnc.prop.PropertiesNode">
+ <bean id="propertiesNode" class="org.onap.ccsdk.sli.plugins.prop.PropertiesNode">
</bean>
</beans>
diff --git a/properties-node/provider/src/main/resources/META-INF/spring/properties-node-osgi-context.xml b/properties-node/provider/src/main/resources/META-INF/spring/properties-node-osgi-context.xml
index 7d74fd4f..ce17a461 100644
--- a/properties-node/provider/src/main/resources/META-INF/spring/properties-node-osgi-context.xml
+++ b/properties-node/provider/src/main/resources/META-INF/spring/properties-node-osgi-context.xml
@@ -27,6 +27,6 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
- <service ref="propertiesNode" interface="org.openecomp.sdnc.prop.PropertiesNode" />
+ <service ref="propertiesNode" interface="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" />
</beans:beans>
diff --git a/restapi-call-node/features/src/main/resources/features.xml b/restapi-call-node/features/src/main/resources/features.xml
index 648e6f78..dbbe1b1c 100644
--- a/restapi-call-node/features/src/main/resources/features.xml
+++ b/restapi-call-node/features/src/main/resources/features.xml
@@ -34,7 +34,7 @@
<feature>spring-dm</feature>
<bundle>mvn:com.sun.jersey/jersey-client/${jersey.version}</bundle>
<bundle>mvn:org.codehaus.jettison/jettison/${jettison.version}</bundle>
- <bundle>mvn:org.openecomp.sdnc.plugins/restapi-call-node-provider/${project.version}</bundle>
+ <bundle>mvn:org.onap.ccsdk.sli.plugins/restapi-call-node-provider/${project.version}</bundle>
</feature>
</features>
diff --git a/restapi-call-node/provider/pom.xml b/restapi-call-node/provider/pom.xml
index f864c291..4b328d3d 100755
--- a/restapi-call-node/provider/pom.xml
+++ b/restapi-call-node/provider/pom.xml
@@ -85,7 +85,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>org.onap.ccsdk.sli.restapicall</Bundle-SymbolicName>
- <Export-Package>org.openecomp.sdnc.restapicall</Export-Package>
+ <Export-Package>org.onap.ccsdk.sli.plugins.restapicall</Export-Package>
<Import-Package>*</Import-Package>
</instructions>
diff --git a/restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/Format.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/Format.java
index 52086255..249378a0 100644
--- a/restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/Format.java
+++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/Format.java
@@ -19,7 +19,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdnc.restapicall;
+package org.onap.ccsdk.sli.plugins.restapicall;
public enum Format {
JSON, XML;
diff --git a/restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/HttpMethod.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/HttpMethod.java
index 059074bf..e991a72b 100644
--- a/restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/HttpMethod.java
+++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/HttpMethod.java
@@ -19,7 +19,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdnc.restapicall;
+package org.onap.ccsdk.sli.plugins.restapicall;
public enum HttpMethod {
GET, POST, PUT, DELETE, PATCH;
diff --git a/restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/HttpResponse.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/HttpResponse.java
index 761e4264..9fe449c7 100644
--- a/restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/HttpResponse.java
+++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/HttpResponse.java
@@ -19,7 +19,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdnc.restapicall;
+package org.onap.ccsdk.sli.plugins.restapicall;
import javax.ws.rs.core.MultivaluedMap;
diff --git a/restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/JsonParser.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/JsonParser.java
index 27e9a82e..2a971607 100644
--- a/restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/JsonParser.java
+++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/JsonParser.java
@@ -19,7 +19,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdnc.restapicall;
+package org.onap.ccsdk.sli.plugins.restapicall;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/Parameters.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/Parameters.java
index 0cba4e6b..8d1335cc 100644
--- a/restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/Parameters.java
+++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/Parameters.java
@@ -19,7 +19,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdnc.restapicall;
+package org.onap.ccsdk.sli.plugins.restapicall;
import java.util.Set;
diff --git a/restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/RestapiCallNode.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RestapiCallNode.java
index b7598480..9de11fb0 100644
--- a/restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/RestapiCallNode.java
+++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RestapiCallNode.java
@@ -19,7 +19,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdnc.restapicall;
+package org.onap.ccsdk.sli.plugins.restapicall;
import java.io.FileInputStream;
import java.net.URI;
diff --git a/restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/RetryException.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryException.java
index bf6ccc05..2a800281 100644
--- a/restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/RetryException.java
+++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryException.java
@@ -19,7 +19,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdnc.restapicall;
+package org.onap.ccsdk.sli.plugins.restapicall;
public class RetryException extends Exception {
diff --git a/restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/RetryPolicy.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicy.java
index 2a27a1d0..3059a445 100644
--- a/restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/RetryPolicy.java
+++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicy.java
@@ -19,7 +19,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdnc.restapicall;
+package org.onap.ccsdk.sli.plugins.restapicall;
public class RetryPolicy {
private String[] hostnames;
diff --git a/restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/RetryPolicyStore.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicyStore.java
index baf60d2e..18ec2fb7 100644
--- a/restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/RetryPolicyStore.java
+++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicyStore.java
@@ -19,7 +19,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdnc.restapicall;
+package org.onap.ccsdk.sli.plugins.restapicall;
import java.util.HashMap;
diff --git a/restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/XmlJsonUtil.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java
index 66bf08b3..5131c874 100644
--- a/restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/XmlJsonUtil.java
+++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java
@@ -19,7 +19,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdnc.restapicall;
+package org.onap.ccsdk.sli.plugins.restapicall;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/XmlParser.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlParser.java
index e90a44fb..7a324376 100644
--- a/restapi-call-node/provider/src/main/java/org/openecomp/sdnc/restapicall/XmlParser.java
+++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlParser.java
@@ -19,7 +19,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdnc.restapicall;
+package org.onap.ccsdk.sli.plugins.restapicall;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
diff --git a/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-context.xml b/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-context.xml
index a7b1a892..583563bc 100644
--- a/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-context.xml
+++ b/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-context.xml
@@ -38,12 +38,12 @@
<!-- context:property-placeholder location="file:${SDNC_CONFIG_DIR}/ueb.properties" /-->
- <bean id="restapiCallNode" class="org.openecomp.sdnc.restapicall.RestapiCallNode">
+ <bean id="restapiCallNode" class="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode">
<property name="uebServers" value="${servers}" />
<property name="retryPolicyStore" ref="retryPolicyStore"/>
</bean>
- <bean id="retryPolicyStore" class="org.openecomp.sdnc.restapicall.RetryPolicyStore">
+ <bean id="retryPolicyStore" class="org.onap.ccsdk.sli.plugins.restapicall.RetryPolicyStore">
<property name="proxyServers" value="${proxyUrl}" />
</bean>
</beans>
diff --git a/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-osgi-context.xml b/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-osgi-context.xml
index 09e3de78..7b74a899 100644
--- a/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-osgi-context.xml
+++ b/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-osgi-context.xml
@@ -27,6 +27,6 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
- <service ref="restapiCallNode" interface="org.openecomp.sdnc.restapicall.RestapiCallNode" />
+ <service ref="restapiCallNode" interface="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" />
</beans:beans>
diff --git a/restapi-call-node/provider/src/test/java/jtest/org/openecomp/sdnc/restapicall/TestJsonParser.java b/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestJsonParser.java
index 16fa6859..a32b2f28 100644
--- a/restapi-call-node/provider/src/test/java/jtest/org/openecomp/sdnc/restapicall/TestJsonParser.java
+++ b/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestJsonParser.java
@@ -19,7 +19,7 @@
* ============LICENSE_END=========================================================
*/
-package jtest.org.openecomp.sdnc.restapicall;
+package jtest.org.onap.ccsdk.sli.plugins.restapicall;
import java.io.BufferedReader;
import java.io.InputStreamReader;
@@ -29,7 +29,7 @@ import java.util.List;
import java.util.Map;
import org.junit.Test;
-import org.openecomp.sdnc.restapicall.JsonParser;
+import org.onap.ccsdk.sli.plugins.restapicall.JsonParser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/restapi-call-node/provider/src/test/java/jtest/org/openecomp/sdnc/restapicall/TestRestapiCallNode.java b/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestRestapiCallNode.java
index e0e58ad5..318a0a24 100644
--- a/restapi-call-node/provider/src/test/java/jtest/org/openecomp/sdnc/restapicall/TestRestapiCallNode.java
+++ b/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestRestapiCallNode.java
@@ -19,14 +19,14 @@
* ============LICENSE_END=========================================================
*/
-package jtest.org.openecomp.sdnc.restapicall;
+package jtest.org.onap.ccsdk.sli.plugins.restapicall;
import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
-import org.openecomp.sdnc.restapicall.RestapiCallNode;
+import org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/restapi-call-node/provider/src/test/java/jtest/org/openecomp/sdnc/restapicall/TestXmlJsonUtil.java b/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestXmlJsonUtil.java
index dbcf98a9..0346690a 100644
--- a/restapi-call-node/provider/src/test/java/jtest/org/openecomp/sdnc/restapicall/TestXmlJsonUtil.java
+++ b/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestXmlJsonUtil.java
@@ -19,14 +19,14 @@
* ============LICENSE_END=========================================================
*/
-package jtest.org.openecomp.sdnc.restapicall;
+package jtest.org.onap.ccsdk.sli.plugins.restapicall;
import java.util.HashMap;
import java.util.Map;
import org.junit.Assert;
import org.junit.Test;
-import org.openecomp.sdnc.restapicall.XmlJsonUtil;
+import org.onap.ccsdk.sli.plugins.restapicall.XmlJsonUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/restapi-call-node/provider/src/test/java/jtest/org/openecomp/sdnc/restapicall/TestXmlParser.java b/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestXmlParser.java
index 980eded4..a6d3d59e 100644
--- a/restapi-call-node/provider/src/test/java/jtest/org/openecomp/sdnc/restapicall/TestXmlParser.java
+++ b/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestXmlParser.java
@@ -19,7 +19,7 @@
* ============LICENSE_END=========================================================
*/
-package jtest.org.openecomp.sdnc.restapicall;
+package jtest.org.onap.ccsdk.sli.plugins.restapicall;
import java.io.BufferedReader;
import java.io.InputStreamReader;
@@ -31,7 +31,7 @@ import java.util.Map;
import java.util.Set;
import org.junit.Test;
-import org.openecomp.sdnc.restapicall.XmlParser;
+import org.onap.ccsdk.sli.plugins.restapicall.XmlParser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/restapi-call-node/provider/src/test/resources/test.xml b/restapi-call-node/provider/src/test/resources/test.xml
index 76205dde..330064ea 100644
--- a/restapi-call-node/provider/src/test/resources/test.xml
+++ b/restapi-call-node/provider/src/test/resources/test.xml
@@ -23,7 +23,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.sdnctl</groupId>
+ <groupId>org.onap.ccsdk.sli.plugins</groupId>
<artifactId>restapi-call-node</artifactId>
<version>6.0.0-SNAPSHOT</version>
</parent>
@@ -47,12 +47,12 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.openecomp.sdnctl</groupId>
+ <groupId>org.onap.ccsdk.sli</groupId>
<artifactId>sli-common</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.openecomp.sdnctl</groupId>
+ <groupId>org.onap.ccsdk.sli</groupId>
<artifactId>sli-provider</artifactId>
<scope>compile</scope>
</dependency>
@@ -99,7 +99,7 @@
<groupId>com.brocade.developer</groupId>
<artifactId>providermodule-plugin</artifactId>
<configuration>
- <packageId>org.openecomp.sdnctl</packageId>
+ <packageId>org.onap.ccsdk.sli.plugins</packageId>
<appName>restapi-call-node</appName>
</configuration>
<executions>
@@ -119,8 +119,8 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-SymbolicName>org.openecomp.sdnc.restapicall</Bundle-SymbolicName>
- <Export-Package>org.openecomp.sdnc.restapicall</Export-Package>
+ <Bundle-SymbolicName>org.onap.ccsdk.sli.plugins.restapicall</Bundle-SymbolicName>
+ <Export-Package>org.onap.ccsdk.sli.plugins.restapicall</Export-Package>
<Import-Package>*</Import-Package>
</instructions>
diff --git a/restapi-call-node/provider/src/test/resources/test3.xml b/restapi-call-node/provider/src/test/resources/test3.xml
index 2bf3be35..92116163 100644
--- a/restapi-call-node/provider/src/test/resources/test3.xml
+++ b/restapi-call-node/provider/src/test/resources/test3.xml
@@ -20,8 +20,8 @@
============LICENSE_END=========================================================
-->
-<ApplyGroupResponse xmlns="http://openecomp.org/vpn/schema/v1"
- xmlns:ns2="http://openecomp.org/prov/vpn/schema/v2">
+<ApplyGroupResponse xmlns="http://onap.org/vpn/schema/v1"
+ xmlns:ns2="http://onap.org/prov/vpn/schema/v2">
<ApplyGroupResponseData>
<ServiceInstanceId>ICOREPVC-81114561</ServiceInstanceId>
<VrfDetails>