summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/ajsc/dmaap_v1/dmaap/v1/conf/FileMonitorBeans.xml22
-rw-r--r--src/main/ajsc/dmaap_v1/dmaap/v1/conf/serviceBeans.xml13
-rw-r--r--src/main/ajsc/dmaap_v1/dmaap/v1/routes/topicService.route2
-rw-r--r--src/main/config/ajsc-override-web.xml4
-rw-r--r--src/main/config/cadi.properties5
-rw-r--r--src/main/config/runner-web.xml12
-rw-r--r--src/main/java/com/att/nsa/dmaap/DMaaPWebExceptionMapper.java2
-rw-r--r--src/main/java/com/att/nsa/dmaap/service/MMRestService.java1
-rw-r--r--src/main/resources/docker-compose/docker-compose.yml23
9 files changed, 37 insertions, 47 deletions
diff --git a/src/main/ajsc/dmaap_v1/dmaap/v1/conf/FileMonitorBeans.xml b/src/main/ajsc/dmaap_v1/dmaap/v1/conf/FileMonitorBeans.xml
index 2aa3908..a2c393c 100644
--- a/src/main/ajsc/dmaap_v1/dmaap/v1/conf/FileMonitorBeans.xml
+++ b/src/main/ajsc/dmaap_v1/dmaap/v1/conf/FileMonitorBeans.xml
@@ -1,25 +1,3 @@
-<!--
- ============LICENSE_START=======================================================
- org.onap.dmaap
- ================================================================================
- Copyright © 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=========================================================
-
- ECOMP is a trademark and service mark of AT&T Intellectual Property.
-
- -->
-
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/src/main/ajsc/dmaap_v1/dmaap/v1/conf/serviceBeans.xml b/src/main/ajsc/dmaap_v1/dmaap/v1/conf/serviceBeans.xml
index ac72847..ae7ba34 100644
--- a/src/main/ajsc/dmaap_v1/dmaap/v1/conf/serviceBeans.xml
+++ b/src/main/ajsc/dmaap_v1/dmaap/v1/conf/serviceBeans.xml
@@ -7,14 +7,19 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
<!-- Dependency Injection with annotations -->
+ <!-- <context:property-placeholder
+ location="file:/C:/Users/su622b/Desktop/testonap.properties"/> -->
+ <!-- <context:property-placeholder
+ location="classpath:msgRtrApi.properties,classpath:DMaaPErrorMesaages.properties" /> -->
+
+ <context:property-placeholder
+ location="file:///${AJSC_HOME}/bundleconfig/etc/appprops/MsgRtrApi.properties,file:///${AJSC_HOME}/etc/DMaaPErrorMesaages.properties"/>
+
<context:component-scan
base-package="com.att.nsa.cambria.utils, com.att.nsa.cambria, com.att.nsa.cambria.rest,
com.att.nsa.cambria.service.impl,com.att.nsa.cambria.beans,com.att.nsa.cambria.security,
com.att.nsa.cambria.transaction,com.att.nsa.cambria.exception,com.att.nsa.dmaap,com.att.nsa.dmaap.service,com.att.nsa.dmaap.util" />
- <context:property-placeholder
- location="file:${AJSC_HOME}/bundleconfig/etc/appprops/MsgRtrApi.properties,file:${AJSC_HOME}/etc/DMaaPErrorMesaages.properties"/>
-
<bean id="jsonProvider" class="org.apache.cxf.jaxrs.provider.json.JSONProvider">
<property name="dropRootElement" value="true" />
<property name="supportUnwrapped" value="true" />
@@ -80,7 +85,7 @@
<constructor-arg ref="propertyReader" />
</bean>
- <bean id="dMaaPKafkaMetaBroker" class=" com.att.nsa.cambria.beans.DMaaPKafkaMetaBroker">
+ <bean id="fMetaBroker" class=" com.att.nsa.cambria.beans.DMaaPKafkaMetaBroker">
<constructor-arg ref="propertyReader" />
<constructor-arg ref="dMaaPZkClient" />
<constructor-arg ref="dMaaPZkConfigDb" />
diff --git a/src/main/ajsc/dmaap_v1/dmaap/v1/routes/topicService.route b/src/main/ajsc/dmaap_v1/dmaap/v1/routes/topicService.route
index eddace7..57a8a70 100644
--- a/src/main/ajsc/dmaap_v1/dmaap/v1/routes/topicService.route
+++ b/src/main/ajsc/dmaap_v1/dmaap/v1/routes/topicService.route
@@ -2,7 +2,7 @@
<from uri="att-dme2-servlet:///topics?matchOnUriPrefix=true" />
- <to uri="cxfbean:topicService?providers=#jacksonProvider,#cambriaExMapper,#webExMapper" />
+ <to uri="cxfbean:topicService?providers=#jacksonProvider,#jsonProvider,#cambriaExMapper,#webExMapper" />
<setBody>
<simple>${in.header.exception}</simple>
diff --git a/src/main/config/ajsc-override-web.xml b/src/main/config/ajsc-override-web.xml
index 42652d4..7bd3c1d 100644
--- a/src/main/config/ajsc-override-web.xml
+++ b/src/main/config/ajsc-override-web.xml
@@ -25,10 +25,10 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
metadata-complete="false" version="3.0">
- <filter-mapping>
+ <!-- <filter-mapping>
<filter-name>DMaaPAuthFilter</filter-name>
<url-pattern>/*</url-pattern>
- </filter-mapping>
+ </filter-mapping> -->
<filter-mapping>
<filter-name>WriteableRequestFilter</filter-name>
diff --git a/src/main/config/cadi.properties b/src/main/config/cadi.properties
index a36fcac..30df1b9 100644
--- a/src/main/config/cadi.properties
+++ b/src/main/config/cadi.properties
@@ -20,10 +20,7 @@
#
###############################################################################
#This properties file is used for defining AAF properties related to the CADI framework. This file is used for running AAF framework
-#using the ajsc-cadi plugin. For more information on the ajsc-cadi plugin, please goto wiki link:
-#http://wiki.web.att.com/display/ajsc/CADI-AJSC-Plugin
-#For more information on utilizing the AAF framework, please goto wiki link:
-#AAF wiki link: http://wiki.web.att.com/display/aaf/AAF+Documentation
+#using the ajsc-cadi plugin. For more information on the ajsc-cadi plugin,
#In order to test functionality of cadi-ajsc-plugin locally (pertaining to GLO (AT&T Global Login)), you will need an AT&T cross
#domain cookie. Cadi "should" find your hostname for you. However, we have seen some situations where this fails. A Local testing
diff --git a/src/main/config/runner-web.xml b/src/main/config/runner-web.xml
index a94cbe6..55d7961 100644
--- a/src/main/config/runner-web.xml
+++ b/src/main/config/runner-web.xml
@@ -66,23 +66,15 @@
</filter>
<!-- Content length filter for Msgrtr -->
- <filter>
+ <!-- <filter>
<display-name>DMaaPAuthFilter</display-name>
<filter-name>DMaaPAuthFilter</filter-name>
<filter-class>com.att.nsa.dmaap.util.DMaaPAuthFilter</filter-class>
<init-param>
<param-name>cadi_prop_files</param-name>
-<!-- param-name was changed from prop_files to cadi_prop_files in 1.1.1, so please use "cadi_prop_files" for param-name moving forward -->
-<!-- old value <param-name>prop_files</param-name> -->
- <!-- Please, note: configuration files were located under the conf/ directory for 4.4.0 and lower versions
- of the ajsc. Beginning with the 4.5.1 Release version of the ajsc, these configuration files have ALL
- been moved to the etc/ directory to better utilize some SWM packaging functionality. -->
- <!-- <param-value>conf/cadi.properties</param-value> -->
- <!-- <param-value>etc/cadi.properties</param-value> -->
- <!-- <param-value>etc/cadi.properties </param-value>-->
<param-value>/appl/dmaapMR1/etc/cadi.properties </param-value>
</init-param>
- </filter>
+ </filter> -->
<!-- End Content length filter for Msgrtr -->
<servlet>
diff --git a/src/main/java/com/att/nsa/dmaap/DMaaPWebExceptionMapper.java b/src/main/java/com/att/nsa/dmaap/DMaaPWebExceptionMapper.java
index 7a9d0ba..47765c3 100644
--- a/src/main/java/com/att/nsa/dmaap/DMaaPWebExceptionMapper.java
+++ b/src/main/java/com/att/nsa/dmaap/DMaaPWebExceptionMapper.java
@@ -150,7 +150,7 @@ public class DMaaPWebExceptionMapper implements ExceptionMapper<WebApplicationEx
* Malformed request
*/
if(ex instanceof BadRequestException)
- {
+ { ex.printStackTrace();
errRes = new ErrorResponse(HttpStatus.SC_BAD_REQUEST,DMaaPResponseCode.INCORRECT_JSON.
getResponseCode(),msgs.getBadRequest());
diff --git a/src/main/java/com/att/nsa/dmaap/service/MMRestService.java b/src/main/java/com/att/nsa/dmaap/service/MMRestService.java
index d90d832..6415e31 100644
--- a/src/main/java/com/att/nsa/dmaap/service/MMRestService.java
+++ b/src/main/java/com/att/nsa/dmaap/service/MMRestService.java
@@ -66,6 +66,7 @@ import com.att.nsa.cambria.exception.DMaaPErrorMessages;
import com.att.nsa.cambria.metabroker.Broker.TopicExistsException;
import com.att.nsa.cambria.security.DMaaPAAFAuthenticator;
import com.att.nsa.cambria.security.DMaaPAAFAuthenticatorImpl;
+import com.att.nsa.cambria.security.DMaaPAuthenticatorImpl;
import com.att.nsa.cambria.service.MMService;
/**
diff --git a/src/main/resources/docker-compose/docker-compose.yml b/src/main/resources/docker-compose/docker-compose.yml
index b10d8c0..df70f25 100644
--- a/src/main/resources/docker-compose/docker-compose.yml
+++ b/src/main/resources/docker-compose/docker-compose.yml
@@ -4,6 +4,13 @@ services:
image: wurstmeister/zookeeper
ports:
- "2181:2181"
+ volumes:
+ - ./data-zookeeper:/opt/zookeeper-3.4.9/data
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "30m"
+ max-file: "5"
kafka:
build: .
ports:
@@ -11,14 +18,19 @@ services:
environment:
KAFKA_ADVERTISED_HOST_NAME: 172.18.0.1
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-
volumes:
- /var/run/docker.sock:/var/run/docker.sock
+ - ./data-kafka:/kafka
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "30m"
+ max-file: "5"
depends_on:
- zookeeper
dmaap:
- image: attos/dmaap
+ image: onap/dmaap/dmaap-mr
ports:
- "3904:3904"
- "3905:3905"
@@ -26,4 +38,9 @@ services:
- /var/tmp/MsgRtrApi.properties:/appl/dmaapMR1/bundleconfig/etc/appprops/MsgRtrApi.properties
depends_on:
- zookeeper
- - kafka
+ - kafka
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "30m"
+ max-file: "5"