summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorARUL NAMBI <arul.nambi@amdocs.com>2017-07-31 13:40:09 -0400
committerARUL NAMBI <arul.nambi@amdocs.com>2017-07-31 13:41:26 -0400
commit29c93067b1b2ae60d6db54c1d604854f771a91ae (patch)
tree061f0438c19d25e9cac5f0077fb8ed423dad16b8
parente9352f759ff9863074517806c5351c001a5f6f5b (diff)
Changing the license and trademark
Issue-ID: AAI-88 Change-Id: I3a5641a294c4072734aca565369cf759a9030cf9 Signed-off-by: ARUL NAMBI <arul.nambi@amdocs.com>
-rw-r--r--License.txt12
-rw-r--r--src/main/java/org/openecomp/restclient/client/Headers.java10
-rw-r--r--src/main/java/org/openecomp/restclient/client/OperationResult.java10
-rw-r--r--src/main/java/org/openecomp/restclient/client/RestClient.java10
-rw-r--r--src/main/java/org/openecomp/restclient/enums/RestAuthenticationMode.java10
-rw-r--r--src/main/java/org/openecomp/restclient/logging/RestClientMsgs.java10
-rw-r--r--src/main/java/org/openecomp/restclient/rest/HttpUtil.java10
-rw-r--r--src/main/java/org/openecomp/restclient/rest/RestClientBuilder.java10
8 files changed, 33 insertions, 49 deletions
diff --git a/License.txt b/License.txt
index 8a1e022..09cff85 100644
--- 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
--- a/src/main/java/org/openecomp/restclient/client/Headers.java
+++ b/src/main/java/org/openecomp/restclient/client/Headers.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/client/OperationResult.java b/src/main/java/org/openecomp/restclient/client/OperationResult.java
index 1a301b9..2c2cfe2 100644
--- a/src/main/java/org/openecomp/restclient/client/OperationResult.java
+++ b/src/main/java/org/openecomp/restclient/client/OperationResult.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/client/RestClient.java b/src/main/java/org/openecomp/restclient/client/RestClient.java
index 7dbc373..2912909 100644
--- 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
--- 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
--- a/src/main/java/org/openecomp/restclient/logging/RestClientMsgs.java
+++ b/src/main/java/org/openecomp/restclient/logging/RestClientMsgs.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.logging;
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
--- a/src/main/java/org/openecomp/restclient/rest/HttpUtil.java
+++ b/src/main/java/org/openecomp/restclient/rest/HttpUtil.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.rest;
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
--- a/src/main/java/org/openecomp/restclient/rest/RestClientBuilder.java
+++ b/src/main/java/org/openecomp/restclient/rest/RestClientBuilder.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.rest;