diff options
Diffstat (limited to 'src/main/ajsc')
3 files changed, 10 insertions, 27 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> |