From b49f2540fb61015a1556bc6f97b7d1f9f3e3bd32 Mon Sep 17 00:00:00 2001 From: ARUL NAMBI Date: Mon, 31 Jul 2017 17:06:56 -0400 Subject: Changing license and trademark Issue-ID: AAI-89 Change-Id: Ia8f05999d87f9d24533830d071cf1f9535c13dd8 Signed-off-by: ARUL NAMBI --- License.txt | 12 +++++------- src/main/java/org/openecomp/event/EventBusComponent.java | 12 +++++------- src/main/java/org/openecomp/event/EventBusConsumer.java | 12 +++++------- src/main/java/org/openecomp/event/EventBusEndpoint.java | 12 +++++------- src/main/java/org/openecomp/event/EventBusProducer.java | 12 +++++------- src/main/java/org/openecomp/logging/RouterCoreMsgs.java | 12 +++++------- src/main/java/org/openecomp/rest/RestClientComponent.java | 12 +++++------- src/main/java/org/openecomp/rest/RestClientConsumer.java | 12 +++++------- src/main/java/org/openecomp/rest/RestClientEndpoint.java | 12 +++++------- src/main/java/org/openecomp/rest/RestClientProducer.java | 12 +++++------- 10 files changed, 50 insertions(+), 70 deletions(-) diff --git a/License.txt b/License.txt index d0741ef..09cff85 100644 --- a/License.txt +++ b/License.txt @@ -1,15 +1,14 @@ ============LICENSE_START======================================================= -DataRouter +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 ati +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/event/EventBusComponent.java b/src/main/java/org/openecomp/event/EventBusComponent.java index 6795931..9a02a77 100644 --- a/src/main/java/org/openecomp/event/EventBusComponent.java +++ b/src/main/java/org/openecomp/event/EventBusComponent.java @@ -1,16 +1,15 @@ /** * ============LICENSE_START======================================================= - * DataRouter + * 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 ati + * 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.event; diff --git a/src/main/java/org/openecomp/event/EventBusConsumer.java b/src/main/java/org/openecomp/event/EventBusConsumer.java index 30ac40e..982b402 100644 --- a/src/main/java/org/openecomp/event/EventBusConsumer.java +++ b/src/main/java/org/openecomp/event/EventBusConsumer.java @@ -1,16 +1,15 @@ /** * ============LICENSE_START======================================================= - * DataRouter + * 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 ati + * 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.event; diff --git a/src/main/java/org/openecomp/event/EventBusEndpoint.java b/src/main/java/org/openecomp/event/EventBusEndpoint.java index 470b974..986c897 100644 --- a/src/main/java/org/openecomp/event/EventBusEndpoint.java +++ b/src/main/java/org/openecomp/event/EventBusEndpoint.java @@ -1,16 +1,15 @@ /** * ============LICENSE_START======================================================= - * DataRouter + * 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 ati + * 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.event; diff --git a/src/main/java/org/openecomp/event/EventBusProducer.java b/src/main/java/org/openecomp/event/EventBusProducer.java index ecfebc3..d8902d2 100644 --- a/src/main/java/org/openecomp/event/EventBusProducer.java +++ b/src/main/java/org/openecomp/event/EventBusProducer.java @@ -1,16 +1,15 @@ /** * ============LICENSE_START======================================================= - * DataRouter + * 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 ati + * 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.event; diff --git a/src/main/java/org/openecomp/logging/RouterCoreMsgs.java b/src/main/java/org/openecomp/logging/RouterCoreMsgs.java index cb79618..b23c35a 100644 --- a/src/main/java/org/openecomp/logging/RouterCoreMsgs.java +++ b/src/main/java/org/openecomp/logging/RouterCoreMsgs.java @@ -1,16 +1,15 @@ /** * ============LICENSE_START======================================================= - * DataRouter + * 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 ati + * 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.logging; diff --git a/src/main/java/org/openecomp/rest/RestClientComponent.java b/src/main/java/org/openecomp/rest/RestClientComponent.java index 8d29af1..60d5724 100644 --- a/src/main/java/org/openecomp/rest/RestClientComponent.java +++ b/src/main/java/org/openecomp/rest/RestClientComponent.java @@ -1,16 +1,15 @@ /** * ============LICENSE_START======================================================= - * DataRouter + * 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 ati + * 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.rest; diff --git a/src/main/java/org/openecomp/rest/RestClientConsumer.java b/src/main/java/org/openecomp/rest/RestClientConsumer.java index c9724f0..e082b9e 100644 --- a/src/main/java/org/openecomp/rest/RestClientConsumer.java +++ b/src/main/java/org/openecomp/rest/RestClientConsumer.java @@ -1,16 +1,15 @@ /** * ============LICENSE_START======================================================= - * DataRouter + * 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 ati + * 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.rest; diff --git a/src/main/java/org/openecomp/rest/RestClientEndpoint.java b/src/main/java/org/openecomp/rest/RestClientEndpoint.java index 1b59704..63c4e0d 100644 --- a/src/main/java/org/openecomp/rest/RestClientEndpoint.java +++ b/src/main/java/org/openecomp/rest/RestClientEndpoint.java @@ -1,16 +1,15 @@ /** * ============LICENSE_START======================================================= - * DataRouter + * 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 ati + * 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.rest; diff --git a/src/main/java/org/openecomp/rest/RestClientProducer.java b/src/main/java/org/openecomp/rest/RestClientProducer.java index 3a8df18..6e36067 100644 --- a/src/main/java/org/openecomp/rest/RestClientProducer.java +++ b/src/main/java/org/openecomp/rest/RestClientProducer.java @@ -1,16 +1,15 @@ /** * ============LICENSE_START======================================================= - * DataRouter + * 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 ati + * 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.rest; -- cgit 1.2.3-korg