From d0a915d10c00314ecc1f07c2ecf9dd239ee47aad Mon Sep 17 00:00:00 2001 From: dglFromAtt Date: Mon, 18 Feb 2019 18:20:55 +0000 Subject: Restructure project for 2 images Change-Id: I05b858012a05b1c177a8a2e25ec610b0174b6a54 Signed-off-by: dglFromAtt Issue-ID: DMAAP-1046 Signed-off-by: dglFromAtt Patchset2 - corrected some typos Signed-off-by: dglFromAtt Signed-off-by: dglFromAtt Change-Id: I05b858012a05b1c177a8a2e25ec610b0174b6a54 Signed-off-by: dglFromAtt Patchset3 - use latest dbcapi.jar Change-Id: I05b858012a05b1c177a8a2e25ec610b0174b6a54 Signed-off-by: dglFromAtt --- src/main/resources/docker-compose.yml | 25 ------------- src/main/resources/docker-databus-controller.conf | 12 ------ src/main/webapp/HelloJetty.html | 30 --------------- src/main/webapp/WEB-INF/log4j.xml | 45 ----------------------- src/main/webapp/WEB-INF/web.xml | 38 ------------------- src/main/webapp/index.jsp | 28 -------------- 6 files changed, 178 deletions(-) delete mode 100644 src/main/resources/docker-compose.yml delete mode 100644 src/main/resources/docker-databus-controller.conf delete mode 100644 src/main/webapp/HelloJetty.html delete mode 100644 src/main/webapp/WEB-INF/log4j.xml delete mode 100644 src/main/webapp/WEB-INF/web.xml delete mode 100644 src/main/webapp/index.jsp (limited to 'src') diff --git a/src/main/resources/docker-compose.yml b/src/main/resources/docker-compose.yml deleted file mode 100644 index 41bc473..0000000 --- a/src/main/resources/docker-compose.yml +++ /dev/null @@ -1,25 +0,0 @@ -version: '2' -services: - dbc-pg-primary: - image: crunchydata/crunchy-postgres:centos7-10.4-2.0.0 - ports: - - "5432:5432" - environment: - - PG_MODE=master - - PG_PRIMARY_USER="dmaap_admin" - - PG_PRIMARY_PASSWORD=onapdemodb - - PG_USER="dmaap_admin" - - PG_PASSWORD=onapdemodb - - PG_ROOT_PASSWORD=onapdemodb - - PG_DATABASE="dmaap" - - PG_PRIMARY_PORT=5432 - - dmaap-bc: - image: nexus3.onap.org:10001/onap/dmaap/buscontroller:latest - ports: - - "30241:8080" - - "30242:8443" - volumes: - - /var/tmp/docker-databus-controller.conf:/opt/app/config/conf - depends_on: - - dbc-pg-primary diff --git a/src/main/resources/docker-databus-controller.conf b/src/main/resources/docker-databus-controller.conf deleted file mode 100644 index 7214adf..0000000 --- a/src/main/resources/docker-databus-controller.conf +++ /dev/null @@ -1,12 +0,0 @@ -DMAAPBC_WAIT_TO_EXIT=Y -DMAAPBC_PG_ENABLED=true -DMAAPBC_PGHOST=dbc-pg-primary -DMAAPBC_PGDBNAME=dmaap -DMAAPBC_PGCRED=onapdemodb -DMAAPBC_PGUSER=dmaap_admin -DMAAPBC_MR_CNAME=message-router -DMAAPBC_AAF_URL=https://aaf-authz/ -DMAAPBC_TOPICMGR_USER=m23456@dmaapbc.onap.org -DMAAPBC_TOPICMGR_PWD=onapdemo -DMAAPBC_ADMIN_USER=m12345@dmaapbc.onap.org -DMAAPBC_ADMIN_PWD=onapdemo \ No newline at end of file diff --git a/src/main/webapp/HelloJetty.html b/src/main/webapp/HelloJetty.html deleted file mode 100644 index 4d61636..0000000 --- a/src/main/webapp/HelloJetty.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - -Index - - -Hello Jetty! - - diff --git a/src/main/webapp/WEB-INF/log4j.xml b/src/main/webapp/WEB-INF/log4j.xml deleted file mode 100644 index 4e4d5e9..0000000 --- a/src/main/webapp/WEB-INF/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 055fbf0..0000000 --- a/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - Jersey Web Application - org.glassfish.jersey.servlet.ServletContainer - - jersey.config.server.provider.packages - org.openecomp.dmaapBC - - 1 - - - Jersey Web Application - /webapi/* - - diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp deleted file mode 100644 index 3c20e06..0000000 --- a/src/main/webapp/index.jsp +++ /dev/null @@ -1,28 +0,0 @@ -<%-- - ============LICENSE_START======================================================= - org.onap.dcae - ================================================================================ - Copyright (C) 2017 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========================================================= - --%> - - - -

Jersey RESTful Web Application!

-

Jersey resource -

Visit Project Jersey website - for more information on Jersey! - - -- cgit 1.2.3-korg