diff options
author | Singal, Kapil (ks220y) <ks220y@att.com> | 2020-02-03 09:31:39 -0500 |
---|---|---|
committer | Singal, Kapil (ks220y) <ks220y@att.com> | 2020-02-03 12:19:39 -0500 |
commit | 6ff6ed9734d5cfa5ebc8e362dfdb63fa55cc0dbd (patch) | |
tree | e9a61687307b2c4098dc1c78787a84bfb276c7bc /sdnr/wt/data-provider/provider | |
parent | 6af0ccf62efaa371ff337376115a34c8589ca38e (diff) |
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) <ks220y@att.com>
Diffstat (limited to 'sdnr/wt/data-provider/provider')
6 files changed, 190 insertions, 95 deletions
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 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ============LICENSE_START======================================================= - ONAP : CCSDK / SDNR / WT / data-provider - ================================================================================ - 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========================================================= ---> + ~ ============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======================================================= + ~ + --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -22,7 +30,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> <version>1.5.2-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> @@ -63,7 +71,7 @@ <artifactId>sdnr-wt-data-provider-model</artifactId> <version>${project.version}</version> </dependency> - <dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </dependency> @@ -72,7 +80,7 @@ <artifactId>org.osgi.core</artifactId> <scope>provided</scope> </dependency> - <dependency> + <dependency> <groupId>org.apache.karaf.shell</groupId> <artifactId>org.apache.karaf.shell.core</artifactId> <scope>provided</scope> @@ -127,16 +135,16 @@ <phase>generate-sources</phase> <goals> <goal>exec</goal> - </goals> - <configuration> - <executable>bash</executable> - <arguments> - <argument>${basedir}/../../data-provider/provider/src/main/resources/es-init.sh</argument> - <argument>initfile</argument> - <argument>-f</argument> - <argument>${project.build.directory}/EsInit.script</argument> - </arguments> - </configuration> + </goals> + <configuration> + <executable>bash</executable> + <arguments> + <argument>${basedir}/../../data-provider/provider/src/main/resources/es-init.sh</argument> + <argument>initfile</argument> + <argument>-f</argument> + <argument>${project.build.directory}/EsInit.script</argument> + </arguments> + </configuration> </execution> </executions> </plugin> 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 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -============LICENSE_START======================================================= -ONAP : ccsdk feature sdnr wt data-provider - ================================================================================ -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 + ~ + ~ 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======================================================= + ~ + --> - http://www.apache.org/licenses/LICENSE-2.0 +<blueprint xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0" + xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" odl:use-default-for-reference-types="true"> -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========================================================= - --> + <reference id="rpcProviderService" + interface="org.opendaylight.mdsal.binding.api.RpcProviderService" + odl:type="default"/> -<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" - xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0" odl:use-default-for-reference-types="true"> + <bean id="readyServlet" + class="org.onap.ccsdk.features.sdnr.wt.dataprovider.http.ReadyHttpServlet"> + </bean> + <service interface="javax.servlet.http.HttpServlet" + ref="readyServlet"> + <service-properties> + <entry key="alias" value="/ready"/> + </service-properties> + </service> - <reference id="rpcProviderService" - interface="org.opendaylight.mdsal.binding.api.RpcProviderService" - odl:type="default" /> - - <bean id="readyServlet" - class="org.onap.ccsdk.features.sdnr.wt.dataprovider.http.ReadyHttpServlet"> - </bean> - <service interface="javax.servlet.http.HttpServlet" - ref="readyServlet"> - <service-properties> - <entry key="alias" value="/ready" /> - </service-properties> - </service> + <bean id="aboutServlet" + class="org.onap.ccsdk.features.sdnr.wt.dataprovider.http.AboutHttpServlet"> + </bean> + <service interface="javax.servlet.http.HttpServlet" + ref="aboutServlet"> + <service-properties> + <entry key="alias" value="/about"/> + </service-properties> + </service> - <bean id="aboutServlet" - class="org.onap.ccsdk.features.sdnr.wt.dataprovider.http.AboutHttpServlet"> - </bean> - <service interface="javax.servlet.http.HttpServlet" - ref="aboutServlet"> - <service-properties> - <entry key="alias" value="/about" /> - </service-properties> - </service> - <bean id="msServlet" - class="org.onap.ccsdk.features.sdnr.wt.dataprovider.http.MsServlet"> + class="org.onap.ccsdk.features.sdnr.wt.dataprovider.http.MsServlet"> + </bean> + <service interface="javax.servlet.http.HttpServlet" ref="msServlet"> + <service-properties> + <entry key="alias" value="/ms"/> + </service-properties> + </service> + + <bean id="provider" + class="org.onap.ccsdk.features.sdnr.wt.dataprovider.impl.DataProviderImpl" + init-method="init" destroy-method="close"> + <property name="rpcProviderService" ref="rpcProviderService"/> + <property name="aboutServlet" ref="aboutServlet"/> + <property name="mediatorServerServlet" ref="msServlet"/> + </bean> + + <bean id="yangServlet" + class="org.onap.ccsdk.features.sdnr.wt.dataprovider.http.YangSchemaHttpServlet"> </bean> - <service interface="javax.servlet.http.HttpServlet" ref="msServlet"> + <service interface="javax.servlet.http.HttpServlet" + ref="yangServlet"> <service-properties> - <entry key="alias" value="/ms" /> + <entry key="alias" value="/yang-schema"/> </service-properties> </service> - - <bean id="provider" - class="org.onap.ccsdk.features.sdnr.wt.dataprovider.impl.DataProviderImpl" - init-method="init" destroy-method="close"> - <property name="rpcProviderService" ref="rpcProviderService" /> - <property name="aboutServlet" ref="aboutServlet" /> - <property name="mediatorServerServlet" ref="msServlet" /> - </bean> - - <bean id="yangServlet" - class="org.onap.ccsdk.features.sdnr.wt.dataprovider.http.YangSchemaHttpServlet"> - </bean> - <service interface="javax.servlet.http.HttpServlet" - ref="yangServlet"> - <service-properties> - <entry key="alias" value="/yang-schema" /> - </service-properties> - </service> - <service ref="provider" - interface="org.onap.ccsdk.features.sdnr.wt.dataprovider.model.IEntityDataProvider" /> + <service ref="provider" + interface="org.onap.ccsdk.features.sdnr.wt.dataprovider.model.IEntityDataProvider"/> </blueprint> 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 @@ <?xml version="1.0" encoding="UTF-8"?> -<Configuration package="log4j.test" +<!-- + ~ ============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======================================================= + ~ + --> + +<Configuration package="log4j.test" status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> 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 |