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/apigateway/feature/pom.xml | 44 +-- sdnr/wt/apigateway/installer/pom.xml | 64 ++-- .../src/assembly/assemble_mvnrepo_zip.xml | 80 +++-- sdnr/wt/apigateway/pom.xml | 42 +-- sdnr/wt/apigateway/provider/pom.xml | 36 ++- .../org/opendaylight/blueprint/blueprint.xml | 38 ++- .../provider/src/test/resources/log4j.properties | 21 ++ sdnr/wt/common/pom.xml | 39 ++- .../features/sdnr/wt/common/file/FileWatchdog.java | 46 ++- .../features/sdnr/wt/common/util/FileWatchdog.java | 46 ++- sdnr/wt/common/src/test/resources/log4j.properties | 21 ++ sdnr/wt/common/src/test/resources/log4j2.xml | 23 +- .../src/test/resources/simplelogger.properties | 21 ++ sdnr/wt/data-provider/daexim/pom.xml | 76 ++--- sdnr/wt/data-provider/feature/pom.xml | 80 ++--- sdnr/wt/data-provider/installer/pom.xml | 258 ++++++++-------- .../src/assembly/assemble_mvnrepo_zip.xml | 80 +++-- sdnr/wt/data-provider/model/pom.xml | 140 ++++----- sdnr/wt/data-provider/pom.xml | 42 +-- sdnr/wt/data-provider/provider/pom.xml | 64 ++-- .../org/opendaylight/blueprint/impl-blueprint.xml | 133 ++++---- .../provider/src/test/resources/log4j.properties | 21 ++ .../provider/src/test/resources/log4j2.xml | 23 +- .../src/test/resources/simplelogger.properties | 21 ++ .../provider/src/test/resources/test.properties | 23 +- sdnr/wt/devicemanager-gran/feature/pom.xml | 80 ++--- sdnr/wt/devicemanager-gran/installer/pom.xml | 226 +++++++------- .../src/assembly/assemble_mvnrepo_zip.xml | 80 +++-- sdnr/wt/devicemanager-gran/model/pom.xml | 120 ++++---- sdnr/wt/devicemanager-gran/pom.xml | 42 +-- sdnr/wt/devicemanager-gran/provider/pom.xml | 43 +-- .../org/opendaylight/blueprint/impl-blueprint.xml | 61 ++-- .../provider/src/main/resources/version.properties | 23 +- .../src/test/resources/simplelogger.properties | 21 ++ sdnr/wt/devicemanager-onf/feature/pom.xml | 90 +++--- sdnr/wt/devicemanager-onf/installer/pom.xml | 208 ++++++------- .../src/assembly/assemble_mvnrepo_zip.xml | 80 +++-- sdnr/wt/devicemanager-onf/model/pom.xml | 120 ++++---- sdnr/wt/devicemanager-onf/pom.xml | 42 +-- sdnr/wt/devicemanager-onf/provider/pom.xml | 47 +-- .../org/opendaylight/blueprint/impl-blueprint.xml | 61 ++-- .../provider/src/main/resources/version.properties | 23 +- .../src/test/resources/simplelogger.properties | 21 ++ sdnr/wt/devicemanager-oran/feature/pom.xml | 80 ++--- sdnr/wt/devicemanager-oran/installer/pom.xml | 226 +++++++------- .../src/assembly/assemble_mvnrepo_zip.xml | 80 +++-- sdnr/wt/devicemanager-oran/model/pom.xml | 120 ++++---- sdnr/wt/devicemanager-oran/pom.xml | 42 +-- sdnr/wt/devicemanager-oran/provider/pom.xml | 202 +++++++------ .../org/opendaylight/blueprint/impl-blueprint.xml | 61 ++-- .../provider/src/main/resources/version.properties | 23 +- .../src/test/resources/simplelogger.properties | 21 ++ sdnr/wt/devicemanager/feature/pom.xml | 79 ++--- sdnr/wt/devicemanager/installer/pom.xml | 276 ++++++++--------- .../src/assembly/assemble_mvnrepo_zip.xml | 80 +++-- sdnr/wt/devicemanager/model/pom.xml | 154 +++++----- sdnr/wt/devicemanager/pom.xml | 42 +-- sdnr/wt/devicemanager/provider/pom.xml | 326 ++++++++++---------- .../impl/handler/RpcPushNotificationsHandler.java | 21 ++ .../org/opendaylight/blueprint/impl-blueprint.xml | 119 ++++---- .../provider/src/main/resources/version.properties | 23 +- .../src/test/resources/simplelogger.properties | 21 ++ .../provider/src/test/resources/test.properties | 23 +- .../feature-devicemanager/pom.xml | 210 ++++++------- sdnr/wt/featureaggregator/feature/pom.xml | 252 ++++++++-------- sdnr/wt/featureaggregator/installer/pom.xml | 276 ++++++++--------- .../src/assembly/assemble_mvnrepo_zip.xml | 61 ++-- sdnr/wt/featureaggregator/pom.xml | 76 ++--- 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 ++ sdnr/wt/mountpoint-registrar/feature/pom.xml | 108 +++---- sdnr/wt/mountpoint-registrar/installer/pom.xml | 276 ++++++++--------- .../src/assembly/assemble_mvnrepo_zip.xml | 80 +++-- sdnr/wt/mountpoint-registrar/model/pom.xml | 120 ++++---- sdnr/wt/mountpoint-registrar/pom.xml | 42 +-- sdnr/wt/mountpoint-registrar/provider/pom.xml | 35 ++- .../org/opendaylight/blueprint/impl-blueprint.xml | 98 +++--- .../provider/src/main/resources/version.properties | 23 +- .../src/test/resources/simplelogger.properties | 21 ++ sdnr/wt/mountpoint-state-provider/feature/pom.xml | 98 +++--- .../wt/mountpoint-state-provider/installer/pom.xml | 276 ++++++++--------- .../src/assembly/assemble_mvnrepo_zip.xml | 80 +++-- sdnr/wt/mountpoint-state-provider/pom.xml | 42 +-- sdnr/wt/mountpoint-state-provider/provider/pom.xml | 212 ++++++------- .../impl/MountpointStateProviderImpl.java | 39 ++- .../impl/MountpointStatePublisher.java | 39 ++- .../org/opendaylight/blueprint/impl-blueprint.xml | 58 ++-- .../provider/src/main/resources/version.properties | 23 +- .../test/TestMountpointStateProviderImpl.java | 39 ++- .../test/TestMountpointStatePublisher.java | 21 ++ .../src/test/resources/simplelogger.properties | 21 ++ .../src/test/resources/testpublisher.properties | 21 ++ sdnr/wt/netconfnode-state-service/feature/pom.xml | 98 +++--- .../wt/netconfnode-state-service/installer/pom.xml | 226 +++++++------- .../src/assembly/assemble_mvnrepo_zip.xml | 80 +++-- sdnr/wt/netconfnode-state-service/model/pom.xml | 132 ++++---- sdnr/wt/netconfnode-state-service/pom.xml | 42 +-- sdnr/wt/netconfnode-state-service/provider/pom.xml | 168 ++++++----- .../org/opendaylight/blueprint/impl-blueprint.xml | 117 +++---- .../provider/src/main/resources/version.properties | 23 +- .../src/test/resources/simplelogger.properties | 21 ++ .../provider/src/test/resources/test.properties | 23 +- 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 +++-- sdnr/wt/pom.xml | 41 +-- sdnr/wt/readthedocs/pom.xml | 23 +- .../src/assembly/assemble_mvnrepo_zip.xml | 80 +++-- sdnr/wt/websocketmanager2/feature/pom.xml | 44 +-- sdnr/wt/websocketmanager2/installer/pom.xml | 42 +-- .../src/assembly/assemble_mvnrepo_zip.xml | 80 +++-- sdnr/wt/websocketmanager2/model/pom.xml | 42 +-- sdnr/wt/websocketmanager2/pom.xml | 42 +-- sdnr/wt/websocketmanager2/provider/pom.xml | 37 ++- .../org/opendaylight/blueprint/impl-blueprint.xml | 63 ++-- .../src/test/resources/simplelogger.properties | 21 ++ 155 files changed, 6407 insertions(+), 4796 deletions(-) (limited to 'sdnr/wt') diff --git a/sdnr/wt/apigateway/feature/pom.xml b/sdnr/wt/apigateway/feature/pom.xml index 83671fb5b..d6ab9822d 100644 --- a/sdnr/wt/apigateway/feature/pom.xml +++ b/sdnr/wt/apigateway/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 @@ -36,7 +38,7 @@ 0.7.1-SNAPSHOT feature - ccsdk-features :: ${project.artifactId} :: feature + ccsdk-features :: ${project.artifactId} diff --git a/sdnr/wt/apigateway/installer/pom.xml b/sdnr/wt/apigateway/installer/pom.xml index fa0d0c597..ff3509aad 100755 --- a/sdnr/wt/apigateway/installer/pom.xml +++ b/sdnr/wt/apigateway/installer/pom.xml @@ -1,4 +1,25 @@ + + 4.0.0 @@ -42,7 +63,6 @@ ${project.version} - @@ -71,25 +91,25 @@ org.apache.maven.plugins maven-dependency-plugin - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + copy-nested-dependencies @@ -105,8 +125,8 @@ true false false - - + + diff --git a/sdnr/wt/apigateway/installer/src/assembly/assemble_mvnrepo_zip.xml b/sdnr/wt/apigateway/installer/src/assembly/assemble_mvnrepo_zip.xml index c4eb9aa25..dfe5060bf 100644 --- a/sdnr/wt/apigateway/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/sdnr/wt/apigateway/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/apigateway/pom.xml b/sdnr/wt/apigateway/pom.xml index cf539a2b7..b027eaeef 100755 --- a/sdnr/wt/apigateway/pom.xml +++ b/sdnr/wt/apigateway/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 diff --git a/sdnr/wt/apigateway/provider/pom.xml b/sdnr/wt/apigateway/provider/pom.xml index a4983c569..a417cf4ee 100644 --- a/sdnr/wt/apigateway/provider/pom.xml +++ b/sdnr/wt/apigateway/provider/pom.xml @@ -1,16 +1,28 @@ - + + 4.0.0 diff --git a/sdnr/wt/apigateway/provider/src/main/resources/org/opendaylight/blueprint/blueprint.xml b/sdnr/wt/apigateway/provider/src/main/resources/org/opendaylight/blueprint/blueprint.xml index 8184d7d11..256a9cfa3 100644 --- a/sdnr/wt/apigateway/provider/src/main/resources/org/opendaylight/blueprint/blueprint.xml +++ b/sdnr/wt/apigateway/provider/src/main/resources/org/opendaylight/blueprint/blueprint.xml @@ -1,26 +1,44 @@ + - + + class="org.onap.ccsdk.features.sdnr.wt.apigateway.AaiServlet"> - + - + - + - + - + diff --git a/sdnr/wt/apigateway/provider/src/test/resources/log4j.properties b/sdnr/wt/apigateway/provider/src/test/resources/log4j.properties index 142663bd2..2a2f8099e 100644 --- a/sdnr/wt/apigateway/provider/src/test/resources/log4j.properties +++ b/sdnr/wt/apigateway/provider/src/test/resources/log4j.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======================================================= +# +# + log4j.rootLogger=INFO, out log4j.logger.org.apache.camel.impl.converter=WARN diff --git a/sdnr/wt/common/pom.xml b/sdnr/wt/common/pom.xml index d942925ee..5719be168 100644 --- a/sdnr/wt/common/pom.xml +++ b/sdnr/wt/common/pom.xml @@ -1,20 +1,28 @@ + ~ ============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======================================================= + ~ + --> + 4.0.0 @@ -84,7 +92,6 @@ jackson-databind - diff --git a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/file/FileWatchdog.java b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/file/FileWatchdog.java index 89efc45e7..ff513ea97 100644 --- a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/file/FileWatchdog.java +++ b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/file/FileWatchdog.java @@ -1,33 +1,25 @@ -/******************************************************************************* - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt - * ================================================================================================= - * Copyright (C) 2019 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========================================================================== - ******************************************************************************/ /* - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for additional information regarding - * copyright ownership. The ASF licenses this file to You 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 + * ============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 * - * 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======================================================= * - * 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. */ package org.onap.ccsdk.features.sdnr.wt.common.file; diff --git a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/util/FileWatchdog.java b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/util/FileWatchdog.java index 55fe83300..2830d688e 100644 --- a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/util/FileWatchdog.java +++ b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/util/FileWatchdog.java @@ -1,33 +1,25 @@ -/******************************************************************************* - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt - * ================================================================================================= - * Copyright (C) 2019 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========================================================================== - ******************************************************************************/ /* - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for additional information regarding - * copyright ownership. The ASF licenses this file to You 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 + * ============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 * - * 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======================================================= * - * 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. */ package org.onap.ccsdk.features.sdnr.wt.common.util; diff --git a/sdnr/wt/common/src/test/resources/log4j.properties b/sdnr/wt/common/src/test/resources/log4j.properties index 142663bd2..2a2f8099e 100644 --- a/sdnr/wt/common/src/test/resources/log4j.properties +++ b/sdnr/wt/common/src/test/resources/log4j.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======================================================= +# +# + log4j.rootLogger=INFO, out log4j.logger.org.apache.camel.impl.converter=WARN diff --git a/sdnr/wt/common/src/test/resources/log4j2.xml b/sdnr/wt/common/src/test/resources/log4j2.xml index 164e93f54..846a9fc10 100644 --- a/sdnr/wt/common/src/test/resources/log4j2.xml +++ b/sdnr/wt/common/src/test/resources/log4j2.xml @@ -1,5 +1,26 @@ - + + diff --git a/sdnr/wt/common/src/test/resources/simplelogger.properties b/sdnr/wt/common/src/test/resources/simplelogger.properties index a2f1e7e76..980da34f8 100644 --- a/sdnr/wt/common/src/test/resources/simplelogger.properties +++ b/sdnr/wt/common/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======================================================= +# +# + org.slf4j.simpleLogger.defaultLogLevel=debug org.slf4j.simpleLogger.showDateTime=true #org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z diff --git a/sdnr/wt/data-provider/daexim/pom.xml b/sdnr/wt/data-provider/daexim/pom.xml index a5e46a903..37347c072 100644 --- a/sdnr/wt/data-provider/daexim/pom.xml +++ b/sdnr/wt/data-provider/daexim/pom.xml @@ -1,29 +1,31 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.data-provider.model - * ================================================================================ - * 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 org.onap.ccsdk.features.sdnr.wt sdnr-wt-data-provider-daexim @@ -35,7 +37,7 @@ org.onap.ccsdk.parent binding-parent 1.5.2-SNAPSHOT - + @@ -51,14 +53,14 @@ - + org.mockito mockito-core test org.opendaylight.netconf - sal-netconf-connector + sal-netconf-connector provided @@ -100,17 +102,17 @@ generate-sources exec - - - ${skipTests} - bash - - ${basedir}/../data-provider/provider/src/main/resources/es-init.sh - initfile - -f - ${project.build.directory}/EsInit.script - - + + + ${skipTests} + bash + + ${basedir}/../data-provider/provider/src/main/resources/es-init.sh + initfile + -f + ${project.build.directory}/EsInit.script + + diff --git a/sdnr/wt/data-provider/feature/pom.xml b/sdnr/wt/data-provider/feature/pom.xml index 35d86705b..f6d382894 100644 --- a/sdnr/wt/data-provider/feature/pom.xml +++ b/sdnr/wt/data-provider/feature/pom.xml @@ -1,48 +1,50 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.dataprovider.feature - * ================================================================================ - * 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 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 1.5.2-SNAPSHOT - - + + org.onap.ccsdk.parent + single-feature-parent + 1.5.2-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-data-provider-feature - 0.7.1-SNAPSHOT - feature + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-data-provider-feature + 0.7.1-SNAPSHOT + feature - ccsdk-features :: ${project.artifactId} :: feature + ccsdk-features :: ${project.artifactId} - - - ${project.groupId} - sdnr-wt-data-provider-provider - ${project.version} - - + + + ${project.groupId} + sdnr-wt-data-provider-provider + ${project.version} + + diff --git a/sdnr/wt/data-provider/installer/pom.xml b/sdnr/wt/data-provider/installer/pom.xml index f83c21f6a..7e66a381f 100755 --- a/sdnr/wt/data-provider/installer/pom.xml +++ b/sdnr/wt/data-provider/installer/pom.xml @@ -1,139 +1,141 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.dataprovider.installer - * ================================================================================ - * 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 + 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-data-provider-installer - 0.7.1-SNAPSHOT - pom + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-data-provider-installer + 0.7.1-SNAPSHOT + pom - ccsdk-features :: ${project.artifactId} + ccsdk-features :: ${project.artifactId} - - sdnr-wt-data-provider - false - + + sdnr-wt-data-provider + 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-resources-plugin - 2.6 - - - copy-schemas - - copy-resources - - validate - - ${project.build.directory}/assembly/cache/schema - - - ${basedir}/../provider/src/main/resources/preload.cache.schema - - *.yang - - true - - - - - - - - + + + + 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-resources-plugin + 2.6 + + + copy-schemas + + copy-resources + + validate + + ${project.build.directory}/assembly/cache/schema + + + ${basedir}/../provider/src/main/resources/preload.cache.schema + + *.yang + + true + + + + + + + + diff --git a/sdnr/wt/data-provider/installer/src/assembly/assemble_mvnrepo_zip.xml b/sdnr/wt/data-provider/installer/src/assembly/assemble_mvnrepo_zip.xml index c4eb9aa25..dfe5060bf 100644 --- a/sdnr/wt/data-provider/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/sdnr/wt/data-provider/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/data-provider/model/pom.xml b/sdnr/wt/data-provider/model/pom.xml index b84639e39..5b12dc92e 100644 --- a/sdnr/wt/data-provider/model/pom.xml +++ b/sdnr/wt/data-provider/model/pom.xml @@ -1,80 +1,82 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.data-provider.model - * ================================================================================ - * 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 + 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-data-provider-model - 0.7.1-SNAPSHOT - bundle + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-data-provider-model + 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 + + - - true - + + true + - - - org.opendaylight.netconf - sal-netconf-connector - provided - - - ${project.groupId} - sdnr-wt-common - ${project.version} - - + + + org.opendaylight.netconf + sal-netconf-connector + provided + + + ${project.groupId} + sdnr-wt-common + ${project.version} + + - - - - org.jacoco - jacoco-maven-plugin - - - **/gen/** - **/generated-sources/** - **/yang-gen-sal/** - **/pax/** - - - - - + + + + org.jacoco + jacoco-maven-plugin + + + **/gen/** + **/generated-sources/** + **/yang-gen-sal/** + **/pax/** + + + + + diff --git a/sdnr/wt/data-provider/pom.xml b/sdnr/wt/data-provider/pom.xml index 1d2a25525..66bbf670b 100755 --- a/sdnr/wt/data-provider/pom.xml +++ b/sdnr/wt/data-provider/pom.xml @@ -1,26 +1,28 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.data-provider - * ================================================================================ - * 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 diff --git a/sdnr/wt/data-provider/provider/pom.xml b/sdnr/wt/data-provider/provider/pom.xml index e862b2e68..ffbd22150 100644 --- a/sdnr/wt/data-provider/provider/pom.xml +++ b/sdnr/wt/data-provider/provider/pom.xml @@ -1,20 +1,28 @@ + ~ ============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======================================================= + ~ + --> + 4.0.0 @@ -22,7 +30,7 @@ org.onap.ccsdk.parent binding-parent 1.5.2-SNAPSHOT - + org.onap.ccsdk.features.sdnr.wt @@ -63,7 +71,7 @@ sdnr-wt-data-provider-model ${project.version} - + javax.servlet servlet-api @@ -72,7 +80,7 @@ org.osgi.core provided - + org.apache.karaf.shell org.apache.karaf.shell.core provided @@ -127,16 +135,16 @@ generate-sources exec - - - bash - - ${basedir}/../../data-provider/provider/src/main/resources/es-init.sh - initfile - -f - ${project.build.directory}/EsInit.script - - + + + bash + + ${basedir}/../../data-provider/provider/src/main/resources/es-init.sh + initfile + -f + ${project.build.directory}/EsInit.script + + diff --git a/sdnr/wt/data-provider/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/wt/data-provider/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml index 54575ad6c..fcd62ff79 100644 --- a/sdnr/wt/data-provider/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml +++ b/sdnr/wt/data-provider/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml @@ -1,80 +1,83 @@ - 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.dataprovider.http.MsServlet"> + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - + diff --git a/sdnr/wt/data-provider/provider/src/test/resources/log4j.properties b/sdnr/wt/data-provider/provider/src/test/resources/log4j.properties index 142663bd2..2a2f8099e 100644 --- a/sdnr/wt/data-provider/provider/src/test/resources/log4j.properties +++ b/sdnr/wt/data-provider/provider/src/test/resources/log4j.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======================================================= +# +# + log4j.rootLogger=INFO, out log4j.logger.org.apache.camel.impl.converter=WARN diff --git a/sdnr/wt/data-provider/provider/src/test/resources/log4j2.xml b/sdnr/wt/data-provider/provider/src/test/resources/log4j2.xml index 164e93f54..846a9fc10 100644 --- a/sdnr/wt/data-provider/provider/src/test/resources/log4j2.xml +++ b/sdnr/wt/data-provider/provider/src/test/resources/log4j2.xml @@ -1,5 +1,26 @@ - + + diff --git a/sdnr/wt/data-provider/provider/src/test/resources/simplelogger.properties b/sdnr/wt/data-provider/provider/src/test/resources/simplelogger.properties index a2f1e7e76..980da34f8 100644 --- a/sdnr/wt/data-provider/provider/src/test/resources/simplelogger.properties +++ b/sdnr/wt/data-provider/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======================================================= +# +# + org.slf4j.simpleLogger.defaultLogLevel=debug org.slf4j.simpleLogger.showDateTime=true #org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z diff --git a/sdnr/wt/data-provider/provider/src/test/resources/test.properties b/sdnr/wt/data-provider/provider/src/test/resources/test.properties index de49c5893..9290a88ba 100644 --- a/sdnr/wt/data-provider/provider/src/test/resources/test.properties +++ b/sdnr/wt/data-provider/provider/src/test/resources/test.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======================================================= +# +# + [dcae] dcaeUserCredentials=admin:admin dcaeUrl=off @@ -26,7 +47,7 @@ soapurlinq=off [es] esCluster=sendateodl5 -#time limit to keep increasing data in database [in seconds] +#time limit to keep increasing data in database [in seconds] #60*60*24*30 (30days) esArchiveLimit=2592000 #folder where removed data will be stored diff --git a/sdnr/wt/devicemanager-gran/feature/pom.xml b/sdnr/wt/devicemanager-gran/feature/pom.xml index f81250c92..b86569d2b 100644 --- a/sdnr/wt/devicemanager-gran/feature/pom.xml +++ b/sdnr/wt/devicemanager-gran/feature/pom.xml @@ -1,48 +1,50 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.devicemanager.feature - * ================================================================================ - * 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 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 1.5.2-SNAPSHOT - - + + org.onap.ccsdk.parent + single-feature-parent + 1.5.2-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-gran-feature - 0.7.1-SNAPSHOT - feature + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-gran-feature + 0.7.1-SNAPSHOT + feature - ccsdk-features :: ${project.artifactId} :: feature + ccsdk-features :: ${project.artifactId} - - - ${project.groupId} - sdnr-wt-devicemanager-gran-provider - ${project.version} - - + + + ${project.groupId} + sdnr-wt-devicemanager-gran-provider + ${project.version} + + diff --git a/sdnr/wt/devicemanager-gran/installer/pom.xml b/sdnr/wt/devicemanager-gran/installer/pom.xml index 8630f790d..ce7e6b02c 100755 --- a/sdnr/wt/devicemanager-gran/installer/pom.xml +++ b/sdnr/wt/devicemanager-gran/installer/pom.xml @@ -1,125 +1,127 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.devicemanager.installer - * ================================================================================ - * 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 + 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-devicemanager-gran-installer - 0.7.1-SNAPSHOT - pom + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-gran-installer + 0.7.1-SNAPSHOT + pom - ccsdk-features :: ${project.artifactId} + ccsdk-features :: ${project.artifactId} - - sdnr-wt-devicemanager-gran - false - + + sdnr-wt-devicemanager-gran + false + - + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.controller.mdsal.version} + pom + import + + + - - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - + + 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/devicemanager-gran/installer/src/assembly/assemble_mvnrepo_zip.xml b/sdnr/wt/devicemanager-gran/installer/src/assembly/assemble_mvnrepo_zip.xml index c4eb9aa25..dfe5060bf 100644 --- a/sdnr/wt/devicemanager-gran/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/sdnr/wt/devicemanager-gran/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/devicemanager-gran/model/pom.xml b/sdnr/wt/devicemanager-gran/model/pom.xml index 3a386461e..538e65322 100644 --- a/sdnr/wt/devicemanager-gran/model/pom.xml +++ b/sdnr/wt/devicemanager-gran/model/pom.xml @@ -1,70 +1,72 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.devicemanager.model - * ================================================================================ - * 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 + 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-devicemanager-gran-model - 0.7.1-SNAPSHOT - bundle + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-gran-model + 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 + + - - true - + + true + - - + + - - - - org.jacoco - jacoco-maven-plugin - - - **/gen/** - **/generated-sources/** - **/yang-gen-sal/** - **/pax/** - - - - - + + + + org.jacoco + jacoco-maven-plugin + + + **/gen/** + **/generated-sources/** + **/yang-gen-sal/** + **/pax/** + + + + + diff --git a/sdnr/wt/devicemanager-gran/pom.xml b/sdnr/wt/devicemanager-gran/pom.xml index a957d3e9b..92ef36953 100755 --- a/sdnr/wt/devicemanager-gran/pom.xml +++ b/sdnr/wt/devicemanager-gran/pom.xml @@ -1,26 +1,28 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.devicemanager - * ================================================================================ - * 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 diff --git a/sdnr/wt/devicemanager-gran/provider/pom.xml b/sdnr/wt/devicemanager-gran/provider/pom.xml index 317cccf05..b8ef8637f 100644 --- a/sdnr/wt/devicemanager-gran/provider/pom.xml +++ b/sdnr/wt/devicemanager-gran/provider/pom.xml @@ -1,20 +1,27 @@ + ~ ============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======================================================= + ~ + --> 4.0.0 @@ -23,7 +30,7 @@ org.onap.ccsdk.parent binding-parent 1.5.2-SNAPSHOT - + org.onap.ccsdk.features.sdnr.wt @@ -47,13 +54,13 @@ - + org.mockito mockito-core test - + ${project.groupId} sdnr-wt-devicemanager-gran-model diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/wt/devicemanager-gran/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml index 16d7353ff..0d4d04745 100644 --- a/sdnr/wt/devicemanager-gran/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml +++ b/sdnr/wt/devicemanager-gran/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml @@ -1,35 +1,38 @@ - 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========================================================= - --> + - - - - - - - + + + diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/resources/version.properties b/sdnr/wt/devicemanager-gran/provider/src/main/resources/version.properties index 80373399e..6638c04f9 100644 --- a/sdnr/wt/devicemanager-gran/provider/src/main/resources/version.properties +++ b/sdnr/wt/devicemanager-gran/provider/src/main/resources/version.properties @@ -1,3 +1,24 @@ -# Proberties filled in by maven during build process +# +# ============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======================================================= +# +# + +# Properties filled in by maven during build process version = ${project.version} build = ${buildtime} diff --git a/sdnr/wt/devicemanager-gran/provider/src/test/resources/simplelogger.properties b/sdnr/wt/devicemanager-gran/provider/src/test/resources/simplelogger.properties index bdc3c1009..9af26dc96 100644 --- a/sdnr/wt/devicemanager-gran/provider/src/test/resources/simplelogger.properties +++ b/sdnr/wt/devicemanager-gran/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/devicemanager-onf/feature/pom.xml b/sdnr/wt/devicemanager-onf/feature/pom.xml index afe24e3ad..8007e5b47 100644 --- a/sdnr/wt/devicemanager-onf/feature/pom.xml +++ b/sdnr/wt/devicemanager-onf/feature/pom.xml @@ -1,53 +1,55 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.devicemanager.feature - * ================================================================================ - * 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 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 1.5.2-SNAPSHOT - - + + org.onap.ccsdk.parent + single-feature-parent + 1.5.2-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-onf-feature - 0.7.1-SNAPSHOT - feature + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-onf-feature + 0.7.1-SNAPSHOT + feature - ccsdk-features :: ${project.artifactId} :: feature + ccsdk-features :: ${project.artifactId} - - - - - - - - ${project.groupId} - sdnr-wt-devicemanager-onf-provider - ${project.version} - - + + + + + + + + ${project.groupId} + sdnr-wt-devicemanager-onf-provider + ${project.version} + + diff --git a/sdnr/wt/devicemanager-onf/installer/pom.xml b/sdnr/wt/devicemanager-onf/installer/pom.xml index 33fa75d15..8bb482584 100755 --- a/sdnr/wt/devicemanager-onf/installer/pom.xml +++ b/sdnr/wt/devicemanager-onf/installer/pom.xml @@ -1,114 +1,116 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.devicemanager.installer - * ================================================================================ - * 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 + 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-devicemanager-onf-installer - 0.7.1-SNAPSHOT - pom + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-onf-installer + 0.7.1-SNAPSHOT + pom - ccsdk-features :: ${project.artifactId} + ccsdk-features :: ${project.artifactId} - - sdnr-wt-devicemanager-onf - false - + + sdnr-wt-devicemanager-onf + 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/devicemanager-onf/installer/src/assembly/assemble_mvnrepo_zip.xml b/sdnr/wt/devicemanager-onf/installer/src/assembly/assemble_mvnrepo_zip.xml index c4eb9aa25..dfe5060bf 100644 --- a/sdnr/wt/devicemanager-onf/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/sdnr/wt/devicemanager-onf/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/devicemanager-onf/model/pom.xml b/sdnr/wt/devicemanager-onf/model/pom.xml index 0e65b9b39..c0f118efa 100644 --- a/sdnr/wt/devicemanager-onf/model/pom.xml +++ b/sdnr/wt/devicemanager-onf/model/pom.xml @@ -1,70 +1,72 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.devicemanager.model - * ================================================================================ - * 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 + 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-devicemanager-onf-model - 0.7.1-SNAPSHOT - bundle + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-onf-model + 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 + + - - true - + + true + - - + + - - - - org.jacoco - jacoco-maven-plugin - - - **/gen/** - **/generated-sources/** - **/yang-gen-sal/** - **/pax/** - - - - - + + + + org.jacoco + jacoco-maven-plugin + + + **/gen/** + **/generated-sources/** + **/yang-gen-sal/** + **/pax/** + + + + + diff --git a/sdnr/wt/devicemanager-onf/pom.xml b/sdnr/wt/devicemanager-onf/pom.xml index 370c34e5e..48b160c69 100755 --- a/sdnr/wt/devicemanager-onf/pom.xml +++ b/sdnr/wt/devicemanager-onf/pom.xml @@ -1,26 +1,28 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.devicemanager - * ================================================================================ - * 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 diff --git a/sdnr/wt/devicemanager-onf/provider/pom.xml b/sdnr/wt/devicemanager-onf/provider/pom.xml index 92c4f398e..031c20416 100644 --- a/sdnr/wt/devicemanager-onf/provider/pom.xml +++ b/sdnr/wt/devicemanager-onf/provider/pom.xml @@ -1,29 +1,36 @@ - + ~ ============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======================================================= + ~ + --> + + 4.0.0 org.onap.ccsdk.parent binding-parent 1.5.2-SNAPSHOT - + org.onap.ccsdk.features.sdnr.wt @@ -47,14 +54,14 @@ - + org.mockito mockito-core test - + ${project.groupId} sdnr-wt-devicemanager-onf-model diff --git a/sdnr/wt/devicemanager-onf/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/wt/devicemanager-onf/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml index 406d43599..604a0384f 100644 --- a/sdnr/wt/devicemanager-onf/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml +++ b/sdnr/wt/devicemanager-onf/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml @@ -1,35 +1,38 @@ - 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========================================================= - --> + - - - - - - - + + + diff --git a/sdnr/wt/devicemanager-onf/provider/src/main/resources/version.properties b/sdnr/wt/devicemanager-onf/provider/src/main/resources/version.properties index 80373399e..6638c04f9 100644 --- a/sdnr/wt/devicemanager-onf/provider/src/main/resources/version.properties +++ b/sdnr/wt/devicemanager-onf/provider/src/main/resources/version.properties @@ -1,3 +1,24 @@ -# Proberties filled in by maven during build process +# +# ============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======================================================= +# +# + +# Properties filled in by maven during build process version = ${project.version} build = ${buildtime} diff --git a/sdnr/wt/devicemanager-onf/provider/src/test/resources/simplelogger.properties b/sdnr/wt/devicemanager-onf/provider/src/test/resources/simplelogger.properties index bdc3c1009..9af26dc96 100644 --- a/sdnr/wt/devicemanager-onf/provider/src/test/resources/simplelogger.properties +++ b/sdnr/wt/devicemanager-onf/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/devicemanager-oran/feature/pom.xml b/sdnr/wt/devicemanager-oran/feature/pom.xml index 1b0fa6be1..1f5e11f0b 100644 --- a/sdnr/wt/devicemanager-oran/feature/pom.xml +++ b/sdnr/wt/devicemanager-oran/feature/pom.xml @@ -1,48 +1,50 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.devicemanager.feature - * ================================================================================ - * 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 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 1.5.2-SNAPSHOT - - + + org.onap.ccsdk.parent + single-feature-parent + 1.5.2-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-oran-feature - 0.7.1-SNAPSHOT - feature + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-oran-feature + 0.7.1-SNAPSHOT + feature - ccsdk-features :: ${project.artifactId} :: feature + ccsdk-features :: ${project.artifactId} - - - ${project.groupId} - sdnr-wt-devicemanager-oran-provider - ${project.version} - - + + + ${project.groupId} + sdnr-wt-devicemanager-oran-provider + ${project.version} + + diff --git a/sdnr/wt/devicemanager-oran/installer/pom.xml b/sdnr/wt/devicemanager-oran/installer/pom.xml index 49969018a..2004e02f1 100755 --- a/sdnr/wt/devicemanager-oran/installer/pom.xml +++ b/sdnr/wt/devicemanager-oran/installer/pom.xml @@ -1,125 +1,127 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.devicemanager.installer - * ================================================================================ - * 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 + 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-devicemanager-oran-installer - 0.7.1-SNAPSHOT - pom + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-oran-installer + 0.7.1-SNAPSHOT + pom - ccsdk-features :: ${project.artifactId} + ccsdk-features :: ${project.artifactId} - - sdnr-wt-devicemanager-oran - false - + + sdnr-wt-devicemanager-oran + false + - + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.controller.mdsal.version} + pom + import + + + - - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - + + 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/devicemanager-oran/installer/src/assembly/assemble_mvnrepo_zip.xml b/sdnr/wt/devicemanager-oran/installer/src/assembly/assemble_mvnrepo_zip.xml index c4eb9aa25..dfe5060bf 100644 --- a/sdnr/wt/devicemanager-oran/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/sdnr/wt/devicemanager-oran/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/devicemanager-oran/model/pom.xml b/sdnr/wt/devicemanager-oran/model/pom.xml index 6d3521533..c8c09cfe5 100644 --- a/sdnr/wt/devicemanager-oran/model/pom.xml +++ b/sdnr/wt/devicemanager-oran/model/pom.xml @@ -1,70 +1,72 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.devicemanager.model - * ================================================================================ - * 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 + 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-devicemanager-oran-model - 0.7.1-SNAPSHOT - bundle + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-oran-model + 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 + + - - true - + + true + - - + + - - - - org.jacoco - jacoco-maven-plugin - - - **/gen/** - **/generated-sources/** - **/yang-gen-sal/** - **/pax/** - - - - - + + + + org.jacoco + jacoco-maven-plugin + + + **/gen/** + **/generated-sources/** + **/yang-gen-sal/** + **/pax/** + + + + + diff --git a/sdnr/wt/devicemanager-oran/pom.xml b/sdnr/wt/devicemanager-oran/pom.xml index 4caa87b00..e10c15d2d 100755 --- a/sdnr/wt/devicemanager-oran/pom.xml +++ b/sdnr/wt/devicemanager-oran/pom.xml @@ -1,26 +1,28 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.devicemanager - * ================================================================================ - * 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 diff --git a/sdnr/wt/devicemanager-oran/provider/pom.xml b/sdnr/wt/devicemanager-oran/provider/pom.xml index a552e6517..7c4e628f0 100644 --- a/sdnr/wt/devicemanager-oran/provider/pom.xml +++ b/sdnr/wt/devicemanager-oran/provider/pom.xml @@ -1,103 +1,105 @@ -* ============LICENSE_START======================================================= -* ONAP : ccsdk features -* ================================================================================ -* Copyright (C) 2020 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 + 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-devicemanager-oran-provider - 0.7.1-SNAPSHOT - bundle + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-oran-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 + + - - true - true - yyyy-MM-dd HH:mm - ${maven.build.timestamp} UTC - 49400 - + + true + true + yyyy-MM-dd HH:mm + ${maven.build.timestamp} UTC + 49400 + - - - - org.mockito - mockito-core - test - + + + + org.mockito + mockito-core + test + - - - ${project.groupId} - sdnr-wt-devicemanager-oran-model - ${project.version} - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-model - ${project.version} - provided - - - ${project.groupId} - sdnr-wt-netconfnode-state-service-model - ${project.version} - provided - - - org.opendaylight.netconf - sal-netconf-connector - provided - - - org.opendaylight.mdsal - mdsal-singleton-common-api - provided - - + + + ${project.groupId} + sdnr-wt-devicemanager-oran-model + ${project.version} + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-model + ${project.version} + provided + + + ${project.groupId} + sdnr-wt-netconfnode-state-service-model + ${project.version} + provided + + + org.opendaylight.netconf + sal-netconf-connector + provided + + + org.opendaylight.mdsal + mdsal-singleton-common-api + provided + + - - - - src/main/resources - true - - - + + + + src/main/resources + true + + + org.jacoco jacoco-maven-plugin @@ -119,19 +121,19 @@ generate-sources exec - - - bash - - ${basedir}/../../data-provider/provider/src/main/resources/es-init.sh - initfile - -f - ${project.build.directory}/EsInit.script - - + + + bash + + ${basedir}/../../data-provider/provider/src/main/resources/es-init.sh + initfile + -f + ${project.build.directory}/EsInit.script + + - + diff --git a/sdnr/wt/devicemanager-oran/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/wt/devicemanager-oran/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml index 799dd5f5c..21b761ce2 100644 --- a/sdnr/wt/devicemanager-oran/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml +++ b/sdnr/wt/devicemanager-oran/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml @@ -1,35 +1,38 @@ - 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========================================================= - --> + - - - - - - - + + + diff --git a/sdnr/wt/devicemanager-oran/provider/src/main/resources/version.properties b/sdnr/wt/devicemanager-oran/provider/src/main/resources/version.properties index 80373399e..6638c04f9 100644 --- a/sdnr/wt/devicemanager-oran/provider/src/main/resources/version.properties +++ b/sdnr/wt/devicemanager-oran/provider/src/main/resources/version.properties @@ -1,3 +1,24 @@ -# Proberties filled in by maven during build process +# +# ============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======================================================= +# +# + +# Properties filled in by maven during build process version = ${project.version} build = ${buildtime} diff --git a/sdnr/wt/devicemanager-oran/provider/src/test/resources/simplelogger.properties b/sdnr/wt/devicemanager-oran/provider/src/test/resources/simplelogger.properties index bdc3c1009..9af26dc96 100644 --- a/sdnr/wt/devicemanager-oran/provider/src/test/resources/simplelogger.properties +++ b/sdnr/wt/devicemanager-oran/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/devicemanager/feature/pom.xml b/sdnr/wt/devicemanager/feature/pom.xml index 86d21f817..f73adfb03 100644 --- a/sdnr/wt/devicemanager/feature/pom.xml +++ b/sdnr/wt/devicemanager/feature/pom.xml @@ -1,48 +1,51 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.devicemanager.feature - * ================================================================================ - * 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 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 1.5.2-SNAPSHOT - - + + org.onap.ccsdk.parent + single-feature-parent + 1.5.2-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-feature - 0.7.1-SNAPSHOT - feature + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-feature + 0.7.1-SNAPSHOT + feature - ccsdk-features :: ${project.artifactId} :: feature + ccsdk-features :: ${project.artifactId} - - - ${project.groupId} - sdnr-wt-devicemanager-provider - ${project.version} - - + + + ${project.groupId} + sdnr-wt-devicemanager-provider + ${project.version} + + diff --git a/sdnr/wt/devicemanager/installer/pom.xml b/sdnr/wt/devicemanager/installer/pom.xml index 5c04cbd06..df2f6e5b9 100755 --- a/sdnr/wt/devicemanager/installer/pom.xml +++ b/sdnr/wt/devicemanager/installer/pom.xml @@ -1,150 +1,152 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.devicemanager.installer - * ================================================================================ - * 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 + 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-devicemanager-installer - 0.7.1-SNAPSHOT - pom + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-installer + 0.7.1-SNAPSHOT + pom - ccsdk-features :: ${project.artifactId} + ccsdk-features :: ${project.artifactId} - - sdnr-wt-devicemanager - false - + + sdnr-wt-devicemanager + false + - + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.controller.mdsal.version} + pom + import + + + - - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - + + 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-resources-plugin - 2.6 - - - copy-schemas - - copy-resources - - validate - - ${project.build.directory}/assembly/cache/schema - - - ${basedir}/../provider/src/main/resources/preload.cache.schema - - *.yang - - true - - - - - - - - + + + + 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-resources-plugin + 2.6 + + + copy-schemas + + copy-resources + + validate + + ${project.build.directory}/assembly/cache/schema + + + ${basedir}/../provider/src/main/resources/preload.cache.schema + + *.yang + + true + + + + + + + + diff --git a/sdnr/wt/devicemanager/installer/src/assembly/assemble_mvnrepo_zip.xml b/sdnr/wt/devicemanager/installer/src/assembly/assemble_mvnrepo_zip.xml index c4eb9aa25..dfe5060bf 100644 --- a/sdnr/wt/devicemanager/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/sdnr/wt/devicemanager/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/devicemanager/model/pom.xml b/sdnr/wt/devicemanager/model/pom.xml index b52e10437..802fc509d 100644 --- a/sdnr/wt/devicemanager/model/pom.xml +++ b/sdnr/wt/devicemanager/model/pom.xml @@ -1,87 +1,89 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.devicemanager.model - * ================================================================================ - * 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 + 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-devicemanager-model - 0.7.1-SNAPSHOT - bundle + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-model + 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 + + - - true - + + true + - - - org.opendaylight.netconf - sal-netconf-connector - provided - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-data-provider-model - ${project.version} - provided - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-netconfnode-state-service-model - ${project.version} - provided - - + + + org.opendaylight.netconf + sal-netconf-connector + provided + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-data-provider-model + ${project.version} + provided + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-netconfnode-state-service-model + ${project.version} + provided + + - - - - org.jacoco - jacoco-maven-plugin - - - **/gen/** - **/generated-sources/** - **/yang-gen-sal/** - **/pax/** - - - - - + + + + org.jacoco + jacoco-maven-plugin + + + **/gen/** + **/generated-sources/** + **/yang-gen-sal/** + **/pax/** + + + + + diff --git a/sdnr/wt/devicemanager/pom.xml b/sdnr/wt/devicemanager/pom.xml index 77266cf4c..16bbb9f5f 100755 --- a/sdnr/wt/devicemanager/pom.xml +++ b/sdnr/wt/devicemanager/pom.xml @@ -1,26 +1,28 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.devicemanager - * ================================================================================ - * 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 diff --git a/sdnr/wt/devicemanager/provider/pom.xml b/sdnr/wt/devicemanager/provider/pom.xml index f336c87cb..28ca6c18b 100644 --- a/sdnr/wt/devicemanager/provider/pom.xml +++ b/sdnr/wt/devicemanager/provider/pom.xml @@ -1,161 +1,169 @@ + ~ ============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======================================================= + ~ + --> + - 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-devicemanager-provider - 0.7.1-SNAPSHOT - bundle + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-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 + + - - true - true - yyyy-MM-dd HH:mm - ${maven.build.timestamp} UTC - + + true + true + yyyy-MM-dd HH:mm + ${maven.build.timestamp} UTC + - - - - org.mockito - mockito-core - test - - - - ${project.groupId} - sdnr-wt-devicemanager-model - ${project.version} - - - ${project.groupId} - sdnr-wt-netconfnode-state-service-model - ${project.version} - provided - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-websocketmanager2-model - ${project.version} - provided - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-common - ${project.version} - provided - - - org.osgi - org.osgi.core - provided - - - org.opendaylight.mdsal.model - ietf-topology - - - org.opendaylight.netconf - sal-netconf-connector - provided - - - org.opendaylight.mdsal.binding.model.ietf - rfc6991-ietf-yang-types - provided - - - org.opendaylight.mdsal - yang-binding - provided - - - org.opendaylight.mdsal - mdsal-singleton-common-api - provided - - - org.json - json - provided - - - com.typesafe.akka - akka-actor_2.12 - provided - - - com.typesafe.akka - akka-cluster_2.12 - provided - - - org.osgi - org.osgi.compendium - provided - - - org.apache.commons - commons-lang3 - provided - - - com.fasterxml.jackson.core - jackson-core - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - + + + + org.mockito + mockito-core + test + + + + ${project.groupId} + sdnr-wt-devicemanager-model + ${project.version} + + + ${project.groupId} + sdnr-wt-netconfnode-state-service-model + ${project.version} + provided + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-websocketmanager2-model + ${project.version} + provided + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-common + ${project.version} + provided + + + org.osgi + org.osgi.core + provided + + + org.opendaylight.mdsal.model + ietf-topology + + + org.opendaylight.netconf + sal-netconf-connector + provided + + + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-yang-types + provided + + + org.opendaylight.mdsal + yang-binding + provided + + + org.opendaylight.mdsal + mdsal-singleton-common-api + provided + + + org.json + json + provided + + + com.typesafe.akka + akka-actor_2.12 + provided + + + com.typesafe.akka + akka-cluster_2.12 + provided + + + org.osgi + org.osgi.compendium + provided + + + org.apache.commons + commons-lang3 + provided + + + com.fasterxml.jackson.core + jackson-core + provided + + + com.fasterxml.jackson.core + jackson-annotations + provided + + + com.fasterxml.jackson.core + jackson-databind + provided + - + - - - - src/main/resources - true - - - + + + + src/main/resources + true + + + org.jacoco jacoco-maven-plugin @@ -177,16 +185,16 @@ generate-sources exec - - - bash - - ${basedir}/../../data-provider/provider/src/main/resources/es-init.sh - initfile - -f - ${project.build.directory}/EsInit.script - - + + + bash + + ${basedir}/../../data-provider/provider/src/main/resources/es-init.sh + initfile + -f + ${project.build.directory}/EsInit.script + + @@ -203,5 +211,5 @@ - + diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/handler/RpcPushNotificationsHandler.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/handler/RpcPushNotificationsHandler.java index ff559f859..6378db7b0 100644 --- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/handler/RpcPushNotificationsHandler.java +++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/handler/RpcPushNotificationsHandler.java @@ -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======================================================= + * + */ + package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.handler; /******************************************************************************* * ============LICENSE_START======================================================================== diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/wt/devicemanager/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml index 7f6136a08..6a83b61d7 100644 --- a/sdnr/wt/devicemanager/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml +++ b/sdnr/wt/devicemanager/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml @@ -1,75 +1,78 @@ - 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========================================================= - --> - - - - + odl:type="default"/> - + - + - + - + - + - + - + - - - - - - - - - + + + + + + + + + - + - + diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/version.properties b/sdnr/wt/devicemanager/provider/src/main/resources/version.properties index 80373399e..6638c04f9 100644 --- a/sdnr/wt/devicemanager/provider/src/main/resources/version.properties +++ b/sdnr/wt/devicemanager/provider/src/main/resources/version.properties @@ -1,3 +1,24 @@ -# Proberties filled in by maven during build process +# +# ============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======================================================= +# +# + +# Properties filled in by maven during build process version = ${project.version} build = ${buildtime} diff --git a/sdnr/wt/devicemanager/provider/src/test/resources/simplelogger.properties b/sdnr/wt/devicemanager/provider/src/test/resources/simplelogger.properties index bdc3c1009..9af26dc96 100644 --- a/sdnr/wt/devicemanager/provider/src/test/resources/simplelogger.properties +++ b/sdnr/wt/devicemanager/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/devicemanager/provider/src/test/resources/test.properties b/sdnr/wt/devicemanager/provider/src/test/resources/test.properties index de49c5893..9290a88ba 100644 --- a/sdnr/wt/devicemanager/provider/src/test/resources/test.properties +++ b/sdnr/wt/devicemanager/provider/src/test/resources/test.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======================================================= +# +# + [dcae] dcaeUserCredentials=admin:admin dcaeUrl=off @@ -26,7 +47,7 @@ soapurlinq=off [es] esCluster=sendateodl5 -#time limit to keep increasing data in database [in seconds] +#time limit to keep increasing data in database [in seconds] #60*60*24*30 (30days) esArchiveLimit=2592000 #folder where removed data will be stored diff --git a/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml b/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml index b6dac69d2..49af0584e 100644 --- a/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml +++ b/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml @@ -1,111 +1,115 @@ + ~ ============LICENSE_START======================================================= + ~ ONAP : ccsdk features + ~ ================================================================================ + ~ Copyright (C) 2018 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 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 1.5.2-SNAPSHOT - - + + org.onap.ccsdk.parent + single-feature-parent + 1.5.2-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-feature-aggregator-devicemanager - 0.7.1-SNAPSHOT - feature + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-feature-aggregator-devicemanager + 0.7.1-SNAPSHOT + feature - ccsdk-features :: ${project.artifactId} + ccsdk-features :: ${project.artifactId} - - - ${project.groupId} - sdnr-wt-apigateway-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-websocketmanager2-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-data-provider-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-netconfnode-state-service-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-devicemanager-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-devicemanager-onf-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-devicemanager-oran-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-devicemanager-gran-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-mountpoint-registrar-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-mountpoint-state-provider-feature - ${project.version} - xml - features - - + + + ${project.groupId} + sdnr-wt-apigateway-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-websocketmanager2-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-data-provider-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-netconfnode-state-service-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-devicemanager-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-devicemanager-onf-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-devicemanager-oran-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-devicemanager-gran-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-mountpoint-registrar-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-mountpoint-state-provider-feature + ${project.version} + xml + features + + diff --git a/sdnr/wt/featureaggregator/feature/pom.xml b/sdnr/wt/featureaggregator/feature/pom.xml index 48ef06e65..110c781eb 100644 --- a/sdnr/wt/featureaggregator/feature/pom.xml +++ b/sdnr/wt/featureaggregator/feature/pom.xml @@ -1,132 +1,136 @@ + ~ ============LICENSE_START======================================================= + ~ ONAP : ccsdk features + ~ ================================================================================ + ~ Copyright (C) 2018 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 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 1.5.2-SNAPSHOT - - + + org.onap.ccsdk.parent + single-feature-parent + 1.5.2-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-feature-aggregator - 0.7.1-SNAPSHOT - feature + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-feature-aggregator + 0.7.1-SNAPSHOT + feature - ccsdk-features :: ${project.artifactId} + ccsdk-features :: ${project.artifactId} - - - ${project.groupId} - sdnr-wt-apigateway-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-helpserver-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-websocketmanager2-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-data-provider-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-netconfnode-state-service-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-devicemanager-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-devicemanager-onf-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-devicemanager-oran-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-devicemanager-gran-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-mountpoint-registrar-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-mountpoint-state-provider-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-odlux-core-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-odlux-apps-feature - ${project.version} - xml - features - - + + + ${project.groupId} + sdnr-wt-apigateway-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-helpserver-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-websocketmanager2-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-data-provider-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-netconfnode-state-service-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-devicemanager-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-devicemanager-onf-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-devicemanager-oran-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-devicemanager-gran-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-mountpoint-registrar-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-mountpoint-state-provider-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-odlux-core-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-odlux-apps-feature + ${project.version} + xml + features + + diff --git a/sdnr/wt/featureaggregator/installer/pom.xml b/sdnr/wt/featureaggregator/installer/pom.xml index a1969a9a5..2109a4089 100755 --- a/sdnr/wt/featureaggregator/installer/pom.xml +++ b/sdnr/wt/featureaggregator/installer/pom.xml @@ -1,146 +1,150 @@ + ~ ============LICENSE_START======================================================= + ~ ONAP : ccsdk features + ~ ================================================================================ + ~ Copyright (C) 2018 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 + 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-feature-aggregator-installer - 0.7.1-SNAPSHOT - pom + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-feature-aggregator-installer + 0.7.1-SNAPSHOT + pom - ccsdk-features :: ${project.artifactId} + ccsdk-features :: ${project.artifactId} - - + + - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-feature-aggregator - ${project.version} - xml - features - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-feature-aggregator-devicemanager - ${project.version} - xml - features - - + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-feature-aggregator + ${project.version} + xml + features + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-feature-aggregator-devicemanager + ${project.version} + xml + features + + - - - - 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 - - - - - unpack-cache-schema - - unpack - - prepare-package - - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-provider - ${project.version} - jar - preload.cache.schema/** - ${project.build.directory}/assembly - - - - - - - unpack-es-init - prepare-package - - unpack - - - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-data-provider-provider - ${project.version} - jar - es-init.sh - ${project.build.directory}/assembly/opt/onap/sdnc/bin - - - - - - - - + + + + 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 + + + + + unpack-cache-schema + + unpack + + prepare-package + + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-provider + ${project.version} + jar + preload.cache.schema/** + ${project.build.directory}/assembly + + + + + + + unpack-es-init + prepare-package + + unpack + + + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-data-provider-provider + ${project.version} + jar + es-init.sh + ${project.build.directory}/assembly/opt/onap/sdnc/bin + + + + + + + + diff --git a/sdnr/wt/featureaggregator/installer/src/assembly/assemble_mvnrepo_zip.xml b/sdnr/wt/featureaggregator/installer/src/assembly/assemble_mvnrepo_zip.xml index 86b07f1f3..8c051e800 100755 --- a/sdnr/wt/featureaggregator/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/sdnr/wt/featureaggregator/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -1,29 +1,48 @@ + + - repo - - - zip - - - - false + 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 - - - target/assembly/ - . - - - - + + zip + + + false + + + target/assembly/ + . + + + + diff --git a/sdnr/wt/featureaggregator/pom.xml b/sdnr/wt/featureaggregator/pom.xml index 709c7529a..9cd486b5b 100755 --- a/sdnr/wt/featureaggregator/pom.xml +++ b/sdnr/wt/featureaggregator/pom.xml @@ -1,44 +1,48 @@ + ~ ============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======================================================= + ~ + --> + - 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-feature-aggregator-top - 0.7.1-SNAPSHOT - pom + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-feature-aggregator-top + 0.7.1-SNAPSHOT + pom - ccsdk-features :: ${project.artifactId} + ccsdk-features :: ${project.artifactId} - - feature - feature-devicemanager - installer - + + feature + feature-devicemanager + installer + 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. diff --git a/sdnr/wt/mountpoint-registrar/feature/pom.xml b/sdnr/wt/mountpoint-registrar/feature/pom.xml index 51af84fc8..b9e3b23c2 100644 --- a/sdnr/wt/mountpoint-registrar/feature/pom.xml +++ b/sdnr/wt/mountpoint-registrar/feature/pom.xml @@ -1,64 +1,66 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.mountpoint-registrar.feature - * ================================================================================ - * Copyright (C) 2019 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 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 1.5.2-SNAPSHOT - - + + org.onap.ccsdk.parent + single-feature-parent + 1.5.2-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-mountpoint-registrar-feature - 0.7.1-SNAPSHOT - feature + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-mountpoint-registrar-feature + 0.7.1-SNAPSHOT + feature - ccsdk-features :: ${project.artifactId} :: feature + ccsdk-features :: ${project.artifactId} - + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.controller.mdsal.version} + pom + import + + + - - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - + + ${project.groupId} + sdnr-wt-mountpoint-registrar-model + ${project.version} + + + ${project.groupId} + sdnr-wt-mountpoint-registrar-provider + ${project.version} + - - - - ${project.groupId} - sdnr-wt-mountpoint-registrar-model - ${project.version} - - - ${project.groupId} - sdnr-wt-mountpoint-registrar-provider - ${project.version} - - diff --git a/sdnr/wt/mountpoint-registrar/installer/pom.xml b/sdnr/wt/mountpoint-registrar/installer/pom.xml index 96dc18839..c4c47b24e 100755 --- a/sdnr/wt/mountpoint-registrar/installer/pom.xml +++ b/sdnr/wt/mountpoint-registrar/installer/pom.xml @@ -1,150 +1,152 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.mountpoint-registrar.installer - * ================================================================================ - * Copyright (C) 2019 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 + 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-mountpoint-registrar-installer - 0.7.1-SNAPSHOT - pom + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-mountpoint-registrar-installer + 0.7.1-SNAPSHOT + pom - ccsdk-features :: ${project.artifactId} + ccsdk-features :: ${project.artifactId} - - sdnr-wt-mountpoint-registrar - false - + + sdnr-wt-mountpoint-registrar + false + - + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.controller.mdsal.version} + pom + import + + + - - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - + + 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-resources-plugin - 2.6 - - - copy-schemas - - copy-resources - - validate - - ${project.build.directory}/assembly/cache/schema - - - ${basedir}/../provider/src/main/resources/preload.cache.schema - - *.yang - - true - - - - - - - - + + + + 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-resources-plugin + 2.6 + + + copy-schemas + + copy-resources + + validate + + ${project.build.directory}/assembly/cache/schema + + + ${basedir}/../provider/src/main/resources/preload.cache.schema + + *.yang + + true + + + + + + + + diff --git a/sdnr/wt/mountpoint-registrar/installer/src/assembly/assemble_mvnrepo_zip.xml b/sdnr/wt/mountpoint-registrar/installer/src/assembly/assemble_mvnrepo_zip.xml index c4eb9aa25..dfe5060bf 100644 --- a/sdnr/wt/mountpoint-registrar/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/sdnr/wt/mountpoint-registrar/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/mountpoint-registrar/model/pom.xml b/sdnr/wt/mountpoint-registrar/model/pom.xml index 53c0fe960..83c90c111 100644 --- a/sdnr/wt/mountpoint-registrar/model/pom.xml +++ b/sdnr/wt/mountpoint-registrar/model/pom.xml @@ -1,70 +1,72 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.devicemanager.model - * ================================================================================ - * 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 + 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-mountpoint-registrar-model - 0.7.1-SNAPSHOT - bundle + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-mountpoint-registrar-model + 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 + + - - true - + + true + - - + + - - - - org.jacoco - jacoco-maven-plugin - - - **/gen/** - **/generated-sources/** - **/yang-gen-sal/** - **/pax/** - - - - - + + + + org.jacoco + jacoco-maven-plugin + + + **/gen/** + **/generated-sources/** + **/yang-gen-sal/** + **/pax/** + + + + + diff --git a/sdnr/wt/mountpoint-registrar/pom.xml b/sdnr/wt/mountpoint-registrar/pom.xml index 27a667429..d13d0f9f7 100755 --- a/sdnr/wt/mountpoint-registrar/pom.xml +++ b/sdnr/wt/mountpoint-registrar/pom.xml @@ -1,26 +1,28 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.devicemanager - * ================================================================================ - * 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 diff --git a/sdnr/wt/mountpoint-registrar/provider/pom.xml b/sdnr/wt/mountpoint-registrar/provider/pom.xml index 39f9eb536..a4cffcb8f 100644 --- a/sdnr/wt/mountpoint-registrar/provider/pom.xml +++ b/sdnr/wt/mountpoint-registrar/provider/pom.xml @@ -1,15 +1,28 @@ - + + 4.0.0 diff --git a/sdnr/wt/mountpoint-registrar/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/wt/mountpoint-registrar/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml index d89f922f3..a286d43d8 100644 --- a/sdnr/wt/mountpoint-registrar/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml +++ b/sdnr/wt/mountpoint-registrar/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml @@ -1,52 +1,54 @@ - - - - - - - - - - - - - - - - - - - - - + ~ ============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======================================================= + ~ + --> + + + + + + + + + + + + + + + + + + + + diff --git a/sdnr/wt/mountpoint-registrar/provider/src/main/resources/version.properties b/sdnr/wt/mountpoint-registrar/provider/src/main/resources/version.properties index 80373399e..6638c04f9 100644 --- a/sdnr/wt/mountpoint-registrar/provider/src/main/resources/version.properties +++ b/sdnr/wt/mountpoint-registrar/provider/src/main/resources/version.properties @@ -1,3 +1,24 @@ -# Proberties filled in by maven during build process +# +# ============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======================================================= +# +# + +# Properties filled in by maven during build process version = ${project.version} build = ${buildtime} diff --git a/sdnr/wt/mountpoint-registrar/provider/src/test/resources/simplelogger.properties b/sdnr/wt/mountpoint-registrar/provider/src/test/resources/simplelogger.properties index 2eb3eb7b3..2d731055b 100644 --- a/sdnr/wt/mountpoint-registrar/provider/src/test/resources/simplelogger.properties +++ b/sdnr/wt/mountpoint-registrar/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/mountpoint-state-provider/feature/pom.xml b/sdnr/wt/mountpoint-state-provider/feature/pom.xml index 599a18b9e..bbc93af47 100644 --- a/sdnr/wt/mountpoint-state-provider/feature/pom.xml +++ b/sdnr/wt/mountpoint-state-provider/feature/pom.xml @@ -1,59 +1,61 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.mountpoint-state-provider.feature - * ================================================================================ - * Copyright (C) 2019 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 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 1.5.2-SNAPSHOT - - + + org.onap.ccsdk.parent + single-feature-parent + 1.5.2-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-mountpoint-state-provider-feature - 0.7.1-SNAPSHOT - feature + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-mountpoint-state-provider-feature + 0.7.1-SNAPSHOT + feature - ccsdk-features :: ${project.artifactId} :: feature + ccsdk-features :: ${project.artifactId} - + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.controller.mdsal.version} + pom + import + + + - - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - + + ${project.groupId} + sdnr-wt-mountpoint-state-provider-provider + ${project.version} + - - - - ${project.groupId} - sdnr-wt-mountpoint-state-provider-provider - ${project.version} - - diff --git a/sdnr/wt/mountpoint-state-provider/installer/pom.xml b/sdnr/wt/mountpoint-state-provider/installer/pom.xml index b6db618a7..13f1ae0d4 100755 --- a/sdnr/wt/mountpoint-state-provider/installer/pom.xml +++ b/sdnr/wt/mountpoint-state-provider/installer/pom.xml @@ -1,150 +1,152 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.mountpoint-state-provider.installer - * ================================================================================ - * Copyright (C) 2019 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 + 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-mountpoint-state-provider-installer - 0.7.1-SNAPSHOT - pom + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-mountpoint-state-provider-installer + 0.7.1-SNAPSHOT + pom - ccsdk-features :: ${project.artifactId} + ccsdk-features :: ${project.artifactId} - - sdnr-wt-mountpoint-state-provider - false - + + sdnr-wt-mountpoint-state-provider + false + - + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.controller.mdsal.version} + pom + import + + + - - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - + + 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-resources-plugin - 2.6 - - - copy-schemas - - copy-resources - - validate - - ${project.build.directory}/assembly/cache/schema - - - ${basedir}/../provider/src/main/resources/preload.cache.schema - - *.yang - - true - - - - - - - - + + + + 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-resources-plugin + 2.6 + + + copy-schemas + + copy-resources + + validate + + ${project.build.directory}/assembly/cache/schema + + + ${basedir}/../provider/src/main/resources/preload.cache.schema + + *.yang + + true + + + + + + + + diff --git a/sdnr/wt/mountpoint-state-provider/installer/src/assembly/assemble_mvnrepo_zip.xml b/sdnr/wt/mountpoint-state-provider/installer/src/assembly/assemble_mvnrepo_zip.xml index c4eb9aa25..dfe5060bf 100644 --- a/sdnr/wt/mountpoint-state-provider/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/sdnr/wt/mountpoint-state-provider/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/mountpoint-state-provider/pom.xml b/sdnr/wt/mountpoint-state-provider/pom.xml index fd6b10b76..829a49c1b 100755 --- a/sdnr/wt/mountpoint-state-provider/pom.xml +++ b/sdnr/wt/mountpoint-state-provider/pom.xml @@ -1,26 +1,28 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.devicemanager - * ================================================================================ - * 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 diff --git a/sdnr/wt/mountpoint-state-provider/provider/pom.xml b/sdnr/wt/mountpoint-state-provider/provider/pom.xml index 4d047a288..1f12428f8 100644 --- a/sdnr/wt/mountpoint-state-provider/provider/pom.xml +++ b/sdnr/wt/mountpoint-state-provider/provider/pom.xml @@ -1,112 +1,120 @@ + ~ ============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======================================================= + ~ + --> + - 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-mountpoint-state-provider-provider - 0.7.1-SNAPSHOT - bundle + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-mountpoint-state-provider-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 + + - - true - true - yyyy-MM-dd HH:mm - ${maven.build.timestamp} UTC - + + true + true + yyyy-MM-dd HH:mm + ${maven.build.timestamp} UTC + - - - - org.mockito - mockito-core - test - - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-common - ${project.version} - provided - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-netconfnode-state-service-provider - ${project.version} - - - org.osgi - org.osgi.core - provided - - - org.opendaylight.netconf - sal-netconf-connector - provided - - - org.opendaylight.mdsal.binding.model.ietf - rfc6991-ietf-yang-types - provided - - - org.opendaylight.mdsal - yang-binding - provided - - - org.opendaylight.mdsal - mdsal-singleton-common-api - provided - - - org.osgi - org.osgi.compendium - provided - - - org.onap.dmaap.messagerouter.dmaapclient - dmaapClient - 1.1.10 - - + + + + org.mockito + mockito-core + test + + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-common + ${project.version} + provided + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-netconfnode-state-service-provider + ${project.version} + + + org.osgi + org.osgi.core + provided + + + org.opendaylight.netconf + sal-netconf-connector + provided + + + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-yang-types + provided + + + org.opendaylight.mdsal + yang-binding + provided + + + org.opendaylight.mdsal + mdsal-singleton-common-api + provided + + + org.osgi + org.osgi.compendium + provided + + + org.onap.dmaap.messagerouter.dmaapclient + dmaapClient + 1.1.10 + + - - - - src/main/resources - true - - - + + + + src/main/resources + true + + + diff --git a/sdnr/wt/mountpoint-state-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/impl/MountpointStateProviderImpl.java b/sdnr/wt/mountpoint-state-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/impl/MountpointStateProviderImpl.java index 5ffae29f4..0223e7323 100644 --- a/sdnr/wt/mountpoint-state-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/impl/MountpointStateProviderImpl.java +++ b/sdnr/wt/mountpoint-state-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/impl/MountpointStateProviderImpl.java @@ -1,21 +1,28 @@ -package org.onap.ccsdk.features.sdnr.wt.mountpointstateprovider.impl; -/******************************************************************************* - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt - * ================================================================================================= - * Copyright (C) 2019 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 +/* + * ============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 * - * 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======================================================= * - * 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========================================================================== - ******************************************************************************/ + */ + +package org.onap.ccsdk.features.sdnr.wt.mountpointstateprovider.impl; import java.io.IOException; diff --git a/sdnr/wt/mountpoint-state-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/impl/MountpointStatePublisher.java b/sdnr/wt/mountpoint-state-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/impl/MountpointStatePublisher.java index 972c251e6..30857dec5 100644 --- a/sdnr/wt/mountpoint-state-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/impl/MountpointStatePublisher.java +++ b/sdnr/wt/mountpoint-state-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/impl/MountpointStatePublisher.java @@ -1,21 +1,28 @@ -package org.onap.ccsdk.features.sdnr.wt.mountpointstateprovider.impl; -/******************************************************************************* - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt - * ================================================================================================= - * Copyright (C) 2019 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 +/* + * ============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 * - * 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======================================================= * - * 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========================================================================== - ******************************************************************************/ + */ + +package org.onap.ccsdk.features.sdnr.wt.mountpointstateprovider.impl; import java.io.IOException; import java.util.LinkedList; diff --git a/sdnr/wt/mountpoint-state-provider/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/wt/mountpoint-state-provider/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml index b716b69d8..3ec9efbdd 100644 --- a/sdnr/wt/mountpoint-state-provider/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml +++ b/sdnr/wt/mountpoint-state-provider/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml @@ -1,35 +1,37 @@ - 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========================================================= - --> - - - - - - - - + + + + diff --git a/sdnr/wt/mountpoint-state-provider/provider/src/main/resources/version.properties b/sdnr/wt/mountpoint-state-provider/provider/src/main/resources/version.properties index 80373399e..6638c04f9 100644 --- a/sdnr/wt/mountpoint-state-provider/provider/src/main/resources/version.properties +++ b/sdnr/wt/mountpoint-state-provider/provider/src/main/resources/version.properties @@ -1,3 +1,24 @@ -# Proberties filled in by maven during build process +# +# ============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======================================================= +# +# + +# Properties filled in by maven during build process version = ${project.version} build = ${buildtime} diff --git a/sdnr/wt/mountpoint-state-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/test/TestMountpointStateProviderImpl.java b/sdnr/wt/mountpoint-state-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/test/TestMountpointStateProviderImpl.java index efcd86582..40951fab9 100644 --- a/sdnr/wt/mountpoint-state-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/test/TestMountpointStateProviderImpl.java +++ b/sdnr/wt/mountpoint-state-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/test/TestMountpointStateProviderImpl.java @@ -1,21 +1,28 @@ -package org.onap.ccsdk.features.sdnr.wt.mountpointstateprovider.test; -/******************************************************************************* - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt - * ================================================================================================= - * Copyright (C) 2019 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 +/* + * ============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 * - * 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======================================================= * - * 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========================================================================== - ******************************************************************************/ + */ + +package org.onap.ccsdk.features.sdnr.wt.mountpointstateprovider.test; import static org.junit.Assert.fail; diff --git a/sdnr/wt/mountpoint-state-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/test/TestMountpointStatePublisher.java b/sdnr/wt/mountpoint-state-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/test/TestMountpointStatePublisher.java index b9eb9ba30..dcc6ec24f 100644 --- a/sdnr/wt/mountpoint-state-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/test/TestMountpointStatePublisher.java +++ b/sdnr/wt/mountpoint-state-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/test/TestMountpointStatePublisher.java @@ -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======================================================= + * + */ + package org.onap.ccsdk.features.sdnr.wt.mountpointstateprovider.test; /******************************************************************************* * ============LICENSE_START======================================================================== diff --git a/sdnr/wt/mountpoint-state-provider/provider/src/test/resources/simplelogger.properties b/sdnr/wt/mountpoint-state-provider/provider/src/test/resources/simplelogger.properties index 2eb3eb7b3..2d731055b 100644 --- a/sdnr/wt/mountpoint-state-provider/provider/src/test/resources/simplelogger.properties +++ b/sdnr/wt/mountpoint-state-provider/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/mountpoint-state-provider/provider/src/test/resources/testpublisher.properties b/sdnr/wt/mountpoint-state-provider/provider/src/test/resources/testpublisher.properties index f74399404..18bbc7da3 100644 --- a/sdnr/wt/mountpoint-state-provider/provider/src/test/resources/testpublisher.properties +++ b/sdnr/wt/mountpoint-state-provider/provider/src/test/resources/testpublisher.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======================================================= +# +# + [general] dmaapEnabled=false TransportType=HTTPNOAUTH diff --git a/sdnr/wt/netconfnode-state-service/feature/pom.xml b/sdnr/wt/netconfnode-state-service/feature/pom.xml index e4c60abd8..3398ad651 100644 --- a/sdnr/wt/netconfnode-state-service/feature/pom.xml +++ b/sdnr/wt/netconfnode-state-service/feature/pom.xml @@ -1,57 +1,59 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.netconfnode-state-service.feature - * ================================================================================ - * 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 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 1.5.2-SNAPSHOT - - + + org.onap.ccsdk.parent + single-feature-parent + 1.5.2-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-netconfnode-state-service-feature - 0.7.1-SNAPSHOT - feature + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-netconfnode-state-service-feature + 0.7.1-SNAPSHOT + feature - ccsdk-features :: ${project.artifactId} :: feature + ccsdk-features :: ${project.artifactId} - - - - - - - - - - - - ${project.groupId} - sdnr-wt-netconfnode-state-service-provider - ${project.version} - - + + + + + + + + + + + + ${project.groupId} + sdnr-wt-netconfnode-state-service-provider + ${project.version} + + diff --git a/sdnr/wt/netconfnode-state-service/installer/pom.xml b/sdnr/wt/netconfnode-state-service/installer/pom.xml index 3a70660cd..276a6bc43 100755 --- a/sdnr/wt/netconfnode-state-service/installer/pom.xml +++ b/sdnr/wt/netconfnode-state-service/installer/pom.xml @@ -1,125 +1,127 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.netconfnode-state-service.installer - * ================================================================================ - * 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 + 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-netconfnode-state-service-installer - 0.7.1-SNAPSHOT - pom + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-netconfnode-state-service-installer + 0.7.1-SNAPSHOT + pom - ccsdk-features :: ${project.artifactId} + ccsdk-features :: ${project.artifactId} - - sdnr-wt-netconfnode-state-service - false - + + sdnr-wt-netconfnode-state-service + false + - + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.controller.mdsal.version} + pom + import + + + - - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - + + 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/netconfnode-state-service/installer/src/assembly/assemble_mvnrepo_zip.xml b/sdnr/wt/netconfnode-state-service/installer/src/assembly/assemble_mvnrepo_zip.xml index c4eb9aa25..dfe5060bf 100644 --- a/sdnr/wt/netconfnode-state-service/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/sdnr/wt/netconfnode-state-service/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/netconfnode-state-service/model/pom.xml b/sdnr/wt/netconfnode-state-service/model/pom.xml index 19367af17..b4c50ef70 100644 --- a/sdnr/wt/netconfnode-state-service/model/pom.xml +++ b/sdnr/wt/netconfnode-state-service/model/pom.xml @@ -1,80 +1,82 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.netconfnode-state-service.model - * ================================================================================ - * 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 + 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-netconfnode-state-service-model - 0.7.1-SNAPSHOT - bundle + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-netconfnode-state-service-model + 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 + + - - true - + + true + - - + + org.opendaylight.netconf sal-netconf-connector provided - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-data-provider-model - ${project.version} - - + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-data-provider-model + ${project.version} + + - - - - org.jacoco - jacoco-maven-plugin - - - **/gen/** - **/generated-sources/** - **/yang-gen-sal/** - **/pax/** - - - - - + + + + org.jacoco + jacoco-maven-plugin + + + **/gen/** + **/generated-sources/** + **/yang-gen-sal/** + **/pax/** + + + + + diff --git a/sdnr/wt/netconfnode-state-service/pom.xml b/sdnr/wt/netconfnode-state-service/pom.xml index f3da82cfe..27d379b7d 100755 --- a/sdnr/wt/netconfnode-state-service/pom.xml +++ b/sdnr/wt/netconfnode-state-service/pom.xml @@ -1,26 +1,28 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.netconfnode-state-service - * ================================================================================ - * 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 diff --git a/sdnr/wt/netconfnode-state-service/provider/pom.xml b/sdnr/wt/netconfnode-state-service/provider/pom.xml index 97ed5a8a2..da917e357 100644 --- a/sdnr/wt/netconfnode-state-service/provider/pom.xml +++ b/sdnr/wt/netconfnode-state-service/provider/pom.xml @@ -1,90 +1,98 @@ + ~ ============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======================================================= + ~ + --> + - 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-netconfnode-state-service-provider - 0.7.1-SNAPSHOT - bundle + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-netconfnode-state-service-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 + + - - true - true - yyyy-MM-dd HH:mm - ${maven.build.timestamp} UTC - + + true + true + yyyy-MM-dd HH:mm + ${maven.build.timestamp} UTC + - - - org.opendaylight.netconf - sal-netconf-connector - provided - - - org.opendaylight.mdsal - mdsal-singleton-common-api - provided - - - com.typesafe.akka - akka-actor_2.12 - provided - - - com.typesafe.akka - akka-cluster_2.12 - provided - - - ${project.groupId} - sdnr-wt-common - ${project.version} - provided - - - ${project.groupId} - sdnr-wt-netconfnode-state-service-model - ${project.version} - - + + + org.opendaylight.netconf + sal-netconf-connector + provided + + + org.opendaylight.mdsal + mdsal-singleton-common-api + provided + + + com.typesafe.akka + akka-actor_2.12 + provided + + + com.typesafe.akka + akka-cluster_2.12 + provided + + + ${project.groupId} + sdnr-wt-common + ${project.version} + provided + + + ${project.groupId} + sdnr-wt-netconfnode-state-service-model + ${project.version} + + - - - - src/main/resources - true - - - + + + + src/main/resources + true + + + diff --git a/sdnr/wt/netconfnode-state-service/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/wt/netconfnode-state-service/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml index bfdd83ef4..72147364f 100644 --- a/sdnr/wt/netconfnode-state-service/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml +++ b/sdnr/wt/netconfnode-state-service/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml @@ -1,61 +1,64 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + ~ ============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======================================================= + ~ + --> + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sdnr/wt/netconfnode-state-service/provider/src/main/resources/version.properties b/sdnr/wt/netconfnode-state-service/provider/src/main/resources/version.properties index 80373399e..6638c04f9 100644 --- a/sdnr/wt/netconfnode-state-service/provider/src/main/resources/version.properties +++ b/sdnr/wt/netconfnode-state-service/provider/src/main/resources/version.properties @@ -1,3 +1,24 @@ -# Proberties filled in by maven during build process +# +# ============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======================================================= +# +# + +# Properties filled in by maven during build process version = ${project.version} build = ${buildtime} diff --git a/sdnr/wt/netconfnode-state-service/provider/src/test/resources/simplelogger.properties b/sdnr/wt/netconfnode-state-service/provider/src/test/resources/simplelogger.properties index 2eb3eb7b3..2d731055b 100644 --- a/sdnr/wt/netconfnode-state-service/provider/src/test/resources/simplelogger.properties +++ b/sdnr/wt/netconfnode-state-service/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/netconfnode-state-service/provider/src/test/resources/test.properties b/sdnr/wt/netconfnode-state-service/provider/src/test/resources/test.properties index de49c5893..9290a88ba 100644 --- a/sdnr/wt/netconfnode-state-service/provider/src/test/resources/test.properties +++ b/sdnr/wt/netconfnode-state-service/provider/src/test/resources/test.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======================================================= +# +# + [dcae] dcaeUserCredentials=admin:admin dcaeUrl=off @@ -26,7 +47,7 @@ soapurlinq=off [es] esCluster=sendateodl5 -#time limit to keep increasing data in database [in seconds] +#time limit to keep increasing data in database [in seconds] #60*60*24*30 (30days) esArchiveLimit=2592000 #folder where removed data will be stored 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 + + + + + + + diff --git a/sdnr/wt/pom.xml b/sdnr/wt/pom.xml index 6909a0bfb..02ac53aba 100644 --- a/sdnr/wt/pom.xml +++ b/sdnr/wt/pom.xml @@ -1,23 +1,28 @@ + ~ ============LICENSE_START======================================================= + ~ ONAP : ccsdk features + ~ ================================================================================ + ~ Copyright (C) 2018 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 diff --git a/sdnr/wt/readthedocs/pom.xml b/sdnr/wt/readthedocs/pom.xml index 7249f710d..ec7d67f8b 100644 --- a/sdnr/wt/readthedocs/pom.xml +++ b/sdnr/wt/readthedocs/pom.xml @@ -1,5 +1,26 @@ - + + + 4.0.0 diff --git a/sdnr/wt/readthedocs/src/assembly/assemble_mvnrepo_zip.xml b/sdnr/wt/readthedocs/src/assembly/assemble_mvnrepo_zip.xml index c4eb9aa25..dfe5060bf 100644 --- a/sdnr/wt/readthedocs/src/assembly/assemble_mvnrepo_zip.xml +++ b/sdnr/wt/readthedocs/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/websocketmanager2/feature/pom.xml b/sdnr/wt/websocketmanager2/feature/pom.xml index d557f18ae..dca5e540d 100644 --- a/sdnr/wt/websocketmanager2/feature/pom.xml +++ b/sdnr/wt/websocketmanager2/feature/pom.xml @@ -1,26 +1,28 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.websocketmanager.feature - * ================================================================================ - * 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 @@ -36,7 +38,7 @@ 0.7.1-SNAPSHOT feature - ccsdk-features :: ${project.artifactId} :: feature + ccsdk-features :: ${project.artifactId} diff --git a/sdnr/wt/websocketmanager2/installer/pom.xml b/sdnr/wt/websocketmanager2/installer/pom.xml index 7c2ccffc1..2b7e2201a 100755 --- a/sdnr/wt/websocketmanager2/installer/pom.xml +++ b/sdnr/wt/websocketmanager2/installer/pom.xml @@ -1,26 +1,28 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.websocketmanager.installer - * ================================================================================ - * 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 diff --git a/sdnr/wt/websocketmanager2/installer/src/assembly/assemble_mvnrepo_zip.xml b/sdnr/wt/websocketmanager2/installer/src/assembly/assemble_mvnrepo_zip.xml index c4eb9aa25..dfe5060bf 100644 --- a/sdnr/wt/websocketmanager2/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/sdnr/wt/websocketmanager2/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/websocketmanager2/model/pom.xml b/sdnr/wt/websocketmanager2/model/pom.xml index 6e033bf52..bef399ecc 100644 --- a/sdnr/wt/websocketmanager2/model/pom.xml +++ b/sdnr/wt/websocketmanager2/model/pom.xml @@ -1,26 +1,28 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.websocketmanager.model - * ================================================================================ - * 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 diff --git a/sdnr/wt/websocketmanager2/pom.xml b/sdnr/wt/websocketmanager2/pom.xml index 052ad0f8f..a4cc934b4 100755 --- a/sdnr/wt/websocketmanager2/pom.xml +++ b/sdnr/wt/websocketmanager2/pom.xml @@ -1,26 +1,28 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.websocketmanager - * ================================================================================ - * 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 diff --git a/sdnr/wt/websocketmanager2/provider/pom.xml b/sdnr/wt/websocketmanager2/provider/pom.xml index 2e512b1a2..4ae7b861b 100644 --- a/sdnr/wt/websocketmanager2/provider/pom.xml +++ b/sdnr/wt/websocketmanager2/provider/pom.xml @@ -1,15 +1,28 @@ - + + 4.0.0 @@ -63,7 +76,7 @@ io.netty netty-all - + org.json diff --git a/sdnr/wt/websocketmanager2/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/wt/websocketmanager2/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml index 32b19a646..9a0dd1d8c 100644 --- a/sdnr/wt/websocketmanager2/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml +++ b/sdnr/wt/websocketmanager2/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml @@ -1,37 +1,44 @@ - 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========================================================================== ---> - + - + + + - - - + + + - - - - - + diff --git a/sdnr/wt/websocketmanager2/provider/src/test/resources/simplelogger.properties b/sdnr/wt/websocketmanager2/provider/src/test/resources/simplelogger.properties index 6f38b507a..1aa3824a1 100644 --- a/sdnr/wt/websocketmanager2/provider/src/test/resources/simplelogger.properties +++ b/sdnr/wt/websocketmanager2/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