diff options
Diffstat (limited to 'appc-common/src')
57 files changed, 228 insertions, 171 deletions
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 7ddf38d03..4af045f14 100644 --- a/appc-common/src/main/java/org/openecomp/appc/Constants.java +++ b/appc-common/src/main/java/org/openecomp/appc/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. */ 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 780dbc59b..b12aeae65 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,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.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 c269ad231..aa3aaeea8 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,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.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 db5915bcf..7afaa4eaa 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,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.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 0e8ba7308..c90553968 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,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.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 358b3bfd5..af48b223c 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,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.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 e54de8781..6dfe5961d 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,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.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 153dd0bdc..f28132bb3 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,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.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 d93b7588e..9ab1c387b 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,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.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 17a356745..7de48f0dc 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,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.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 7af491724..09eb840b0 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,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.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 5991f91b5..411485cf7 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,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. --> <html> 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 c21abc2b9..5d8b831b1 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,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.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 a8b302698..789fd8a57 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,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.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 01a602cf4..c0318d24d 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,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.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 bf3115f38..75fcf4093 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,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. */ 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 e73f9e5f7..59cbf8d7b 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,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. */ 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 21f088323..f89d324b2 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,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.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 2a600978f..5325b68ef 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,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.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 6ff192b20..d2f91f3de 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,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.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 f8b54c717..88b6e2362 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,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.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 fb393aa74..d0c479e0a 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,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.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 e3c82487e..0a6b7c529 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,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.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 8301cb7a5..7fc3acc1c 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,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. */ 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 10c007548..9f611e7ed 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,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. */ 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 558b2a33a..d7a807451 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,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. */ 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 40d2f1170..651291c1d 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,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. */ 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 29a12f432..83c2ddfc6 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,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. */ 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 71edb493c..2bfc79ef2 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,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. */ 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 0ba88b68e..a9a0d73a3 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,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. */ 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 64f338105..1a64d1c67 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,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. */ 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 f46ca374a..183198edf 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,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. */ 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 6c5623da1..4159ede61 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,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.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 95463321a..a423c8527 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,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.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 4d55d4e11..bc9a66ada 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,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.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 5565afd2f..672f80d65 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,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.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 0f9188694..a3682d394 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,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. */ 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 1705547c1..f482eeee5 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,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. */ 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 147ae2ca7..b956d1b30 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,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. */ 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 50bc96ff5..1b8b76e26 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,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. */ 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 0847c4091..3908bdbaa 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,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.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 4d66c908c..e2a49e0bc 100644 --- a/appc-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/appc-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ============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. @@ -18,6 +18,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. --> <!-- diff --git a/appc-common/src/main/resources/org/openecomp/appc/i18n/MessageResources.properties b/appc-common/src/main/resources/org/openecomp/appc/i18n/MessageResources.properties index 13e760f48..e7cc092d3 100644 --- a/appc-common/src/main/resources/org/openecomp/appc/i18n/MessageResources.properties +++ b/appc-common/src/main/resources/org/openecomp/appc/i18n/MessageResources.properties @@ -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. ### # This property file contains all message definitions used by APPC diff --git a/appc-common/src/main/resources/org/openecomp/appc/i18n/auth.properties b/appc-common/src/main/resources/org/openecomp/appc/i18n/auth.properties index bdb5af244..70926652b 100644 --- a/appc-common/src/main/resources/org/openecomp/appc/i18n/auth.properties +++ b/appc-common/src/main/resources/org/openecomp/appc/i18n/auth.properties @@ -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. ### username=admin diff --git a/appc-common/src/test/java/org/openecomp/appc/concurrent/TestSignal.java b/appc-common/src/test/java/org/openecomp/appc/concurrent/TestSignal.java index 1751b62d9..2e62f61f1 100644 --- a/appc-common/src/test/java/org/openecomp/appc/concurrent/TestSignal.java +++ b/appc-common/src/test/java/org/openecomp/appc/concurrent/TestSignal.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.concurrent; diff --git a/appc-common/src/test/java/org/openecomp/appc/encryption/TestEncryption.java b/appc-common/src/test/java/org/openecomp/appc/encryption/TestEncryption.java index e82a44352..0985e9ddd 100644 --- a/appc-common/src/test/java/org/openecomp/appc/encryption/TestEncryption.java +++ b/appc-common/src/test/java/org/openecomp/appc/encryption/TestEncryption.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.encryption; diff --git a/appc-common/src/test/java/org/openecomp/appc/metadata/TestMetadataService.java b/appc-common/src/test/java/org/openecomp/appc/metadata/TestMetadataService.java index a6db669ca..56123671e 100644 --- a/appc-common/src/test/java/org/openecomp/appc/metadata/TestMetadataService.java +++ b/appc-common/src/test/java/org/openecomp/appc/metadata/TestMetadataService.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.metadata; diff --git a/appc-common/src/test/java/org/openecomp/appc/pool/CachedElementTest.java b/appc-common/src/test/java/org/openecomp/appc/pool/CachedElementTest.java index 423d33952..d56fc2cb1 100644 --- a/appc-common/src/test/java/org/openecomp/appc/pool/CachedElementTest.java +++ b/appc-common/src/test/java/org/openecomp/appc/pool/CachedElementTest.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. */ diff --git a/appc-common/src/test/java/org/openecomp/appc/pool/Element.java b/appc-common/src/test/java/org/openecomp/appc/pool/Element.java index 61c302432..721b7068a 100644 --- a/appc-common/src/test/java/org/openecomp/appc/pool/Element.java +++ b/appc-common/src/test/java/org/openecomp/appc/pool/Element.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. */ diff --git a/appc-common/src/test/java/org/openecomp/appc/pool/PoolTest.java b/appc-common/src/test/java/org/openecomp/appc/pool/PoolTest.java index 97414804c..dedc70251 100644 --- a/appc-common/src/test/java/org/openecomp/appc/pool/PoolTest.java +++ b/appc-common/src/test/java/org/openecomp/appc/pool/PoolTest.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. */ diff --git a/appc-common/src/test/java/org/openecomp/appc/pool/Testable.java b/appc-common/src/test/java/org/openecomp/appc/pool/Testable.java index 61adf91d3..0e7cd4581 100644 --- a/appc-common/src/test/java/org/openecomp/appc/pool/Testable.java +++ b/appc-common/src/test/java/org/openecomp/appc/pool/Testable.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.pool; diff --git a/appc-common/src/test/java/org/openecomp/appc/util/TestJsonUtil.java b/appc-common/src/test/java/org/openecomp/appc/util/TestJsonUtil.java index d78049e12..e8a0ad1ec 100644 --- a/appc-common/src/test/java/org/openecomp/appc/util/TestJsonUtil.java +++ b/appc-common/src/test/java/org/openecomp/appc/util/TestJsonUtil.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.util; diff --git a/appc-common/src/test/java/org/openecomp/appc/util/TestStringHelper.java b/appc-common/src/test/java/org/openecomp/appc/util/TestStringHelper.java index 0afd4cb43..b35dfae6f 100644 --- a/appc-common/src/test/java/org/openecomp/appc/util/TestStringHelper.java +++ b/appc-common/src/test/java/org/openecomp/appc/util/TestStringHelper.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. */ diff --git a/appc-common/src/test/java/org/openecomp/appc/util/TestStructuredPropertyHelper.java b/appc-common/src/test/java/org/openecomp/appc/util/TestStructuredPropertyHelper.java index 35541277f..607aea6e9 100644 --- a/appc-common/src/test/java/org/openecomp/appc/util/TestStructuredPropertyHelper.java +++ b/appc-common/src/test/java/org/openecomp/appc/util/TestStructuredPropertyHelper.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.util; diff --git a/appc-common/src/test/resources/org/openecomp/appc/i18n/TestAdditionalResources.properties b/appc-common/src/test/resources/org/openecomp/appc/i18n/TestAdditionalResources.properties index 020ea7d28..8be865d6d 100644 --- a/appc-common/src/test/resources/org/openecomp/appc/i18n/TestAdditionalResources.properties +++ b/appc-common/src/test/resources/org/openecomp/appc/i18n/TestAdditionalResources.properties @@ -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. ### ADDITIONAL_RESOURCE=This is a message loaded from an additional resource bundle diff --git a/appc-common/src/test/resources/org/openecomp/appc/i18n/TestResources_de.properties b/appc-common/src/test/resources/org/openecomp/appc/i18n/TestResources_de.properties index 01bc87ac6..6d9511682 100644 --- a/appc-common/src/test/resources/org/openecomp/appc/i18n/TestResources_de.properties +++ b/appc-common/src/test/resources/org/openecomp/appc/i18n/TestResources_de.properties @@ -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. ### # diff --git a/appc-common/src/test/resources/org/openecomp/appc/i18n/TestResources_en_US.properties b/appc-common/src/test/resources/org/openecomp/appc/i18n/TestResources_en_US.properties index db9be7b5e..607fe55f9 100644 --- a/appc-common/src/test/resources/org/openecomp/appc/i18n/TestResources_en_US.properties +++ b/appc-common/src/test/resources/org/openecomp/appc/i18n/TestResources_en_US.properties @@ -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. ### # |