From 7a261fb5644ea718e28fa91da00dfb91be1d8d6e Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Tue, 6 Jun 2017 22:35:43 -0700 Subject: Updating licenses in all files Change-Id: Ic229be3cc3e4751b9bfbd3c5c08db84ec8e7e0cb Signed-off-by: Patrick Brady --- .../src/main/java/org/openecomp/appc/dg/aai/AAIPlugin.java | 7 ++++--- .../org/openecomp/appc/dg/aai/exception/AAIQueryException.java | 7 ++++--- .../main/java/org/openecomp/appc/dg/aai/impl/AAIPluginImpl.java | 7 ++++--- .../src/main/java/org/openecomp/appc/dg/aai/impl/Constants.java | 7 ++++--- .../java/org/openecomp/appc/dg/aai/objects/AAIQueryResult.java | 7 ++++--- .../main/java/org/openecomp/appc/dg/aai/objects/Relationship.java | 7 ++++--- .../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 7 ++++--- .../test/java/org/openecomp/appc/dg/aai/impl/AAIClientMock.java | 7 ++++--- .../java/org/openecomp/appc/dg/aai/impl/AAIPluginImplTest.java | 7 ++++--- 9 files changed, 36 insertions(+), 27 deletions(-) (limited to 'appc-dg/appc-dg-shared/appc-dg-aai') diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/AAIPlugin.java b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/AAIPlugin.java index 7985dc454..0198a330a 100644 --- a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/AAIPlugin.java +++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/AAIPlugin.java @@ -1,9 +1,9 @@ /*- * ============LICENSE_START======================================================= - * openECOMP : APP-C + * APPC * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017 Amdocs * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END========================================================= + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.openecomp.appc.dg.aai; diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/exception/AAIQueryException.java b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/exception/AAIQueryException.java index f9f781b50..6cee0affd 100644 --- a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/exception/AAIQueryException.java +++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/exception/AAIQueryException.java @@ -1,9 +1,9 @@ /*- * ============LICENSE_START======================================================= - * openECOMP : APP-C + * APPC * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017 Amdocs * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END========================================================= + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.openecomp.appc.dg.aai.exception; diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/AAIPluginImpl.java b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/AAIPluginImpl.java index 830147ca2..d10b13d98 100644 --- a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/AAIPluginImpl.java +++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/AAIPluginImpl.java @@ -1,9 +1,9 @@ /*- * ============LICENSE_START======================================================= - * openECOMP : APP-C + * APPC * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017 Amdocs * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END========================================================= + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.openecomp.appc.dg.aai.impl; diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/Constants.java b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/Constants.java index 8957d3a8f..de11cf934 100644 --- a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/Constants.java +++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/Constants.java @@ -1,9 +1,9 @@ /*- * ============LICENSE_START======================================================= - * openECOMP : APP-C + * APPC * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017 Amdocs * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END========================================================= + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.openecomp.appc.dg.aai.impl; diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/objects/AAIQueryResult.java b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/objects/AAIQueryResult.java index 0ad6292f9..6f9495e79 100644 --- a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/objects/AAIQueryResult.java +++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/objects/AAIQueryResult.java @@ -1,9 +1,9 @@ /*- * ============LICENSE_START======================================================= - * openECOMP : APP-C + * APPC * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017 Amdocs * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END========================================================= + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.openecomp.appc.dg.aai.objects; diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/objects/Relationship.java b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/objects/Relationship.java index 63e6392a5..0cad8e18d 100644 --- a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/objects/Relationship.java +++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/objects/Relationship.java @@ -1,9 +1,9 @@ /*- * ============LICENSE_START======================================================= - * openECOMP : APP-C + * APPC * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017 Amdocs * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END========================================================= + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.openecomp.appc.dg.aai.objects; diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 260b218d6..6a4fd5c8a 100644 --- a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -1,10 +1,10 @@