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/apps/apiDemo/pom.xml | 31 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 21 ++ sdnr/wt/odlux/apps/app-feature/pom.xml | 38 ++- sdnr/wt/odlux/apps/app-installer/pom.xml | 21 ++ .../src/assembly/assemble_mvnrepo_zip.xml | 80 +++-- sdnr/wt/odlux/apps/configurationApp/pom.xml | 31 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 21 ++ sdnr/wt/odlux/apps/connectApp/pom.xml | 31 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 21 ++ sdnr/wt/odlux/apps/demoApp/pom.xml | 31 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 21 ++ sdnr/wt/odlux/apps/eventLogApp/pom.xml | 31 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 21 ++ sdnr/wt/odlux/apps/faultApp/pom.xml | 31 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 23 +- sdnr/wt/odlux/apps/helpApp/pom.xml | 31 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 21 ++ sdnr/wt/odlux/apps/inventoryApp/pom.xml | 31 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 23 +- sdnr/wt/odlux/apps/maintenanceApp/pom.xml | 31 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 23 +- sdnr/wt/odlux/apps/mediatorApp/pom.xml | 31 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 23 +- sdnr/wt/odlux/apps/minimumApp/pom.xml | 31 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 23 +- sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml | 31 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 21 ++ 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 ++ sdnr/wt/odlux/framework/pom.xml | 335 +++++++++++---------- sdnr/wt/odlux/pom.xml | 71 +++-- 37 files changed, 1301 insertions(+), 591 deletions(-) (limited to 'sdnr/wt/odlux') diff --git a/sdnr/wt/odlux/apps/apiDemo/pom.xml b/sdnr/wt/odlux/apps/apiDemo/pom.xml index 5b6cfa389..69f73cdea 100644 --- a/sdnr/wt/odlux/apps/apiDemo/pom.xml +++ b/sdnr/wt/odlux/apps/apiDemo/pom.xml @@ -1,4 +1,25 @@ + + 4.0.0 @@ -14,7 +35,7 @@ 0.7.1-SNAPSHOT bundle - sdnr-wt-odlux-app-apiDemo + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 @@ -111,10 +132,10 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.2 - + de.jacks-it-lab + frontend-maven-plugin + 1.7.2 + install node and yarn diff --git a/sdnr/wt/odlux/apps/apiDemo/src2/main/resources/OSGI-INF/blueprint/blueprint.xml b/sdnr/wt/odlux/apps/apiDemo/src2/main/resources/OSGI-INF/blueprint/blueprint.xml index 0877578e2..0b866711e 100644 --- a/sdnr/wt/odlux/apps/apiDemo/src2/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/sdnr/wt/odlux/apps/apiDemo/src2/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -1,3 +1,24 @@ + + diff --git a/sdnr/wt/odlux/apps/app-feature/pom.xml b/sdnr/wt/odlux/apps/app-feature/pom.xml index d95101681..d73bec16c 100644 --- a/sdnr/wt/odlux/apps/app-feature/pom.xml +++ b/sdnr/wt/odlux/apps/app-feature/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/apps/app-installer/pom.xml b/sdnr/wt/odlux/apps/app-installer/pom.xml index b0a3079f4..730b86484 100755 --- a/sdnr/wt/odlux/apps/app-installer/pom.xml +++ b/sdnr/wt/odlux/apps/app-installer/pom.xml @@ -1,4 +1,25 @@ + + 4.0.0 diff --git a/sdnr/wt/odlux/apps/app-installer/src/assembly/assemble_mvnrepo_zip.xml b/sdnr/wt/odlux/apps/app-installer/src/assembly/assemble_mvnrepo_zip.xml index c4eb9aa25..dfe5060bf 100644 --- a/sdnr/wt/odlux/apps/app-installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/sdnr/wt/odlux/apps/app-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/apps/configurationApp/pom.xml b/sdnr/wt/odlux/apps/configurationApp/pom.xml index 9681555db..8b25acc86 100644 --- a/sdnr/wt/odlux/apps/configurationApp/pom.xml +++ b/sdnr/wt/odlux/apps/configurationApp/pom.xml @@ -1,4 +1,25 @@ + + 4.0.0 @@ -14,7 +35,7 @@ 0.7.1-SNAPSHOT bundle - sdnr-wt-odlux-app-configurationApp + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 @@ -103,10 +124,10 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.2 - + de.jacks-it-lab + frontend-maven-plugin + 1.7.2 + install node and yarn diff --git a/sdnr/wt/odlux/apps/configurationApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml b/sdnr/wt/odlux/apps/configurationApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml index 48f7dde3d..b4cff5723 100644 --- a/sdnr/wt/odlux/apps/configurationApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/sdnr/wt/odlux/apps/configurationApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -1,3 +1,24 @@ + + diff --git a/sdnr/wt/odlux/apps/connectApp/pom.xml b/sdnr/wt/odlux/apps/connectApp/pom.xml index 619c02a2d..e460d7782 100644 --- a/sdnr/wt/odlux/apps/connectApp/pom.xml +++ b/sdnr/wt/odlux/apps/connectApp/pom.xml @@ -1,4 +1,25 @@ + + 4.0.0 @@ -14,7 +35,7 @@ 0.7.1-SNAPSHOT bundle - sdnr-wt-odlux-app-connectApp + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 @@ -103,10 +124,10 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.2 - + de.jacks-it-lab + frontend-maven-plugin + 1.7.2 + install node and yarn diff --git a/sdnr/wt/odlux/apps/connectApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml b/sdnr/wt/odlux/apps/connectApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml index adc9b777b..685ea76ba 100644 --- a/sdnr/wt/odlux/apps/connectApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/sdnr/wt/odlux/apps/connectApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -1,3 +1,24 @@ + + diff --git a/sdnr/wt/odlux/apps/demoApp/pom.xml b/sdnr/wt/odlux/apps/demoApp/pom.xml index 9e96cf410..3cee89401 100644 --- a/sdnr/wt/odlux/apps/demoApp/pom.xml +++ b/sdnr/wt/odlux/apps/demoApp/pom.xml @@ -1,4 +1,25 @@ + + 4.0.0 @@ -14,7 +35,7 @@ 0.7.1-SNAPSHOT bundle - sdnr-wt-odlux-app-demoApp + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 @@ -103,10 +124,10 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.2 - + de.jacks-it-lab + frontend-maven-plugin + 1.7.2 + install node and yarn diff --git a/sdnr/wt/odlux/apps/demoApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml b/sdnr/wt/odlux/apps/demoApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml index 91f6002ac..a6b692fe4 100644 --- a/sdnr/wt/odlux/apps/demoApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/sdnr/wt/odlux/apps/demoApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -1,3 +1,24 @@ + + diff --git a/sdnr/wt/odlux/apps/eventLogApp/pom.xml b/sdnr/wt/odlux/apps/eventLogApp/pom.xml index e5ac653d5..8c22aa77f 100644 --- a/sdnr/wt/odlux/apps/eventLogApp/pom.xml +++ b/sdnr/wt/odlux/apps/eventLogApp/pom.xml @@ -1,4 +1,25 @@ + + 4.0.0 @@ -14,7 +35,7 @@ 0.7.1-SNAPSHOT bundle - sdnr-wt-odlux-app-eventLogApp + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 @@ -103,10 +124,10 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.2 - + de.jacks-it-lab + frontend-maven-plugin + 1.7.2 + install node and yarn diff --git a/sdnr/wt/odlux/apps/eventLogApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml b/sdnr/wt/odlux/apps/eventLogApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml index cb2d0626a..fe82b6145 100644 --- a/sdnr/wt/odlux/apps/eventLogApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/sdnr/wt/odlux/apps/eventLogApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -1,3 +1,24 @@ + + diff --git a/sdnr/wt/odlux/apps/faultApp/pom.xml b/sdnr/wt/odlux/apps/faultApp/pom.xml index 63825dd54..018d70e1a 100644 --- a/sdnr/wt/odlux/apps/faultApp/pom.xml +++ b/sdnr/wt/odlux/apps/faultApp/pom.xml @@ -1,4 +1,25 @@ + + 4.0.0 @@ -14,7 +35,7 @@ 0.7.1-SNAPSHOT bundle - sdnr-wt-odlux-app-faultApp + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 @@ -103,10 +124,10 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.2 - + de.jacks-it-lab + frontend-maven-plugin + 1.7.2 + install node and yarn diff --git a/sdnr/wt/odlux/apps/faultApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml b/sdnr/wt/odlux/apps/faultApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml index e7c262bc0..a79cc16c9 100644 --- a/sdnr/wt/odlux/apps/faultApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/sdnr/wt/odlux/apps/faultApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -1,9 +1,30 @@ + + - + \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/helpApp/pom.xml b/sdnr/wt/odlux/apps/helpApp/pom.xml index 760049cac..4afd91b81 100644 --- a/sdnr/wt/odlux/apps/helpApp/pom.xml +++ b/sdnr/wt/odlux/apps/helpApp/pom.xml @@ -1,4 +1,25 @@ + + 4.0.0 @@ -14,7 +35,7 @@ 0.7.1-SNAPSHOT bundle - sdnr-wt-odlux-app-helpApp + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 @@ -103,10 +124,10 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.2 - + de.jacks-it-lab + frontend-maven-plugin + 1.7.2 + install node and yarn diff --git a/sdnr/wt/odlux/apps/helpApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml b/sdnr/wt/odlux/apps/helpApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml index a0e3dac11..0fe9cd0e0 100644 --- a/sdnr/wt/odlux/apps/helpApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/sdnr/wt/odlux/apps/helpApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -1,3 +1,24 @@ + + diff --git a/sdnr/wt/odlux/apps/inventoryApp/pom.xml b/sdnr/wt/odlux/apps/inventoryApp/pom.xml index 9420b6cfa..5f9038576 100644 --- a/sdnr/wt/odlux/apps/inventoryApp/pom.xml +++ b/sdnr/wt/odlux/apps/inventoryApp/pom.xml @@ -1,4 +1,25 @@ + + 4.0.0 @@ -14,7 +35,7 @@ 0.7.1-SNAPSHOT bundle - sdnr-wt-odlux-app-inventoryApp + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 @@ -103,10 +124,10 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.2 - + de.jacks-it-lab + frontend-maven-plugin + 1.7.2 + install node and yarn diff --git a/sdnr/wt/odlux/apps/inventoryApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml b/sdnr/wt/odlux/apps/inventoryApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml index f0bf05483..68f9a6554 100644 --- a/sdnr/wt/odlux/apps/inventoryApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/sdnr/wt/odlux/apps/inventoryApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -1,9 +1,30 @@ + + - + \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/maintenanceApp/pom.xml b/sdnr/wt/odlux/apps/maintenanceApp/pom.xml index 0196e3929..ca1dcdd90 100644 --- a/sdnr/wt/odlux/apps/maintenanceApp/pom.xml +++ b/sdnr/wt/odlux/apps/maintenanceApp/pom.xml @@ -1,4 +1,25 @@ + + 4.0.0 @@ -14,7 +35,7 @@ 0.7.1-SNAPSHOT bundle - sdnr-wt-odlux-app-maintenanceApp + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 @@ -103,10 +124,10 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.2 - + de.jacks-it-lab + frontend-maven-plugin + 1.7.2 + install node and yarn diff --git a/sdnr/wt/odlux/apps/maintenanceApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml b/sdnr/wt/odlux/apps/maintenanceApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml index 2dd79d781..0c6a6d90a 100644 --- a/sdnr/wt/odlux/apps/maintenanceApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/sdnr/wt/odlux/apps/maintenanceApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -1,9 +1,30 @@ + + - + diff --git a/sdnr/wt/odlux/apps/mediatorApp/pom.xml b/sdnr/wt/odlux/apps/mediatorApp/pom.xml index 5a3b8023b..3cd613809 100644 --- a/sdnr/wt/odlux/apps/mediatorApp/pom.xml +++ b/sdnr/wt/odlux/apps/mediatorApp/pom.xml @@ -1,4 +1,25 @@ + + 4.0.0 @@ -14,7 +35,7 @@ 0.7.1-SNAPSHOT bundle - sdnr-wt-odlux-app-mediatorApp + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 @@ -103,10 +124,10 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.2 - + de.jacks-it-lab + frontend-maven-plugin + 1.7.2 + install node and yarn diff --git a/sdnr/wt/odlux/apps/mediatorApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml b/sdnr/wt/odlux/apps/mediatorApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml index c11492bc4..7c9335593 100644 --- a/sdnr/wt/odlux/apps/mediatorApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/sdnr/wt/odlux/apps/mediatorApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -1,9 +1,30 @@ + + - + \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/minimumApp/pom.xml b/sdnr/wt/odlux/apps/minimumApp/pom.xml index 81af1fbe5..25d7075d7 100644 --- a/sdnr/wt/odlux/apps/minimumApp/pom.xml +++ b/sdnr/wt/odlux/apps/minimumApp/pom.xml @@ -1,4 +1,25 @@ + + 4.0.0 @@ -14,7 +35,7 @@ 0.7.1-SNAPSHOT bundle - sdnr-wt-odlux-app-minimumApp + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 @@ -103,10 +124,10 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.2 - + de.jacks-it-lab + frontend-maven-plugin + 1.7.2 + install node and yarn diff --git a/sdnr/wt/odlux/apps/minimumApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml b/sdnr/wt/odlux/apps/minimumApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml index 4c8ed1343..219b4f901 100644 --- a/sdnr/wt/odlux/apps/minimumApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/sdnr/wt/odlux/apps/minimumApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -1,9 +1,30 @@ + + - + \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml b/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml index e60a6c1c2..962782f93 100644 --- a/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml +++ b/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml @@ -1,4 +1,25 @@ + + 4.0.0 @@ -14,7 +35,7 @@ 0.7.1-SNAPSHOT bundle - sdnr-wt-odlux-app-performanceHistoryApp + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 @@ -103,10 +124,10 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.2 - + de.jacks-it-lab + frontend-maven-plugin + 1.7.2 + install node and yarn diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml b/sdnr/wt/odlux/apps/performanceHistoryApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml index 1bcbf0127..b59be86ff 100644 --- a/sdnr/wt/odlux/apps/performanceHistoryApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -1,3 +1,24 @@ + + 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. diff --git a/sdnr/wt/odlux/framework/pom.xml b/sdnr/wt/odlux/framework/pom.xml index 78349e471..6d80421b8 100644 --- a/sdnr/wt/odlux/framework/pom.xml +++ b/sdnr/wt/odlux/framework/pom.xml @@ -1,165 +1,186 @@ + + - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent - 1.5.2-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent + 1.5.2-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-framework - 0.7.1-SNAPSHOT - jar + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-framework + 0.7.1-SNAPSHOT + jar - sdnr-wt-odlux-framework - - - 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 + + - - ${maven.build.timestamp} - ONAP Frankfurt (Neon, mdsal ${odl.mdsal.version}) - 39.0e1988b(20/01/12) - ONAP SDN-R | ONF Wireless for ${distversion} - Build: ${buildtime} ${buildno} ${project.version} - + + ${maven.build.timestamp} + ONAP Frankfurt (Neon, mdsal ${odl.mdsal.version}) + 39.0e1988b(20/01/12) + ONAP SDN-R | ONF Wireless for ${distversion} - Build: ${buildtime} ${buildno} ${project.version} + - - - - dist - odlux - - - - - maven-clean-plugin - - - - dist - false - - - node - false - - - node_modules - false - - - ../node_modules - false - - - - bin - false - - - - - - de.jacks-it-lab - frontend-maven-plugin - 1.7.2 - - - install node and yarn - - install-node-and-yarn - - - initialize - - v10.16.3 - v1.19.0 - - - - clear cache - - yarn - - initialize - - cache clean - ${project.basedir} - ${project.basedir}/../ - - - - install lerna - - yarn - - initialize - - add lerna@3.13.1 -W --exact - ${project.basedir} - ${project.basedir}/../ - - - - exec lerna bootstrap - - lerna - - initialize - - false - bootstrap - ${project.basedir} - ${project.basedir}/../ - - - - yarn build - - yarn - - - run build - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - com.google.code.maven-replacer-plugin - replacer - 1.5.2 - - - replace version - prepare-package - - replace - - - - - ${project.build.directory}/classes/odlux - - app.js - - - - ##odlux.version## - ${odlux.version} - - - - - - + + + + dist + odlux + + + + + maven-clean-plugin + + + + dist + false + + + node + false + + + node_modules + false + + + ../node_modules + false + + + + bin + false + + + + + + de.jacks-it-lab + frontend-maven-plugin + 1.7.2 + + + install node and yarn + + install-node-and-yarn + + + initialize + + v10.16.3 + v1.19.0 + + + + clear cache + + yarn + + initialize + + cache clean + ${project.basedir} + ${project.basedir}/../ + + + + install lerna + + yarn + + initialize + + add lerna@3.13.1 -W --exact + ${project.basedir} + ${project.basedir}/../ + + + + exec lerna bootstrap + + lerna + + initialize + + false + bootstrap + ${project.basedir} + ${project.basedir}/../ + + + + yarn build + + yarn + + + run build + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + com.google.code.maven-replacer-plugin + replacer + 1.5.2 + + + replace version + prepare-package + + replace + + + + + ${project.build.directory}/classes/odlux + + app.js + + + + ##odlux.version## + ${odlux.version} + + + + + + diff --git a/sdnr/wt/odlux/pom.xml b/sdnr/wt/odlux/pom.xml index df71097ce..16998d1e7 100644 --- a/sdnr/wt/odlux/pom.xml +++ b/sdnr/wt/odlux/pom.xml @@ -1,4 +1,25 @@ + + 4.0.0 @@ -14,7 +35,7 @@ 0.7.1-SNAPSHOT pom - odlux + ccsdk-features :: ${project.artifactId} framework @@ -29,34 +50,34 @@ apps/maintenanceApp apps/minimumApp apps/performanceHistoryApp - apps/eventLogApp + apps/eventLogApp apps/configurationApp apps/app-feature apps/app-installer - - - org.codehaus.mojo - exec-maven-plugin - - - Clean node and node_modules - package - - exec - - - rm - - -r - node_modules - - - - - - - + + + org.codehaus.mojo + exec-maven-plugin + + + Clean node and node_modules + package + + exec + + + rm + + -r + node_modules + + + + + + + -- cgit 1.2.3-korg