From 39c8bab656e98bd03f9637c2f1c90bf5e759cea4 Mon Sep 17 00:00:00 2001 From: dglFromAtt Date: Wed, 9 May 2018 21:26:55 -0400 Subject: [PATCH] Files missing License text Change-Id: Ic79052dda66c81cacbeab04a0ac6cc3272f5bb98 Signed-off-by: dglFromAtt Issue-ID: DMAAP-494 --- Dockerfile | 25 +++++++++++++++++++++---- README.md | 23 +++++++++++++++++++++++ misc/PolicyEngineApi.properties.tmpl | 22 ++++++++++++++++++++++ misc/cert-client-init.sh | 25 ++++++++++++++++++++++++- misc/dmaapbc | 21 +++++++++++++++++++++ misc/dmaapbc.properties.tmpl | 21 +++++++++++++++++++++ misc/doaction | 21 +++++++++++++++++++++ misc/havecert.tmpl | 21 +++++++++++++++++++++ misc/log4j.properties.tmpl | 21 +++++++++++++++++++++ misc/logback.xml | 22 ++++++++++++++++++++++ misc/opensource.env | 21 +++++++++++++++++++++ misc/policyLogger.properties | 21 +++++++++++++++++++++ pom.xml | 24 ++++++++++++++++++++++-- version.properties | 2 +- 14 files changed, 282 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 09c5aa3..491a8d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,24 @@ +# +# ============LICENSE_START========================================== +# org.onap.dmaap +# =================================================================== +# Copyright © 2018 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============================================ +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +# FROM java:openjdk-8-jre MAINTAINER Dominic Lunanuova ENV insdir /opt/app/dmaapbc @@ -12,10 +33,6 @@ RUN \ WORKDIR ${insdir} USER root COPY target/buscontroller.jar ${insdir}/lib/ -# COPY target/dependency/*.jar ${insdir}/lib/ -# COPY src/main/resources/log4j.properties ${insdir}/etc/ -# COPY www/ ${insdir}/www/ -# COPY target/site/apidocs/ ${insdir}/www/doc/ COPY misc/LocalKey ${insdir}/etc/ COPY misc/logback.xml ${insdir}/etc/ COPY misc/dbc-api.jks ${insdir}/etc/keystore diff --git a/README.md b/README.md index 773c04b..1ccaefa 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,26 @@ + +# +# ============LICENSE_START========================================== +# org.onap.dmaap +# =================================================================== +# Copyright © 2018 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============================================ +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +# + DMaaP Bus Controller API ======================= diff --git a/misc/PolicyEngineApi.properties.tmpl b/misc/PolicyEngineApi.properties.tmpl index b49f7e9..248b288 100644 --- a/misc/PolicyEngineApi.properties.tmpl +++ b/misc/PolicyEngineApi.properties.tmpl @@ -1,3 +1,25 @@ +# +# ============LICENSE_START========================================== +# org.onap.dmaap +# =================================================================== +# Copyright © 2018 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============================================ +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +# + cat < + + diff --git a/misc/opensource.env b/misc/opensource.env index 71123fa..80d82f8 100644 --- a/misc/opensource.env +++ b/misc/opensource.env @@ -1,4 +1,25 @@ # +# +# ============LICENSE_START========================================== +# org.onap.dmaap +# =================================================================== +# Copyright © 2018 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============================================ +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +# # The Controller domain # CONT_DOMAIN=simpledemo.onap.org diff --git a/misc/policyLogger.properties b/misc/policyLogger.properties index 83190e0..6b9ad99 100644 --- a/misc/policyLogger.properties +++ b/misc/policyLogger.properties @@ -1,3 +1,24 @@ +# +# ============LICENSE_START========================================== +# org.onap.dmaap +# =================================================================== +# Copyright © 2018 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============================================ +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +# ################################### Set concurrentHashMap and timer info ####################### #Timer initial delay and the delay between in milliseconds before task is to be execute. timer.delay.time=1000 diff --git a/pom.xml b/pom.xml index fba4897..8e3f9aa 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,24 @@ + 4.0.0 org.onap.dmaap.buscontroller @@ -267,7 +287,7 @@ org.onap.dmaap.dbcapi dbcapi - 1.0.6-SNAPSHOT + 1.0.7-SNAPSHOT @@ -302,7 +322,7 @@ UTF-8 9.3.7.v20160115 0.0.1 - 1.0.10 + 1.0.11 0.7.7.201606060606 3.2 diff --git a/version.properties b/version.properties index c0d2dee..4697e93 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ major=1 minor=0 -patch=10 +patch=11 base_version=${major}.${minor}.${patch} # Release must be completed with git revision # in Jenkins -- 2.16.6