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-oam/appc-oam-bundle/.gitignore | 1 + .../appc/oam/impl/rev170303/AppcOamModule.java | 8 +++++--- .../oam/impl/rev170303/AppcOamModuleFactory.java | 8 +++++--- .../main/java/org/openecomp/appc/oam/AppcOam.java | 8 +++++--- .../org/openecomp/appc/oam/OAMCommandStatus.java | 8 +++++--- .../appc/oam/messageadapter/Converter.java | 8 +++++--- .../oam/messageadapter/DmaapOutgoingMessage.java | 8 +++++--- .../appc/oam/messageadapter/MessageAdapter.java | 8 +++++--- .../appc/oam/messageadapter/OAMContext.java | 8 +++++--- .../resources/OSGI-INF/blueprint/blueprint.xml | 8 +++++--- .../src/main/resources/initial/appc-oam.xml | 8 +++++--- .../org/openecomp/appc/default.properties | 8 +++++--- .../main/resources/org/openecomp/appc/logback.xml | 8 +++++--- .../appc-oam-bundle/src/main/yang/appc-oam.yang | 24 ++++++++++++++++++++++ .../src/main/resources/features.xml | 8 +++++--- .../src/assembly/assemble_installer_zip.xml | 8 +++++--- .../src/assembly/assemble_mvnrepo_zip.xml | 8 +++++--- .../src/main/resources/scripts/install-feature.sh | 8 +++++--- .../appc-oam-model/src/main/yang/appc-oam.yang | 24 ++++++++++++++++++++++ 19 files changed, 129 insertions(+), 48 deletions(-) create mode 100644 appc-oam/appc-oam-bundle/.gitignore (limited to 'appc-oam') diff --git a/appc-oam/appc-oam-bundle/.gitignore b/appc-oam/appc-oam-bundle/.gitignore new file mode 100644 index 000000000..b83d22266 --- /dev/null +++ b/appc-oam/appc-oam-bundle/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModule.java b/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModule.java index d8221d1ca..d44a9ba49 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModule.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModule.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.opendaylight.yang.gen.v1.org.openecomp.appc.oam.impl.rev170303; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModuleFactory.java b/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModuleFactory.java index 55c19a55f..66fdad3c4 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModuleFactory.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModuleFactory.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-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/AppcOam.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/AppcOam.java index 3e1b1620b..8fd6b2c1a 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/AppcOam.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/AppcOam.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.oam; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/OAMCommandStatus.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/OAMCommandStatus.java index 2d004d0ed..cef242cf5 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/OAMCommandStatus.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/OAMCommandStatus.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.oam; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/Converter.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/Converter.java index f14d17926..e9ccfdd2d 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/Converter.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/Converter.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.oam.messageadapter; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/DmaapOutgoingMessage.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/DmaapOutgoingMessage.java index 9257cd57a..54887521d 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/DmaapOutgoingMessage.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/DmaapOutgoingMessage.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.oam.messageadapter; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/MessageAdapter.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/MessageAdapter.java index 79deaea06..8c818b23d 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/MessageAdapter.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/MessageAdapter.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.oam.messageadapter; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/OAMContext.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/OAMContext.java index 6d35f717c..2d33388a0 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/OAMContext.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/OAMContext.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.oam.messageadapter; diff --git a/appc-oam/appc-oam-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-oam/appc-oam-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 0b04bf93c..791a897b6 100644 --- a/appc-oam/appc-oam-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/appc-oam/appc-oam-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -1,11 +1,12 @@ diff --git a/appc-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/default.properties index d7cca86d7..dc84b8be2 100644 --- a/appc-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/default.properties +++ b/appc-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/default.properties @@ -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-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/logback.xml b/appc-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/logback.xml index cc5a56c17..799a1d8df 100644 --- a/appc-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/logback.xml +++ b/appc-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/logback.xml @@ -1,10 +1,11 @@ diff --git a/appc-oam/appc-oam-bundle/src/main/yang/appc-oam.yang b/appc-oam/appc-oam-bundle/src/main/yang/appc-oam.yang index 364707ef5..a2c64497a 100644 --- a/appc-oam/appc-oam-bundle/src/main/yang/appc-oam.yang +++ b/appc-oam/appc-oam-bundle/src/main/yang/appc-oam.yang @@ -1,3 +1,27 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP : APPC + * ================================================================================ + * 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. + * You may obtain a copy of the License at + * + * 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. + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. + * ============LICENSE_END========================================================= + */ + module appc-oam-impl { yang-version 1; diff --git a/appc-oam/appc-oam-features/src/main/resources/features.xml b/appc-oam/appc-oam-features/src/main/resources/features.xml index d7c2076c0..139704093 100644 --- a/appc-oam/appc-oam-features/src/main/resources/features.xml +++ b/appc-oam/appc-oam-features/src/main/resources/features.xml @@ -1,11 +1,12 @@ diff --git a/appc-oam/appc-oam-installer/src/assembly/assemble_installer_zip.xml b/appc-oam/appc-oam-installer/src/assembly/assemble_installer_zip.xml index 21b83612b..e54eede04 100644 --- a/appc-oam/appc-oam-installer/src/assembly/assemble_installer_zip.xml +++ b/appc-oam/appc-oam-installer/src/assembly/assemble_installer_zip.xml @@ -1,10 +1,11 @@ diff --git a/appc-oam/appc-oam-installer/src/assembly/assemble_mvnrepo_zip.xml b/appc-oam/appc-oam-installer/src/assembly/assemble_mvnrepo_zip.xml index 2ba678fb8..1e5d7b075 100644 --- a/appc-oam/appc-oam-installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/appc-oam/appc-oam-installer/src/assembly/assemble_mvnrepo_zip.xml @@ -1,10 +1,11 @@ diff --git a/appc-oam/appc-oam-installer/src/main/resources/scripts/install-feature.sh b/appc-oam/appc-oam-installer/src/main/resources/scripts/install-feature.sh index 6892eeaa2..05b4ae373 100644 --- a/appc-oam/appc-oam-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-oam/appc-oam-installer/src/main/resources/scripts/install-feature.sh @@ -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========================================================= ### #!/bin/bash diff --git a/appc-oam/appc-oam-model/src/main/yang/appc-oam.yang b/appc-oam/appc-oam-model/src/main/yang/appc-oam.yang index 4611a3242..d84d8ce79 100644 --- a/appc-oam/appc-oam-model/src/main/yang/appc-oam.yang +++ b/appc-oam/appc-oam-model/src/main/yang/appc-oam.yang @@ -1,3 +1,27 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP : APPC + * ================================================================================ + * 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. + * You may obtain a copy of the License at + * + * 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. + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. + * ============LICENSE_END========================================================= + */ + /* * Yang model for the OAM component of Application Controller (APP-C) component of ONAP * -- cgit 1.2.3-korg