From 6ff6ed9734d5cfa5ebc8e362dfdb63fa55cc0dbd Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Mon, 3 Feb 2020 09:31:39 -0500 Subject: Adding Copyright to all Files Reformatting POM Files as per mvn tidy:pom Change-Id: Id90a8b5450d08ee810718cb00d9fb8b6cf38618a Issue-ID: CCSDK-2069 Signed-off-by: Singal, Kapil (ks220y) --- sdnr/wt/helpserver/feature/pom.xml | 44 ++++++------ sdnr/wt/helpserver/installer/pom.xml | 46 +++++++------ .../src/assembly/assemble_mvnrepo_zip.xml | 80 +++++++++++----------- sdnr/wt/helpserver/pom.xml | 44 ++++++------ sdnr/wt/helpserver/provider/pom.xml | 46 +++++++------ .../resources/OSGI-INF/blueprint/blueprint.xml | 49 +++++++------ .../src/test/resources/simplelogger.properties | 21 ++++++ 7 files changed, 181 insertions(+), 149 deletions(-) (limited to 'sdnr/wt/helpserver') diff --git a/sdnr/wt/helpserver/feature/pom.xml b/sdnr/wt/helpserver/feature/pom.xml index 80de3c5b4..344ae403d 100644 --- a/sdnr/wt/helpserver/feature/pom.xml +++ b/sdnr/wt/helpserver/feature/pom.xml @@ -1,26 +1,28 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.feature.sdnr.wt - * ================================================================================ - * Copyright (C) 2018 highstreet technologies GmbH Intellectual Property. - * All rights reserved. - * ================================================================================ - * 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. - * ============LICENSE_END========================================================= - ---> 4.0.0 @@ -28,7 +30,7 @@ org.onap.ccsdk.parent single-feature-parent 1.5.2-SNAPSHOT - + org.onap.ccsdk.features.sdnr.wt diff --git a/sdnr/wt/helpserver/installer/pom.xml b/sdnr/wt/helpserver/installer/pom.xml index bb1bfcfa4..bc96a2f21 100755 --- a/sdnr/wt/helpserver/installer/pom.xml +++ b/sdnr/wt/helpserver/installer/pom.xml @@ -1,26 +1,28 @@ + ~ ============LICENSE_START======================================================= + ~ ONAP : ccsdk features + ~ ================================================================================ + ~ Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. + ~ All rights reserved. + ~ ================================================================================ + ~ Update Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + ~ ================================================================================ + ~ 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. + ~ ============LICENSE_END======================================================= + ~ + --> + 4.0.0 @@ -28,7 +30,7 @@ org.onap.ccsdk.parent odlparent-lite 1.5.2-SNAPSHOT - + org.onap.ccsdk.features.sdnr.wt diff --git a/sdnr/wt/helpserver/installer/src/assembly/assemble_mvnrepo_zip.xml b/sdnr/wt/helpserver/installer/src/assembly/assemble_mvnrepo_zip.xml index c4eb9aa25..dfe5060bf 100644 --- a/sdnr/wt/helpserver/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/sdnr/wt/helpserver/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -1,49 +1,47 @@ - repo - - zip - - - - false - - - - target/assembly/ - . - - - - - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + repo + + zip + + + + false + + + + target/assembly/ + . + + + + diff --git a/sdnr/wt/helpserver/pom.xml b/sdnr/wt/helpserver/pom.xml index 51033f85f..791234240 100755 --- a/sdnr/wt/helpserver/pom.xml +++ b/sdnr/wt/helpserver/pom.xml @@ -1,26 +1,28 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.feature.sdnr.wt - * ================================================================================ - * Copyright (C) 2018 highstreet technologies GmbH Intellectual Property. - * All rights reserved. - * ================================================================================ - * 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. - * ============LICENSE_END========================================================= - ---> 4.0.0 @@ -28,7 +30,7 @@ org.onap.ccsdk.parent odlparent-lite 1.5.2-SNAPSHOT - + org.onap.ccsdk.features.sdnr.wt diff --git a/sdnr/wt/helpserver/provider/pom.xml b/sdnr/wt/helpserver/provider/pom.xml index 639b4d090..784da73dc 100644 --- a/sdnr/wt/helpserver/provider/pom.xml +++ b/sdnr/wt/helpserver/provider/pom.xml @@ -1,26 +1,28 @@ + ~ ============LICENSE_START======================================================= + ~ ONAP : ccsdk features + ~ ================================================================================ + ~ Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. + ~ All rights reserved. + ~ ================================================================================ + ~ Update Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + ~ ================================================================================ + ~ 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. + ~ ============LICENSE_END======================================================= + ~ + --> + 4.0.0 @@ -28,7 +30,7 @@ org.onap.ccsdk.parent binding-parent 1.5.2-SNAPSHOT - + org.onap.ccsdk.features.sdnr.wt diff --git a/sdnr/wt/helpserver/provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/sdnr/wt/helpserver/provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 8c614c4af..387aa4557 100644 --- a/sdnr/wt/helpserver/provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/sdnr/wt/helpserver/provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -1,32 +1,37 @@ - + ~ ============LICENSE_START======================================================= + ~ ONAP : ccsdk features + ~ ================================================================================ + ~ Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. + ~ All rights reserved. + ~ ================================================================================ + ~ Update Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + ~ ================================================================================ + ~ 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. + ~ ============LICENSE_END======================================================= + ~ + --> + + + class="org.onap.ccsdk.features.sdnr.wt.helpserver.HelpServlet"> - + - + diff --git a/sdnr/wt/helpserver/provider/src/test/resources/simplelogger.properties b/sdnr/wt/helpserver/provider/src/test/resources/simplelogger.properties index 6f38b507a..1aa3824a1 100644 --- a/sdnr/wt/helpserver/provider/src/test/resources/simplelogger.properties +++ b/sdnr/wt/helpserver/provider/src/test/resources/simplelogger.properties @@ -1,3 +1,24 @@ +# +# ============LICENSE_START======================================================= +# ONAP : ccsdk features +# ================================================================================ +# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# 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. +# ============LICENSE_END======================================================= +# +# + # SLF4J's SimpleLogger configuration file # Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err. -- cgit 1.2.3-korg