From 9314715013b024f8194b0a72e56809afe18a746d Mon Sep 17 00:00:00 2001 From: ARUL NAMBI Date: Mon, 31 Jul 2017 13:27:48 -0400 Subject: Changing the license and trademark Issue-ID: AAI-85 Change-Id: I8b597ba450b8af12290031cbf6eadacf072f630c Signed-off-by: ARUL NAMBI --- .../src/main/java/org/openecomp/cl/api/LogFields.java | 17 +++++++++-------- .../src/main/java/org/openecomp/cl/api/LogLine.java | 17 +++++++++-------- .../src/main/java/org/openecomp/cl/api/Logger.java | 17 +++++++++-------- .../org/openecomp/cl/api/LoggerFactoryInterface.java | 17 +++++++++-------- .../src/main/java/org/openecomp/cl/mdc/MdcContext.java | 17 +++++++++-------- .../src/main/java/org/openecomp/cl/mdc/MdcOverride.java | 17 +++++++++-------- 6 files changed, 54 insertions(+), 48 deletions(-) (limited to 'logging-api/src/main') diff --git a/logging-api/src/main/java/org/openecomp/cl/api/LogFields.java b/logging-api/src/main/java/org/openecomp/cl/api/LogFields.java index c4ec7cb..677aa2c 100644 --- a/logging-api/src/main/java/org/openecomp/cl/api/LogFields.java +++ b/logging-api/src/main/java/org/openecomp/cl/api/LogFields.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * Common Logging Library + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * 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. */ - package org.openecomp.cl.api; import java.util.HashMap; diff --git a/logging-api/src/main/java/org/openecomp/cl/api/LogLine.java b/logging-api/src/main/java/org/openecomp/cl/api/LogLine.java index 6d0435f..f63d421 100644 --- a/logging-api/src/main/java/org/openecomp/cl/api/LogLine.java +++ b/logging-api/src/main/java/org/openecomp/cl/api/LogLine.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * Common Logging Library + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * 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. */ - package org.openecomp.cl.api; import org.openecomp.cl.mdc.MdcContext; diff --git a/logging-api/src/main/java/org/openecomp/cl/api/Logger.java b/logging-api/src/main/java/org/openecomp/cl/api/Logger.java index e2c47f0..50efe49 100644 --- a/logging-api/src/main/java/org/openecomp/cl/api/Logger.java +++ b/logging-api/src/main/java/org/openecomp/cl/api/Logger.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * Common Logging Library + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * 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. */ - package org.openecomp.cl.api; import org.openecomp.cl.mdc.MdcOverride; diff --git a/logging-api/src/main/java/org/openecomp/cl/api/LoggerFactoryInterface.java b/logging-api/src/main/java/org/openecomp/cl/api/LoggerFactoryInterface.java index 62b098d..502aa19 100644 --- a/logging-api/src/main/java/org/openecomp/cl/api/LoggerFactoryInterface.java +++ b/logging-api/src/main/java/org/openecomp/cl/api/LoggerFactoryInterface.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * Common Logging Library + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * 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. */ - package org.openecomp.cl.api; /** diff --git a/logging-api/src/main/java/org/openecomp/cl/mdc/MdcContext.java b/logging-api/src/main/java/org/openecomp/cl/mdc/MdcContext.java index a36556d..285ca9b 100644 --- a/logging-api/src/main/java/org/openecomp/cl/mdc/MdcContext.java +++ b/logging-api/src/main/java/org/openecomp/cl/mdc/MdcContext.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * Common Logging Library + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * 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. */ - package org.openecomp.cl.mdc; import org.slf4j.MDC; diff --git a/logging-api/src/main/java/org/openecomp/cl/mdc/MdcOverride.java b/logging-api/src/main/java/org/openecomp/cl/mdc/MdcOverride.java index 6031b1c..cc5e131 100644 --- a/logging-api/src/main/java/org/openecomp/cl/mdc/MdcOverride.java +++ b/logging-api/src/main/java/org/openecomp/cl/mdc/MdcOverride.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * Common Logging Library + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * 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. */ - package org.openecomp.cl.mdc; import java.util.HashMap; -- cgit 1.2.3-korg