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/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 +++- 6 files changed, 190 insertions(+), 95 deletions(-) (limited to 'sdnr/wt/data-provider/provider') 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 -- cgit 1.2.3-korg