Changing the license and trademark

Issue-ID: AAI-88
Change-Id: I3a5641a294c4072734aca565369cf759a9030cf9
Signed-off-by: ARUL NAMBI <arul.nambi@amdocs.com>

diff --git a/License.txt b/License.txt
index 8a1e022..09cff85 100644 (file)
--- a/License.txt
+++ b/License.txt
@@ -1,15 +1,14 @@
 ============LICENSE_START=======================================================
-RestClient
+org.onap.aai
 ================================================================================
-Copyright © 2017 AT&T Intellectual Property.
+Copyright © 2017 AT&T Intellectual Property. All rights reserved.
 Copyright © 2017 Amdocs
-All rights reserved.
 ================================================================================
 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
+You may obtain a copy of the License at 
 
-   http://www.apache.org/licenses/LICENSE-2.0
+      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,
@@ -18,5 +17,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ============LICENSE_END=========================================================
 
-ECOMP and OpenECOMP are trademarks
-and service marks of AT&T Intellectual Property.
+ECOMP is a trademark and service mark of AT&T Intellectual Property.
\ No newline at end of file

diff --git a/src/main/java/org/openecomp/restclient/client/Headers.java b/src/main/java/org/openecomp/restclient/client/Headers.java
index dbfb6bb..988a068 100644 (file)
--- a/src/main/java/org/openecomp/restclient/client/Headers.java
+++ b/src/main/java/org/openecomp/restclient/client/Headers.java
@@ -1,16 +1,15 @@
 /**\r
  * ============LICENSE_START=======================================================\r
- * RestClient\r
+ * org.onap.aai\r
  * ================================================================================\r
- * Copyright © 2017 AT&T Intellectual Property.\r
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.\r
  * Copyright © 2017 Amdocs\r
- * All rights reserved.\r
  * ================================================================================\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- *    http://www.apache.org/licenses/LICENSE-2.0\r
+ *       http://www.apache.org/licenses/LICENSE-2.0\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r
@@ -19,8 +18,7 @@
  * limitations under the License.\r
  * ============LICENSE_END=========================================================\r
  *\r
- * ECOMP and OpenECOMP are trademarks\r
- * and service marks of AT&T Intellectual Property.\r
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  */\r
 package org.openecomp.restclient.client;\r
 \r

diff --git a/src/main/java/org/openecomp/restclient/client/OperationResult.java b/src/main/java/org/openecomp/restclient/client/OperationResult.java
index 1a301b9..2c2cfe2 100644 (file)
--- a/src/main/java/org/openecomp/restclient/client/OperationResult.java
+++ b/src/main/java/org/openecomp/restclient/client/OperationResult.java
@@ -1,16 +1,15 @@
 /**\r
  * ============LICENSE_START=======================================================\r
- * RestClient\r
+ * org.onap.aai\r
  * ================================================================================\r
- * Copyright © 2017 AT&T Intellectual Property.\r
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.\r
  * Copyright © 2017 Amdocs\r
- * All rights reserved.\r
  * ================================================================================\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- *    http://www.apache.org/licenses/LICENSE-2.0\r
+ *       http://www.apache.org/licenses/LICENSE-2.0\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r
@@ -19,8 +18,7 @@
  * limitations under the License.\r
  * ============LICENSE_END=========================================================\r
  *\r
- * ECOMP and OpenECOMP are trademarks\r
- * and service marks of AT&T Intellectual Property.\r
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  */\r
 package org.openecomp.restclient.client;\r
 \r

diff --git a/src/main/java/org/openecomp/restclient/client/RestClient.java b/src/main/java/org/openecomp/restclient/client/RestClient.java
index 7dbc373..2912909 100644 (file)
--- a/src/main/java/org/openecomp/restclient/client/RestClient.java
+++ b/src/main/java/org/openecomp/restclient/client/RestClient.java
@@ -1,16 +1,15 @@
 /**
  * ============LICENSE_START=======================================================
- * RestClient
+ * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  * Copyright © 2017 Amdocs
- * All rights reserved.
  * ================================================================================
  * 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
+ *       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,
@@ -19,8 +18,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.restclient.client;
 

diff --git a/src/main/java/org/openecomp/restclient/enums/RestAuthenticationMode.java b/src/main/java/org/openecomp/restclient/enums/RestAuthenticationMode.java
index 5174b75..3f86043 100644 (file)
--- a/src/main/java/org/openecomp/restclient/enums/RestAuthenticationMode.java
+++ b/src/main/java/org/openecomp/restclient/enums/RestAuthenticationMode.java
@@ -1,16 +1,15 @@
 /**
  * ============LICENSE_START=======================================================
- * RestClient
+ * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  * Copyright © 2017 Amdocs
- * All rights reserved.
  * ================================================================================
  * 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
+ *       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,
@@ -19,8 +18,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.restclient.enums;
 

diff --git a/src/main/java/org/openecomp/restclient/logging/RestClientMsgs.java b/src/main/java/org/openecomp/restclient/logging/RestClientMsgs.java
index 49ac648..dabdc96 100644 (file)
--- a/src/main/java/org/openecomp/restclient/logging/RestClientMsgs.java
+++ b/src/main/java/org/openecomp/restclient/logging/RestClientMsgs.java
@@ -1,16 +1,15 @@
 /**\r
  * ============LICENSE_START=======================================================\r
- * RestClient\r
+ * org.onap.aai\r
  * ================================================================================\r
- * Copyright © 2017 AT&T Intellectual Property.\r
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.\r
  * Copyright © 2017 Amdocs\r
- * All rights reserved.\r
  * ================================================================================\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- *    http://www.apache.org/licenses/LICENSE-2.0\r
+ *       http://www.apache.org/licenses/LICENSE-2.0\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r
@@ -19,8 +18,7 @@
  * limitations under the License.\r
  * ============LICENSE_END=========================================================\r
  *\r
- * ECOMP and OpenECOMP are trademarks\r
- * and service marks of AT&T Intellectual Property.\r
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  */\r
 package org.openecomp.restclient.logging;\r
 \r

diff --git a/src/main/java/org/openecomp/restclient/rest/HttpUtil.java b/src/main/java/org/openecomp/restclient/rest/HttpUtil.java
index 4ea8928..f0c2854 100644 (file)
--- a/src/main/java/org/openecomp/restclient/rest/HttpUtil.java
+++ b/src/main/java/org/openecomp/restclient/rest/HttpUtil.java
@@ -1,16 +1,15 @@
 /**\r
  * ============LICENSE_START=======================================================\r
- * RestClient\r
+ * org.onap.aai\r
  * ================================================================================\r
- * Copyright © 2017 AT&T Intellectual Property.\r
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.\r
  * Copyright © 2017 Amdocs\r
- * All rights reserved.\r
  * ================================================================================\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- *    http://www.apache.org/licenses/LICENSE-2.0\r
+ *       http://www.apache.org/licenses/LICENSE-2.0\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r
@@ -19,8 +18,7 @@
  * limitations under the License.\r
  * ============LICENSE_END=========================================================\r
  *\r
- * ECOMP and OpenECOMP are trademarks\r
- * and service marks of AT&T Intellectual Property.\r
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  */\r
 package org.openecomp.restclient.rest;\r
 \r

diff --git a/src/main/java/org/openecomp/restclient/rest/RestClientBuilder.java b/src/main/java/org/openecomp/restclient/rest/RestClientBuilder.java
index 0206941..c7b1fd8 100644 (file)
--- a/src/main/java/org/openecomp/restclient/rest/RestClientBuilder.java
+++ b/src/main/java/org/openecomp/restclient/rest/RestClientBuilder.java
@@ -1,16 +1,15 @@
 /**\r
  * ============LICENSE_START=======================================================\r
- * RestClient\r
+ * org.onap.aai\r
  * ================================================================================\r
- * Copyright © 2017 AT&T Intellectual Property.\r
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.\r
  * Copyright © 2017 Amdocs\r
- * All rights reserved.\r
  * ================================================================================\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- *    http://www.apache.org/licenses/LICENSE-2.0\r
+ *       http://www.apache.org/licenses/LICENSE-2.0\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r
@@ -19,8 +18,7 @@
  * limitations under the License.\r
  * ============LICENSE_END=========================================================\r
  *\r
- * ECOMP and OpenECOMP are trademarks\r
- * and service marks of AT&T Intellectual Property.\r
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  */\r
 package org.openecomp.restclient.rest;\r
 \r