aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authordglFromAtt <dgl@research.att.com>2019-02-18 18:20:55 +0000
committerdglFromAtt <dgl@research.att.com>2019-02-21 17:48:01 +0000
commitd0a915d10c00314ecc1f07c2ecf9dd239ee47aad (patch)
tree7174d8a3350dc4449ab24942457ac6c78822fd32 /src
parentcdd17d2146e854d13a71922bcb4f3741f9c15ffe (diff)
Restructure project for 2 images
Change-Id: I05b858012a05b1c177a8a2e25ec610b0174b6a54 Signed-off-by: dglFromAtt <dgl@research.att.com> Issue-ID: DMAAP-1046 Signed-off-by: dglFromAtt <dgl@research.att.com> Patchset2 - corrected some typos Signed-off-by: dglFromAtt <dgl@research.att.com> Signed-off-by: dglFromAtt <dgl@research.att.com> Change-Id: I05b858012a05b1c177a8a2e25ec610b0174b6a54 Signed-off-by: dglFromAtt <dgl@research.att.com> Patchset3 - use latest dbcapi.jar Change-Id: I05b858012a05b1c177a8a2e25ec610b0174b6a54 Signed-off-by: dglFromAtt <dgl@research.att.com>
Diffstat (limited to 'src')
-rw-r--r--src/main/resources/docker-compose.yml25
-rw-r--r--src/main/resources/docker-databus-controller.conf12
-rw-r--r--src/main/webapp/HelloJetty.html30
-rw-r--r--src/main/webapp/WEB-INF/log4j.xml45
-rw-r--r--src/main/webapp/WEB-INF/web.xml38
-rw-r--r--src/main/webapp/index.jsp28
6 files changed, 0 insertions, 178 deletions
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 @@
-<!DOCTYPE html>
-<!--
- ============LICENSE_START=======================================================
- OpenECOMP - org.openecomp.dmaapbc
- ================================================================================
- 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=========================================================
- -->
-
-<html>
-<head>
-<meta charset="ISO-8859-1">
-<title>Index</title>
-</head>
-<body>
-Hello Jetty!
-</body>
-</html>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ============LICENSE_START=======================================================
- OpenECOMP - org.openecomp.dmaapbc
- ================================================================================
- 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=========================================================
- -->
-
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd" >
-<log4j:configuration>
- <appender name="dmaapBC" class="org.apache.log4j.RollingFileAppender">
- <param name="File" value="dmaapBC.log"/>
- <param name="MaxFileSize" value="1000KB"/>
- <param name="MaxBackupIndex" value="3"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="[%d{HH:mm:ss:SSS}] - %-6p - %c.%M() - %m%n"/>
- </layout>
- </appender>
- <appender name="media" class="org.apache.log4j.ConsoleAppender">
- <param name="Threshold" value="FATAL"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- </layout>
- </appender>
- <category name="org.openecomp.dcae.dmaapBC">
- <appender-ref ref="dmaapBC"/>
- </category>
- <root>
- <priority value="all"/>
- <appender-ref ref="media"/>
- </root>
-</log4j:configuration>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ============LICENSE_START=======================================================
- OpenECOMP - org.openecomp.dmaapbc
- ================================================================================
- 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=========================================================
- -->
-
-<!-- This web.xml file is not required when using Servlet 3.0 container,
- see implementation details http://jersey.java.net/nonav/documentation/latest/jax-rs.html -->
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
- <servlet>
- <servlet-name>Jersey Web Application</servlet-name>
- <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
- <init-param>
- <param-name>jersey.config.server.provider.packages</param-name>
- <param-value>org.openecomp.dmaapBC</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>Jersey Web Application</servlet-name>
- <url-pattern>/webapi/*</url-pattern>
- </servlet-mapping>
-</web-app>
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=========================================================
- --%>
-
-<html>
-<body>
- <h2>Jersey RESTful Web Application!</h2>
- <p><a href="webapi/dmaap">Jersey resource</a>
- <p>Visit <a href="http://jersey.java.net">Project Jersey website</a>
- for more information on Jersey!
-</body>
-</html>