diff options
author | Stilwell, David (stilwelld) <stilwelld@att.com> | 2017-08-10 00:50:12 +0000 |
---|---|---|
committer | Stilwell, David (stilwelld) <stilwelld@att.com> | 2017-08-10 14:57:42 +0000 |
commit | 4515ffa52bc89b1bf40c791749fe518930441d82 (patch) | |
tree | d11fc5588a07a519df2b58db194e79d50a508580 /restapi-call-node/provider | |
parent | 7dbb6441c95aa5691a59dc918f864b4bf4e2e2ed (diff) |
Refactor plugins to org onap ccsdk
Refactor code to use new package name org.onap.ccsdk.sli.plugins
Change-Id: Ia5399b21e95d556890aef5ad27437f1ac120ef8d
Issue-ID: CCSDK-21
Signed-off-by: Stilwell, David (stilwelld) <stilwelld@att.com>
Diffstat (limited to 'restapi-call-node/provider')
-rwxr-xr-x | restapi-call-node/provider/pom.xml | 2 | ||||
-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.xml | 4 | ||||
-rw-r--r-- | restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-osgi-context.xml | 2 | ||||
-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.xml | 12 | ||||
-rw-r--r-- | restapi-call-node/provider/src/test/resources/test3.xml | 4 |
20 files changed, 31 insertions, 31 deletions
diff --git a/restapi-call-node/provider/pom.xml b/restapi-call-node/provider/pom.xml index f864c2914..4b328d3d0 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 52086255f..249378a06 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 059074bf9..e991a72b3 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 761e4264e..9fe449c75 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 27e9a82ef..2a9716079 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 0cba4e6b1..8d1335cc5 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 b7598480c..9de11fb0a 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 bf6ccc056..2a8002819 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 2a27a1d02..3059a4457 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 baf60d2e8..18ec2fb76 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 66bf08b3d..5131c8745 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 e90a44fb8..7a3243762 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 a7b1a8923..583563bc0 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 09e3de783..7b74a899f 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 16fa68594..a32b2f286 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 e0e58ad50..318a0a248 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 dbcf98a98..0346690a2 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 980eded4e..a6d3d59ef 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 76205ddec..330064eab 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 2bf3be356..921161639 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> |