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/odlux/core/features/pom.xml | 38 ++-- sdnr/wt/odlux/core/installer/pom.xml | 203 ++++++++++--------- .../src/assembly/assemble_mvnrepo_zip.xml | 80 ++++---- sdnr/wt/odlux/core/model/pom.xml | 21 ++ sdnr/wt/odlux/core/pom.xml | 75 ++++--- sdnr/wt/odlux/core/provider/pom.xml | 225 +++++++++++---------- .../resources/OSGI-INF/blueprint/blueprint.xml | 50 +++-- .../src/test/resources/simplelogger.properties | 21 ++ 8 files changed, 423 insertions(+), 290 deletions(-) (limited to 'sdnr/wt/odlux/core') diff --git a/sdnr/wt/odlux/core/features/pom.xml b/sdnr/wt/odlux/core/features/pom.xml index c29104e4b..40d711fa1 100644 --- a/sdnr/wt/odlux/core/features/pom.xml +++ b/sdnr/wt/odlux/core/features/pom.xml @@ -1,16 +1,28 @@ - + + 4.0.0 @@ -26,7 +38,7 @@ 0.7.1-SNAPSHOT feature - ccsdk-features :: ${project.artifactId} :: feature + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 diff --git a/sdnr/wt/odlux/core/installer/pom.xml b/sdnr/wt/odlux/core/installer/pom.xml index cf00a4901..fa240aa35 100755 --- a/sdnr/wt/odlux/core/installer/pom.xml +++ b/sdnr/wt/odlux/core/installer/pom.xml @@ -1,100 +1,121 @@ + + - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.2-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.2-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-core-installer - 0.7.1-SNAPSHOT - pom + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-core-installer + 0.7.1-SNAPSHOT + pom - ccsdk-features :: ${project.artifactId} - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - sdnr-wt-odlux-core - false - + + sdnr-wt-odlux-core + false + - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-feature - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-provider - ${project.version} - - + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-feature + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-provider + ${project.version} + + - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-nested-dependencies - - copy-dependencies - - prepare-package - - true - ${project.build.directory}/assembly/system - false - true - true - true - false - false - - - - - - - - + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-nested-dependencies + + copy-dependencies + + prepare-package + + true + ${project.build.directory}/assembly/system + false + true + true + true + false + false + + + + + + + + diff --git a/sdnr/wt/odlux/core/installer/src/assembly/assemble_mvnrepo_zip.xml b/sdnr/wt/odlux/core/installer/src/assembly/assemble_mvnrepo_zip.xml index c4eb9aa25..dfe5060bf 100644 --- a/sdnr/wt/odlux/core/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/sdnr/wt/odlux/core/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/odlux/core/model/pom.xml b/sdnr/wt/odlux/core/model/pom.xml index 2a8f342e6..014e7d7dc 100644 --- a/sdnr/wt/odlux/core/model/pom.xml +++ b/sdnr/wt/odlux/core/model/pom.xml @@ -1,4 +1,25 @@ + + 4.0.0 diff --git a/sdnr/wt/odlux/core/pom.xml b/sdnr/wt/odlux/core/pom.xml index 9840177fe..2daae16eb 100644 --- a/sdnr/wt/odlux/core/pom.xml +++ b/sdnr/wt/odlux/core/pom.xml @@ -1,35 +1,56 @@ + + - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.2-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.2-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-core-top - 0.7.1-SNAPSHOT - pom + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-core-top + 0.7.1-SNAPSHOT + pom - odlux-core - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - model - provider - features - installer - + + model + provider + features + installer + - - sdnr-wt-odlux-core - + + sdnr-wt-odlux-core + diff --git a/sdnr/wt/odlux/core/provider/pom.xml b/sdnr/wt/odlux/core/provider/pom.xml index 09b26f03e..d4d58dde4 100644 --- a/sdnr/wt/odlux/core/provider/pom.xml +++ b/sdnr/wt/odlux/core/provider/pom.xml @@ -1,111 +1,132 @@ + + - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.5.2-SNAPSHOT - - + + org.onap.ccsdk.parent + binding-parent + 1.5.2-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-core-provider - 0.7.1-SNAPSHOT - bundle + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-core-provider + 0.7.1-SNAPSHOT + bundle - ccsdk-features :: ${project.artifactId} - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-core-model - ${project.version} - - - ${project.groupId} - sdnr-wt-odlux-framework - ${project.version} - - - org.eclipse.jetty - jetty-server - test - + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-core-model + ${project.version} + + + ${project.groupId} + sdnr-wt-odlux-framework + ${project.version} + + + org.eclipse.jetty + jetty-server + test + - - org.osgi - org.osgi.core - - - org.osgi - org.osgi.compendium - - - org.slf4j - slf4j-api - - - com.google.guava - guava - - - javax.servlet - javax.servlet-api - - - org.mockito - mockito-core - test - - - junit - junit - test - - - org.slf4j - slf4j-simple - test - - + + org.osgi + org.osgi.core + + + org.osgi + org.osgi.compendium + + + org.slf4j + slf4j-api + + + com.google.guava + guava + + + javax.servlet + javax.servlet-api + + + org.mockito + mockito-core + test + + + junit + junit + test + + + org.slf4j + slf4j-simple + test + + - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - maven-checkstyle-plugin - - true - - - - org.apache.felix - maven-bundle-plugin - true - - - org.onap.ccsdk.features.sdnr.wt.odlux.*;resolution:=optional,*; - - sdnr-wt-odlux-framework;inline=true - true - ${project.groupId}.* - - - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + maven-checkstyle-plugin + + true + + + + org.apache.felix + maven-bundle-plugin + true + + + org.onap.ccsdk.features.sdnr.wt.odlux.*;resolution:=optional,*; + + sdnr-wt-odlux-framework;inline=true + true + ${project.groupId}.* + + + + + diff --git a/sdnr/wt/odlux/core/provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/sdnr/wt/odlux/core/provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 5dab578de..250be6017 100644 --- a/sdnr/wt/odlux/core/provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/sdnr/wt/odlux/core/provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -1,36 +1,54 @@ + - + + class="org.onap.ccsdk.features.sdnr.wt.odlux.IndexServlet"> - + - + - - + + - - + + - + - + + class="org.onap.ccsdk.features.sdnr.wt.odlux.ResFilesServlet"> - + - + diff --git a/sdnr/wt/odlux/core/provider/src/test/resources/simplelogger.properties b/sdnr/wt/odlux/core/provider/src/test/resources/simplelogger.properties index 426f84834..e13b656c1 100644 --- a/sdnr/wt/odlux/core/provider/src/test/resources/simplelogger.properties +++ b/sdnr/wt/odlux/core/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