diff options
| -rw-r--r-- | Dockerfile | 25 | ||||
| -rw-r--r-- | README.md | 23 | ||||
| -rw-r--r-- | misc/PolicyEngineApi.properties.tmpl | 22 | ||||
| -rw-r--r-- | misc/cert-client-init.sh | 25 | ||||
| -rw-r--r-- | misc/dmaapbc | 21 | ||||
| -rw-r--r-- | misc/dmaapbc.properties.tmpl | 21 | ||||
| -rw-r--r-- | misc/doaction | 21 | ||||
| -rw-r--r-- | misc/havecert.tmpl | 21 | ||||
| -rw-r--r-- | misc/log4j.properties.tmpl | 21 | ||||
| -rw-r--r-- | misc/logback.xml | 22 | ||||
| -rw-r--r-- | misc/opensource.env | 21 | ||||
| -rw-r--r-- | misc/policyLogger.properties | 21 | ||||
| -rw-r--r-- | pom.xml | 24 | ||||
| -rw-r--r-- | version.properties | 2 |
14 files changed, 282 insertions, 8 deletions
@@ -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 @@ -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 <<!EOF #PDP URLs to which will be used by the Policy Engine API to take Decisions. There are multiple to support redundancy. #Format: PDP_URL{PriorityNumber} = URL, id, password. diff --git a/misc/cert-client-init.sh b/misc/cert-client-init.sh index cba9354..a909895 100644 --- a/misc/cert-client-init.sh +++ b/misc/cert-client-init.sh @@ -1,7 +1,30 @@ #!/bin/bash # -# This script is a placeholder for a local certificate authority (CA) +# ============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. +# +# + +# +# This script adds a known local certificate authority (CA) # to be a recognized certificate authority. +# i.e. it updates the truststore # # This script must be run as root. # diff --git a/misc/dmaapbc b/misc/dmaapbc index 42225a0..c65a74b 100644 --- a/misc/dmaapbc +++ b/misc/dmaapbc @@ -1,4 +1,25 @@ #!/bin/bash +# +# ============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. +# +# umask 0022 TZ=GMT0 diff --git a/misc/dmaapbc.properties.tmpl b/misc/dmaapbc.properties.tmpl index 23237a6..414771b 100644 --- a/misc/dmaapbc.properties.tmpl +++ b/misc/dmaapbc.properties.tmpl @@ -1,5 +1,26 @@ cat <<!EOF # +# ============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. +# +# +# # Configuration parameters fixed at startup for the DMaaP Bus Controller # # CSIT TESTING diff --git a/misc/doaction b/misc/doaction index 18b0caa..7fee592 100644 --- a/misc/doaction +++ b/misc/doaction @@ -1,4 +1,25 @@ #!/bin/bash +# +# ============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. +# +# cd /opt/app/dmaapbc/etc for action in "$@" diff --git a/misc/havecert.tmpl b/misc/havecert.tmpl index 00a0a34..a3a5ff8 100644 --- a/misc/havecert.tmpl +++ b/misc/havecert.tmpl @@ -1,4 +1,25 @@ #!/bin/bash +# +# ============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 <<!EOF TZ=GMT0 cd /opt/app/dmaapbc; diff --git a/misc/log4j.properties.tmpl b/misc/log4j.properties.tmpl index 0b689f4..2a30bf5 100644 --- a/misc/log4j.properties.tmpl +++ b/misc/log4j.properties.tmpl @@ -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. +# +# cat <<!EOF log4j.debug=FALSE log4j.rootLogger=INFO,Root diff --git a/misc/logback.xml b/misc/logback.xml index 9f3e038..2af00f1 100644 --- a/misc/logback.xml +++ b/misc/logback.xml @@ -1,4 +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. +--> + + <configuration scan="true" scanPeriod="3 seconds"> <!--<jmxConfigurator /> --> <!-- directory path for all other type logs --> 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 @@ -1,4 +1,24 @@ <?xml version="1.0"?> +<!-- + ============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. +--> <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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.dmaap.buscontroller</groupId> @@ -267,7 +287,7 @@ <dependency> <groupId>org.onap.dmaap.dbcapi</groupId> <artifactId>dbcapi</artifactId> - <version>1.0.6-SNAPSHOT</version> + <version>1.0.7-SNAPSHOT</version> </dependency> </dependencies> <reporting> @@ -302,7 +322,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <jettyVersion>9.3.7.v20160115</jettyVersion> <eelf.version>0.0.1</eelf.version> - <artifact.version>1.0.10</artifact.version> + <artifact.version>1.0.11</artifact.version> <!-- SONAR --> <jacoco.version>0.7.7.201606060606</jacoco.version> <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version> 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 |