Merge "Renaming openecomp to onap"

13 files changed, 26 insertions, 20 deletions

diff --git a/pom.xml b/pom.xml
index 22c5ef0..a50fb2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
-	<groupId>org.openecomp.aai</groupId>
+	<groupId>org.onap.aai</groupId>
 	<artifactId>rest-client</artifactId>
 	<version>1.1.0-SNAPSHOT</version>
 	<name>aai-rest-client</name>
diff --git a/src/main/java/org/openecomp/restclient/client/Headers.java b/src/main/java/org/onap/aai/restclient/client/Headers.java
index 988a068..56903bc 100644
--- a/src/main/java/org/openecomp/restclient/client/Headers.java
+++ b/src/main/java/org/onap/aai/restclient/client/Headers.java
@@ -20,7 +20,7 @@
  *

  * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  */

-package org.openecomp.restclient.client;

+package org.onap.aai.restclient.client;

 

 public final class Headers {

 

diff --git a/src/main/java/org/openecomp/restclient/client/OperationResult.java b/src/main/java/org/onap/aai/restclient/client/OperationResult.java
index 2c2cfe2..ad11863 100644
--- a/src/main/java/org/openecomp/restclient/client/OperationResult.java
+++ b/src/main/java/org/onap/aai/restclient/client/OperationResult.java
@@ -20,7 +20,7 @@
  *

  * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  */

-package org.openecomp.restclient.client;

+package org.onap.aai.restclient.client;

 

 import javax.ws.rs.core.MultivaluedMap;

 

diff --git a/src/main/java/org/openecomp/restclient/client/RestClient.java b/src/main/java/org/onap/aai/restclient/client/RestClient.java
index 2912909..02f12b1 100644
--- a/src/main/java/org/openecomp/restclient/client/RestClient.java
+++ b/src/main/java/org/onap/aai/restclient/client/RestClient.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.restclient.client;
+package org.onap.aai.restclient.client;
 
 import java.io.ByteArrayOutputStream;
 import java.text.SimpleDateFormat;
@@ -36,15 +36,15 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
 
+import org.onap.aai.restclient.enums.RestAuthenticationMode;
+import org.onap.aai.restclient.logging.RestClientMsgs;
+import org.onap.aai.restclient.rest.RestClientBuilder;
 import org.openecomp.cl.api.LogFields;
 import org.openecomp.cl.api.LogLine;
 import org.openecomp.cl.api.Logger;
 import org.openecomp.cl.eelf.LoggerFactory;
 import org.openecomp.cl.mdc.MdcContext;
 import org.openecomp.cl.mdc.MdcOverride;
-import org.openecomp.restclient.enums.RestAuthenticationMode;
-import org.openecomp.restclient.logging.RestClientMsgs;
-import org.openecomp.restclient.rest.RestClientBuilder;
 
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
diff --git a/src/main/java/org/openecomp/restclient/enums/RestAuthenticationMode.java b/src/main/java/org/onap/aai/restclient/enums/RestAuthenticationMode.java
index 3f86043..6bff196 100644
--- a/src/main/java/org/openecomp/restclient/enums/RestAuthenticationMode.java
+++ b/src/main/java/org/onap/aai/restclient/enums/RestAuthenticationMode.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.restclient.enums;
+package org.onap.aai.restclient.enums;
 
 /**
  * Authentication Modes:
diff --git a/src/main/java/org/openecomp/restclient/logging/RestClientMsgs.java b/src/main/java/org/onap/aai/restclient/logging/RestClientMsgs.java
index dabdc96..09af107 100644
--- a/src/main/java/org/openecomp/restclient/logging/RestClientMsgs.java
+++ b/src/main/java/org/onap/aai/restclient/logging/RestClientMsgs.java
@@ -20,7 +20,7 @@
  *

  * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  */

-package org.openecomp.restclient.logging;

+package org.onap.aai.restclient.logging;

 

 import com.att.eelf.i18n.EELFResourceManager;

 import org.openecomp.cl.eelf.LogMessageEnum;

diff --git a/src/main/java/org/openecomp/restclient/rest/HttpUtil.java b/src/main/java/org/onap/aai/restclient/rest/HttpUtil.java
index f0c2854..0677a16 100644
--- a/src/main/java/org/openecomp/restclient/rest/HttpUtil.java
+++ b/src/main/java/org/onap/aai/restclient/rest/HttpUtil.java
@@ -20,7 +20,7 @@
  *

  * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  */

-package org.openecomp.restclient.rest;

+package org.onap.aai.restclient.rest;

 

 public class HttpUtil {

 

diff --git a/src/main/java/org/openecomp/restclient/rest/RestClientBuilder.java b/src/main/java/org/onap/aai/restclient/rest/RestClientBuilder.java
index c7b1fd8..f446f27 100644
--- a/src/main/java/org/openecomp/restclient/rest/RestClientBuilder.java
+++ b/src/main/java/org/onap/aai/restclient/rest/RestClientBuilder.java
@@ -20,7 +20,7 @@
  *

  * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  */

-package org.openecomp.restclient.rest;

+package org.onap.aai.restclient.rest;

 

 import java.io.FileInputStream;

 import java.security.KeyStore;

@@ -33,7 +33,7 @@ import javax.net.ssl.SSLSession;
 import javax.net.ssl.TrustManager;

 import javax.net.ssl.X509TrustManager;

 

-import org.openecomp.restclient.enums.RestAuthenticationMode;

+import org.onap.aai.restclient.enums.RestAuthenticationMode;

 

 import com.sun.jersey.api.client.Client;

 import com.sun.jersey.api.client.config.ClientConfig;

diff --git a/src/test/java/org/openecomp/restclient/client/OperationResultTest.java b/src/test/java/org/onap/aai/restclient/client/OperationResultTest.java
index 77e6e29..6f18f9a 100644
--- a/src/test/java/org/openecomp/restclient/client/OperationResultTest.java
+++ b/src/test/java/org/onap/aai/restclient/client/OperationResultTest.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.restclient.client;
+package org.onap.aai.restclient.client;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -32,6 +32,7 @@ import javax.ws.rs.core.MultivaluedMap;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.aai.restclient.client.OperationResult;
 
 import com.sun.jersey.core.util.MultivaluedMapImpl;
 
diff --git a/src/test/java/org/openecomp/restclient/client/RestfulClientTest.java b/src/test/java/org/onap/aai/restclient/client/RestfulClientTest.java
index 784aa91..0e5c84e 100644
--- a/src/test/java/org/openecomp/restclient/client/RestfulClientTest.java
+++ b/src/test/java/org/onap/aai/restclient/client/RestfulClientTest.java
@@ -16,7 +16,7 @@
  * 
  * ECOMP and OpenECOMP are trademarks and service marks of AT&T Intellectual Property.
  */
-package org.openecomp.restclient.client;
+package org.onap.aai.restclient.client;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -29,8 +29,10 @@ import javax.ws.rs.core.Response.Status;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.restclient.enums.RestAuthenticationMode;
-import org.openecomp.restclient.rest.RestClientBuilder;
+import org.onap.aai.restclient.client.OperationResult;
+import org.onap.aai.restclient.client.RestClient;
+import org.onap.aai.restclient.enums.RestAuthenticationMode;
+import org.onap.aai.restclient.rest.RestClientBuilder;
 
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
diff --git a/src/test/java/org/openecomp/restclient/enums/RestAuthenticationModeTest.java b/src/test/java/org/onap/aai/restclient/enums/RestAuthenticationModeTest.java
index ebdddbf..c95431c 100644
--- a/src/test/java/org/openecomp/restclient/enums/RestAuthenticationModeTest.java
+++ b/src/test/java/org/onap/aai/restclient/enums/RestAuthenticationModeTest.java
@@ -20,12 +20,13 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.restclient.enums;
+package org.onap.aai.restclient.enums;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.aai.restclient.enums.RestAuthenticationMode;
 
 public class RestAuthenticationModeTest {
 
diff --git a/src/test/java/org/openecomp/restclient/rest/HttpUtilTest.java b/src/test/java/org/onap/aai/restclient/rest/HttpUtilTest.java
index 9eb0362..7e9291c 100644
--- a/src/test/java/org/openecomp/restclient/rest/HttpUtilTest.java
+++ b/src/test/java/org/onap/aai/restclient/rest/HttpUtilTest.java
@@ -20,13 +20,14 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.restclient.rest;
+package org.onap.aai.restclient.rest;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.aai.restclient.rest.HttpUtil;
 
 public class HttpUtilTest {
 
diff --git a/src/test/java/org/openecomp/restclient/rest/RestClientBuilderTest.java b/src/test/java/org/onap/aai/restclient/rest/RestClientBuilderTest.java
index 1481c06..013f817 100644
--- a/src/test/java/org/openecomp/restclient/rest/RestClientBuilderTest.java
+++ b/src/test/java/org/onap/aai/restclient/rest/RestClientBuilderTest.java
@@ -20,7 +20,7 @@
  *

  * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  */

-package org.openecomp.restclient.rest;

+package org.onap.aai.restclient.rest;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertNotNull;

@@ -30,7 +30,8 @@ import static org.junit.Assert.fail;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.openecomp.restclient.enums.RestAuthenticationMode;

+import org.onap.aai.restclient.enums.RestAuthenticationMode;

+import org.onap.aai.restclient.rest.RestClientBuilder;

 

 import com.sun.jersey.api.client.Client;

 import com.sun.jersey.client.urlconnection.HTTPSProperties;