From 10bba35de2cc3b2c33cb2a1f04cae45bbdcd0c4e Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Wed, 19 Jul 2017 12:09:28 -0700 Subject: Applying license changes to all files [APPC-87] Fix Maven License Plugin Change-Id: I23a95b6c1020618d05f17c63c72152cf86e4d4a0 Signed-off-by: Patrick Brady --- appc-common/src/main/java/org/openecomp/appc/Constants.java | 8 +++++--- .../src/main/java/org/openecomp/appc/cache/CacheStrategies.java | 8 +++++--- .../src/main/java/org/openecomp/appc/cache/CacheStrategy.java | 8 +++++--- .../src/main/java/org/openecomp/appc/cache/MetadataCache.java | 8 +++++--- .../src/main/java/org/openecomp/appc/cache/impl/LRUCache.java | 8 +++++--- .../java/org/openecomp/appc/cache/impl/MetadataCacheFactory.java | 8 +++++--- .../java/org/openecomp/appc/cache/impl/MetadataCacheImpl.java | 8 +++++--- .../src/main/java/org/openecomp/appc/concurrent/Signal.java | 8 +++++--- .../main/java/org/openecomp/appc/configuration/Configuration.java | 8 +++++--- .../org/openecomp/appc/configuration/ConfigurationFactory.java | 8 +++++--- .../org/openecomp/appc/configuration/DefaultConfiguration.java | 8 +++++--- .../src/main/java/org/openecomp/appc/configuration/package.html | 8 +++++--- .../java/org/openecomp/appc/encryption/EncryptionException.java | 8 +++++--- .../main/java/org/openecomp/appc/encryption/EncryptionTool.java | 8 +++++--- .../src/main/java/org/openecomp/appc/encryption/HexHelper.java | 8 +++++--- .../main/java/org/openecomp/appc/exceptions/APPCException.java | 8 +++++--- .../org/openecomp/appc/exceptions/UnknownProviderException.java | 8 +++++--- appc-common/src/main/java/org/openecomp/appc/i18n/Msg.java | 8 +++++--- .../main/java/org/openecomp/appc/logging/LoggingConstants.java | 8 +++++--- .../src/main/java/org/openecomp/appc/logging/LoggingUtils.java | 8 +++++--- .../main/java/org/openecomp/appc/metadata/MetadataService.java | 8 +++++--- .../org/openecomp/appc/metadata/impl/MetadataServiceImpl.java | 8 +++++--- .../appc/metadata/objects/DependencyModelIdentifier.java | 8 +++++--- appc-common/src/main/java/org/openecomp/appc/pool/Allocator.java | 8 +++++--- .../src/main/java/org/openecomp/appc/pool/CacheManagement.java | 8 +++++--- .../src/main/java/org/openecomp/appc/pool/CachedElement.java | 8 +++++--- appc-common/src/main/java/org/openecomp/appc/pool/Destructor.java | 8 +++++--- appc-common/src/main/java/org/openecomp/appc/pool/Pool.java | 8 +++++--- .../main/java/org/openecomp/appc/pool/PoolDrainedException.java | 8 +++++--- .../src/main/java/org/openecomp/appc/pool/PoolException.java | 8 +++++--- .../main/java/org/openecomp/appc/pool/PoolExtensionException.java | 8 +++++--- .../java/org/openecomp/appc/pool/PoolSpecificationException.java | 8 +++++--- appc-common/src/main/java/org/openecomp/appc/util/JsonUtil.java | 8 +++++--- .../src/main/java/org/openecomp/appc/util/MessageFormatter.java | 8 +++++--- .../src/main/java/org/openecomp/appc/util/ObjectMapper.java | 8 +++++--- .../src/main/java/org/openecomp/appc/util/PathContext.java | 8 +++++--- .../src/main/java/org/openecomp/appc/util/StringHelper.java | 8 +++++--- .../java/org/openecomp/appc/util/StructuredPropertyHelper.java | 8 +++++--- appc-common/src/main/java/org/openecomp/appc/util/Time.java | 8 +++++--- .../main/java/org/openecomp/appc/util/UnmodifiableProperties.java | 8 +++++--- appc-common/src/main/java/org/openecomp/appc/util/httpClient.java | 8 +++++--- appc-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml | 8 +++++--- .../resources/org/openecomp/appc/i18n/MessageResources.properties | 8 +++++--- .../src/main/resources/org/openecomp/appc/i18n/auth.properties | 8 +++++--- .../src/test/java/org/openecomp/appc/concurrent/TestSignal.java | 8 +++++--- .../test/java/org/openecomp/appc/encryption/TestEncryption.java | 8 +++++--- .../java/org/openecomp/appc/metadata/TestMetadataService.java | 8 +++++--- .../src/test/java/org/openecomp/appc/pool/CachedElementTest.java | 8 +++++--- appc-common/src/test/java/org/openecomp/appc/pool/Element.java | 8 +++++--- appc-common/src/test/java/org/openecomp/appc/pool/PoolTest.java | 8 +++++--- appc-common/src/test/java/org/openecomp/appc/pool/Testable.java | 8 +++++--- .../src/test/java/org/openecomp/appc/util/TestJsonUtil.java | 8 +++++--- .../src/test/java/org/openecomp/appc/util/TestStringHelper.java | 8 +++++--- .../org/openecomp/appc/util/TestStructuredPropertyHelper.java | 8 +++++--- .../org/openecomp/appc/i18n/TestAdditionalResources.properties | 8 +++++--- .../resources/org/openecomp/appc/i18n/TestResources_de.properties | 8 +++++--- .../org/openecomp/appc/i18n/TestResources_en_US.properties | 8 +++++--- 57 files changed, 285 insertions(+), 171 deletions(-) (limited to 'appc-common') diff --git a/appc-common/src/main/java/org/openecomp/appc/Constants.java b/appc-common/src/main/java/org/openecomp/appc/Constants.java index 4af045f14..c5315edd7 100644 --- a/appc-common/src/main/java/org/openecomp/appc/Constants.java +++ b/appc-common/src/main/java/org/openecomp/appc/Constants.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ diff --git a/appc-common/src/main/java/org/openecomp/appc/cache/CacheStrategies.java b/appc-common/src/main/java/org/openecomp/appc/cache/CacheStrategies.java index b12aeae65..7f63e00bf 100644 --- a/appc-common/src/main/java/org/openecomp/appc/cache/CacheStrategies.java +++ b/appc-common/src/main/java/org/openecomp/appc/cache/CacheStrategies.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.cache; diff --git a/appc-common/src/main/java/org/openecomp/appc/cache/CacheStrategy.java b/appc-common/src/main/java/org/openecomp/appc/cache/CacheStrategy.java index aa3aaeea8..aa0a5d785 100644 --- a/appc-common/src/main/java/org/openecomp/appc/cache/CacheStrategy.java +++ b/appc-common/src/main/java/org/openecomp/appc/cache/CacheStrategy.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.cache; diff --git a/appc-common/src/main/java/org/openecomp/appc/cache/MetadataCache.java b/appc-common/src/main/java/org/openecomp/appc/cache/MetadataCache.java index 7afaa4eaa..d5b1d7b93 100644 --- a/appc-common/src/main/java/org/openecomp/appc/cache/MetadataCache.java +++ b/appc-common/src/main/java/org/openecomp/appc/cache/MetadataCache.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.cache; diff --git a/appc-common/src/main/java/org/openecomp/appc/cache/impl/LRUCache.java b/appc-common/src/main/java/org/openecomp/appc/cache/impl/LRUCache.java index c90553968..5cb8ef534 100644 --- a/appc-common/src/main/java/org/openecomp/appc/cache/impl/LRUCache.java +++ b/appc-common/src/main/java/org/openecomp/appc/cache/impl/LRUCache.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.cache.impl; diff --git a/appc-common/src/main/java/org/openecomp/appc/cache/impl/MetadataCacheFactory.java b/appc-common/src/main/java/org/openecomp/appc/cache/impl/MetadataCacheFactory.java index af48b223c..306a23a99 100644 --- a/appc-common/src/main/java/org/openecomp/appc/cache/impl/MetadataCacheFactory.java +++ b/appc-common/src/main/java/org/openecomp/appc/cache/impl/MetadataCacheFactory.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.cache.impl; diff --git a/appc-common/src/main/java/org/openecomp/appc/cache/impl/MetadataCacheImpl.java b/appc-common/src/main/java/org/openecomp/appc/cache/impl/MetadataCacheImpl.java index 6dfe5961d..966100666 100644 --- a/appc-common/src/main/java/org/openecomp/appc/cache/impl/MetadataCacheImpl.java +++ b/appc-common/src/main/java/org/openecomp/appc/cache/impl/MetadataCacheImpl.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.cache.impl; diff --git a/appc-common/src/main/java/org/openecomp/appc/concurrent/Signal.java b/appc-common/src/main/java/org/openecomp/appc/concurrent/Signal.java index f28132bb3..93da24087 100644 --- a/appc-common/src/main/java/org/openecomp/appc/concurrent/Signal.java +++ b/appc-common/src/main/java/org/openecomp/appc/concurrent/Signal.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.concurrent; diff --git a/appc-common/src/main/java/org/openecomp/appc/configuration/Configuration.java b/appc-common/src/main/java/org/openecomp/appc/configuration/Configuration.java index 9ab1c387b..870a73c45 100644 --- a/appc-common/src/main/java/org/openecomp/appc/configuration/Configuration.java +++ b/appc-common/src/main/java/org/openecomp/appc/configuration/Configuration.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.configuration; diff --git a/appc-common/src/main/java/org/openecomp/appc/configuration/ConfigurationFactory.java b/appc-common/src/main/java/org/openecomp/appc/configuration/ConfigurationFactory.java index 7de48f0dc..a2dd55702 100644 --- a/appc-common/src/main/java/org/openecomp/appc/configuration/ConfigurationFactory.java +++ b/appc-common/src/main/java/org/openecomp/appc/configuration/ConfigurationFactory.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.configuration; diff --git a/appc-common/src/main/java/org/openecomp/appc/configuration/DefaultConfiguration.java b/appc-common/src/main/java/org/openecomp/appc/configuration/DefaultConfiguration.java index 09eb840b0..b72f73f23 100644 --- a/appc-common/src/main/java/org/openecomp/appc/configuration/DefaultConfiguration.java +++ b/appc-common/src/main/java/org/openecomp/appc/configuration/DefaultConfiguration.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.configuration; diff --git a/appc-common/src/main/java/org/openecomp/appc/configuration/package.html b/appc-common/src/main/java/org/openecomp/appc/configuration/package.html index 411485cf7..131ba5ced 100644 --- a/appc-common/src/main/java/org/openecomp/appc/configuration/package.html +++ b/appc-common/src/main/java/org/openecomp/appc/configuration/package.html @@ -1,10 +1,11 @@ diff --git a/appc-common/src/main/java/org/openecomp/appc/encryption/EncryptionException.java b/appc-common/src/main/java/org/openecomp/appc/encryption/EncryptionException.java index 5d8b831b1..5ee6fa483 100644 --- a/appc-common/src/main/java/org/openecomp/appc/encryption/EncryptionException.java +++ b/appc-common/src/main/java/org/openecomp/appc/encryption/EncryptionException.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.encryption; diff --git a/appc-common/src/main/java/org/openecomp/appc/encryption/EncryptionTool.java b/appc-common/src/main/java/org/openecomp/appc/encryption/EncryptionTool.java index 789fd8a57..405487e2f 100644 --- a/appc-common/src/main/java/org/openecomp/appc/encryption/EncryptionTool.java +++ b/appc-common/src/main/java/org/openecomp/appc/encryption/EncryptionTool.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.encryption; diff --git a/appc-common/src/main/java/org/openecomp/appc/encryption/HexHelper.java b/appc-common/src/main/java/org/openecomp/appc/encryption/HexHelper.java index c0318d24d..8d149ab67 100644 --- a/appc-common/src/main/java/org/openecomp/appc/encryption/HexHelper.java +++ b/appc-common/src/main/java/org/openecomp/appc/encryption/HexHelper.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.encryption; diff --git a/appc-common/src/main/java/org/openecomp/appc/exceptions/APPCException.java b/appc-common/src/main/java/org/openecomp/appc/exceptions/APPCException.java index 75fcf4093..808434d62 100644 --- a/appc-common/src/main/java/org/openecomp/appc/exceptions/APPCException.java +++ b/appc-common/src/main/java/org/openecomp/appc/exceptions/APPCException.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ diff --git a/appc-common/src/main/java/org/openecomp/appc/exceptions/UnknownProviderException.java b/appc-common/src/main/java/org/openecomp/appc/exceptions/UnknownProviderException.java index 59cbf8d7b..1551f48d1 100644 --- a/appc-common/src/main/java/org/openecomp/appc/exceptions/UnknownProviderException.java +++ b/appc-common/src/main/java/org/openecomp/appc/exceptions/UnknownProviderException.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ diff --git a/appc-common/src/main/java/org/openecomp/appc/i18n/Msg.java b/appc-common/src/main/java/org/openecomp/appc/i18n/Msg.java index f89d324b2..c6e87c6e7 100644 --- a/appc-common/src/main/java/org/openecomp/appc/i18n/Msg.java +++ b/appc-common/src/main/java/org/openecomp/appc/i18n/Msg.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.i18n; diff --git a/appc-common/src/main/java/org/openecomp/appc/logging/LoggingConstants.java b/appc-common/src/main/java/org/openecomp/appc/logging/LoggingConstants.java index 5325b68ef..9d6a32fe9 100644 --- a/appc-common/src/main/java/org/openecomp/appc/logging/LoggingConstants.java +++ b/appc-common/src/main/java/org/openecomp/appc/logging/LoggingConstants.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.logging; diff --git a/appc-common/src/main/java/org/openecomp/appc/logging/LoggingUtils.java b/appc-common/src/main/java/org/openecomp/appc/logging/LoggingUtils.java index d2f91f3de..70c7fb1d2 100644 --- a/appc-common/src/main/java/org/openecomp/appc/logging/LoggingUtils.java +++ b/appc-common/src/main/java/org/openecomp/appc/logging/LoggingUtils.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.logging; diff --git a/appc-common/src/main/java/org/openecomp/appc/metadata/MetadataService.java b/appc-common/src/main/java/org/openecomp/appc/metadata/MetadataService.java index 88b6e2362..d1c0cf4a7 100644 --- a/appc-common/src/main/java/org/openecomp/appc/metadata/MetadataService.java +++ b/appc-common/src/main/java/org/openecomp/appc/metadata/MetadataService.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.metadata; diff --git a/appc-common/src/main/java/org/openecomp/appc/metadata/impl/MetadataServiceImpl.java b/appc-common/src/main/java/org/openecomp/appc/metadata/impl/MetadataServiceImpl.java index d0c479e0a..d2c017576 100644 --- a/appc-common/src/main/java/org/openecomp/appc/metadata/impl/MetadataServiceImpl.java +++ b/appc-common/src/main/java/org/openecomp/appc/metadata/impl/MetadataServiceImpl.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.metadata.impl; diff --git a/appc-common/src/main/java/org/openecomp/appc/metadata/objects/DependencyModelIdentifier.java b/appc-common/src/main/java/org/openecomp/appc/metadata/objects/DependencyModelIdentifier.java index 0a6b7c529..f76823308 100644 --- a/appc-common/src/main/java/org/openecomp/appc/metadata/objects/DependencyModelIdentifier.java +++ b/appc-common/src/main/java/org/openecomp/appc/metadata/objects/DependencyModelIdentifier.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.metadata.objects; diff --git a/appc-common/src/main/java/org/openecomp/appc/pool/Allocator.java b/appc-common/src/main/java/org/openecomp/appc/pool/Allocator.java index 7fc3acc1c..e64e4626e 100644 --- a/appc-common/src/main/java/org/openecomp/appc/pool/Allocator.java +++ b/appc-common/src/main/java/org/openecomp/appc/pool/Allocator.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ diff --git a/appc-common/src/main/java/org/openecomp/appc/pool/CacheManagement.java b/appc-common/src/main/java/org/openecomp/appc/pool/CacheManagement.java index 9f611e7ed..18793b9c4 100644 --- a/appc-common/src/main/java/org/openecomp/appc/pool/CacheManagement.java +++ b/appc-common/src/main/java/org/openecomp/appc/pool/CacheManagement.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ diff --git a/appc-common/src/main/java/org/openecomp/appc/pool/CachedElement.java b/appc-common/src/main/java/org/openecomp/appc/pool/CachedElement.java index d7a807451..e5456114d 100644 --- a/appc-common/src/main/java/org/openecomp/appc/pool/CachedElement.java +++ b/appc-common/src/main/java/org/openecomp/appc/pool/CachedElement.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ diff --git a/appc-common/src/main/java/org/openecomp/appc/pool/Destructor.java b/appc-common/src/main/java/org/openecomp/appc/pool/Destructor.java index 651291c1d..94ffbb29b 100644 --- a/appc-common/src/main/java/org/openecomp/appc/pool/Destructor.java +++ b/appc-common/src/main/java/org/openecomp/appc/pool/Destructor.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ diff --git a/appc-common/src/main/java/org/openecomp/appc/pool/Pool.java b/appc-common/src/main/java/org/openecomp/appc/pool/Pool.java index 83c2ddfc6..bbbba1717 100644 --- a/appc-common/src/main/java/org/openecomp/appc/pool/Pool.java +++ b/appc-common/src/main/java/org/openecomp/appc/pool/Pool.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ diff --git a/appc-common/src/main/java/org/openecomp/appc/pool/PoolDrainedException.java b/appc-common/src/main/java/org/openecomp/appc/pool/PoolDrainedException.java index 2bfc79ef2..01536cb61 100644 --- a/appc-common/src/main/java/org/openecomp/appc/pool/PoolDrainedException.java +++ b/appc-common/src/main/java/org/openecomp/appc/pool/PoolDrainedException.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ diff --git a/appc-common/src/main/java/org/openecomp/appc/pool/PoolException.java b/appc-common/src/main/java/org/openecomp/appc/pool/PoolException.java index a9a0d73a3..cc6b759fd 100644 --- a/appc-common/src/main/java/org/openecomp/appc/pool/PoolException.java +++ b/appc-common/src/main/java/org/openecomp/appc/pool/PoolException.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ diff --git a/appc-common/src/main/java/org/openecomp/appc/pool/PoolExtensionException.java b/appc-common/src/main/java/org/openecomp/appc/pool/PoolExtensionException.java index 1a64d1c67..0cfffac6a 100644 --- a/appc-common/src/main/java/org/openecomp/appc/pool/PoolExtensionException.java +++ b/appc-common/src/main/java/org/openecomp/appc/pool/PoolExtensionException.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ diff --git a/appc-common/src/main/java/org/openecomp/appc/pool/PoolSpecificationException.java b/appc-common/src/main/java/org/openecomp/appc/pool/PoolSpecificationException.java index 183198edf..9c6f0c19a 100644 --- a/appc-common/src/main/java/org/openecomp/appc/pool/PoolSpecificationException.java +++ b/appc-common/src/main/java/org/openecomp/appc/pool/PoolSpecificationException.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ diff --git a/appc-common/src/main/java/org/openecomp/appc/util/JsonUtil.java b/appc-common/src/main/java/org/openecomp/appc/util/JsonUtil.java index 4159ede61..53ff4e154 100644 --- a/appc-common/src/main/java/org/openecomp/appc/util/JsonUtil.java +++ b/appc-common/src/main/java/org/openecomp/appc/util/JsonUtil.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.util; diff --git a/appc-common/src/main/java/org/openecomp/appc/util/MessageFormatter.java b/appc-common/src/main/java/org/openecomp/appc/util/MessageFormatter.java index a423c8527..febf3dde4 100644 --- a/appc-common/src/main/java/org/openecomp/appc/util/MessageFormatter.java +++ b/appc-common/src/main/java/org/openecomp/appc/util/MessageFormatter.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.util; diff --git a/appc-common/src/main/java/org/openecomp/appc/util/ObjectMapper.java b/appc-common/src/main/java/org/openecomp/appc/util/ObjectMapper.java index bc9a66ada..64038f9cc 100644 --- a/appc-common/src/main/java/org/openecomp/appc/util/ObjectMapper.java +++ b/appc-common/src/main/java/org/openecomp/appc/util/ObjectMapper.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.util; diff --git a/appc-common/src/main/java/org/openecomp/appc/util/PathContext.java b/appc-common/src/main/java/org/openecomp/appc/util/PathContext.java index 672f80d65..5664df67f 100644 --- a/appc-common/src/main/java/org/openecomp/appc/util/PathContext.java +++ b/appc-common/src/main/java/org/openecomp/appc/util/PathContext.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.util; diff --git a/appc-common/src/main/java/org/openecomp/appc/util/StringHelper.java b/appc-common/src/main/java/org/openecomp/appc/util/StringHelper.java index a3682d394..a3603cddd 100644 --- a/appc-common/src/main/java/org/openecomp/appc/util/StringHelper.java +++ b/appc-common/src/main/java/org/openecomp/appc/util/StringHelper.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ diff --git a/appc-common/src/main/java/org/openecomp/appc/util/StructuredPropertyHelper.java b/appc-common/src/main/java/org/openecomp/appc/util/StructuredPropertyHelper.java index f482eeee5..2f292bcc7 100644 --- a/appc-common/src/main/java/org/openecomp/appc/util/StructuredPropertyHelper.java +++ b/appc-common/src/main/java/org/openecomp/appc/util/StructuredPropertyHelper.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ diff --git a/appc-common/src/main/java/org/openecomp/appc/util/Time.java b/appc-common/src/main/java/org/openecomp/appc/util/Time.java index b956d1b30..76fd6eb88 100644 --- a/appc-common/src/main/java/org/openecomp/appc/util/Time.java +++ b/appc-common/src/main/java/org/openecomp/appc/util/Time.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ diff --git a/appc-common/src/main/java/org/openecomp/appc/util/UnmodifiableProperties.java b/appc-common/src/main/java/org/openecomp/appc/util/UnmodifiableProperties.java index 1b8b76e26..fea0ed0ea 100644 --- a/appc-common/src/main/java/org/openecomp/appc/util/UnmodifiableProperties.java +++ b/appc-common/src/main/java/org/openecomp/appc/util/UnmodifiableProperties.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ diff --git a/appc-common/src/main/java/org/openecomp/appc/util/httpClient.java b/appc-common/src/main/java/org/openecomp/appc/util/httpClient.java index 3908bdbaa..cb6bb8c5f 100644 --- a/appc-common/src/main/java/org/openecomp/appc/util/httpClient.java +++ b/appc-common/src/main/java/org/openecomp/appc/util/httpClient.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * 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. * You may obtain a copy of the License at @@ -16,8 +17,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.util; diff --git a/appc-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml index e2a49e0bc..2fbb1739a 100644 --- a/appc-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/appc-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -1,11 +1,12 @@