diff options
25 files changed, 73 insertions, 112 deletions
diff --git a/ajsc-shared-config/etc/logback.xml b/ajsc-shared-config/etc/logback.xml index 56a9590..6f90ce1 100644 --- a/ajsc-shared-config/etc/logback.xml +++ b/ajsc-shared-config/etc/logback.xml @@ -38,13 +38,13 @@ </appender> <appender name="INFO" - class="ch.qos.logback.core.rolling.RollingFileAppender"> + class="ch.qos.logback.core.ConsoleAppender"> <filter class="ch.qos.logback.classic.filter.LevelFilter"> <level>INFO</level> <onMatch>ACCEPT</onMatch> <onMismatch>DENY</onMismatch> </filter> - <file>${logDirectory}/Info.log</file> + <!-- <file>${logDirectory}/Info.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> <fileNamePattern>${logDirectory}/Info-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip </fileNamePattern> @@ -57,12 +57,12 @@ </triggeringPolicy> <encoder> <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern> - </encoder> + </encoder> --> </appender> - <!--<appender name="DEBUG" - class="ch.qos.logback.core.rolling.RollingFileAppender"> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> + <appender name="DEBUG" + class="ch.qos.logback.core.ConsoleAppender"> + <!-- <filter class="ch.qos.logback.classic.filter.LevelFilter"> <level>DEBUG</level> <onMatch>ACCEPT</onMatch> <onMismatch>DENY</onMismatch> @@ -77,21 +77,21 @@ <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>500MB</maxFileSize> - </triggeringPolicy> + </triggeringPolicy> --> <encoder> <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern> </encoder> - </appender> --> + </appender> <appender name="ERROR" - class="ch.qos.logback.core.rolling.RollingFileAppender"> + class="ch.qos.logback.core.ConsoleAppender"> <filter class="ch.qos.logback.classic.filter.LevelFilter"> <level>ERROR</level> <onMatch>ACCEPT</onMatch> <onMismatch>DENY</onMismatch> </filter> - <file>${logDirectory}/Error.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <!--<file>${logDirectory}/Error.log</file> + <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> <fileNamePattern>${logDirectory}/Error-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip </fileNamePattern> <minIndex>1</minIndex> @@ -100,7 +100,7 @@ <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>500MB</maxFileSize> - </triggeringPolicy> + </triggeringPolicy> --> <encoder> <!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n"</pattern> --> <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern> @@ -209,10 +209,10 @@ <!-- logback jms appenders & loggers definition starts here --> <!-- logback jms appenders & loggers definition starts here --> <appender name="auditLogs" - class="ch.qos.logback.core.rolling.RollingFileAppender"> + class="ch.qos.logback.core.ConsoleAppender"> <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> </filter> - <file>${logDirectory}/Audit-${lrmRVer}-${lrmRO}-${Pid}.log</file> + <!-- <file>${logDirectory}/Audit-${lrmRVer}-${lrmRO}-${Pid}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> <fileNamePattern>${logDirectory}/Audit-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip </fileNamePattern> @@ -222,16 +222,16 @@ <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>500MB</maxFileSize> - </triggeringPolicy> + </triggeringPolicy> --> <encoder> <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern> </encoder> </appender> <appender name="perfLogs" - class="ch.qos.logback.core.rolling.RollingFileAppender"> + class="ch.qos.logback.core.ConsoleAppender"> <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> </filter> - <file>${logDirectory}/Perform-${lrmRVer}-${lrmRO}-${Pid}.log</file> + <!-- <file>${logDirectory}/Perform-${lrmRVer}-${lrmRO}-${Pid}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> <fileNamePattern>${logDirectory}/Perform-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip </fileNamePattern> @@ -241,7 +241,7 @@ <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>500MB</maxFileSize> - </triggeringPolicy> + </triggeringPolicy> --> <encoder> <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern> </encoder> @@ -289,12 +289,10 @@ </appender> <logger name="AuditRecord" level="INFO" additivity="FALSE"> - <appender-ref ref="ASYNC-audit" /> - <appender-ref ref="auditLogs" /> + <appender-ref ref="STDOUT" /> </logger> <logger name="AuditRecord_DirectCall" level="INFO" additivity="FALSE"> - <appender-ref ref="ASYNC-audit" /> - <appender-ref ref="auditLogs" /> + <appender-ref ref="STDOUT" /> </logger> <appender name="ASYNC-perf" class="ch.qos.logback.classic.AsyncAppender"> <queueSize>1000</queueSize> diff --git a/antBuild/build.xml b/antBuild/build.xml index e5ea26f..18ba18a 100644 --- a/antBuild/build.xml +++ b/antBuild/build.xml @@ -29,8 +29,7 @@ <!-- Windows Users may need to add a jvmarg arg to create a temp directory properly. --> <!-- <jvmarg value="-Djava.io.tmpdir=C:/yourTempDirectory"/> --> - <!-- Uncomment the following 2 jvmarg values to enable Remote Debugging. Please, see - http://wiki.web.att.com/display/ajsc/Debugging+with+the+AJSC+-Remote+Debugging+Setup + <!-- Uncomment the following 2 jvmarg values to enable Remote Debugging. for more information on how to setup Remote Debugger --> <!-- <jvmarg value="-Xdebug" /> --> <!-- <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5432" /> --> @@ -153,7 +152,7 @@ <!-- extApps directory MUST be created for ajsc-runner to run correctly, even if empty. DO NOT REMOVE!!! --> <!-- extApps directory created to deploy other war files on startup or hot deploy War files after ajsc - starts up. See http://wiki.web.att.com/display/ajsc/Multiple+War+Deployment+within+the+AJSC for more info --> + starts up. --> <mkdir dir="${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/extApps" /> <!-- Copying any extra wars to $AJSC_HOME/extApps to be deployed within @@ -164,8 +163,7 @@ <!-- staticContent folder is for serving static content within an ajsc service. Any static content to be served will be copyied to the ultimate $AJSC_HOME/staticContent folder and can be served with the att-static-content - camel component. Please, see http://wiki.web.att.com/display/ajsc/att-static-content for more information - on serving static content. --> + camel component. --> <!-- Uncomment the following snippet to copy items from staticContent folder to ultimate $AJSC_HOME/staticConent --> <!-- <copy toDir="${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/staticContent" diff --git a/bundleconfig-csi/README.txt b/bundleconfig-csi/README.txt index bfad489..f97fe73 100644 --- a/bundleconfig-csi/README.txt +++ b/bundleconfig-csi/README.txt @@ -1,5 +1,3 @@ The bundleconfig-csi directory contains the necessary configuration files to be included with your AJSC bundle when deploying to a CSI env. This file is NOT used during local development. For local development, all files are read from the bundleconfig-local -folder. - -For more information on these files, please goto wiki link: http://wiki.web.att.com/display/ajsc/Configuration+Opportunities+within+the+AJSC
\ No newline at end of file +folder.
\ No newline at end of file diff --git a/bundleconfig-csi/etc/appprops/AAFUserRoles.properties b/bundleconfig-csi/etc/appprops/AAFUserRoles.properties index 6f11f4e..fd9df83 100644 --- a/bundleconfig-csi/etc/appprops/AAFUserRoles.properties +++ b/bundleconfig-csi/etc/appprops/AAFUserRoles.properties @@ -22,7 +22,6 @@ #If using AAF for Role based authentication/authorization, define your routes/services which will utilize AAF. The AJSC will #read this file and protect the routes given with the AAF role defined. #For more information on AAF role based permissions, please contact AAF team. -#AAF wiki link: http://wiki.web.att.com/display/aaf/AAF+Documentation #The following example would protect the JAXRS echo example service provided with the archetype. #/services/${namespace}/v1/jaxrs-services/jaxrsExample/echo/*=com.att.ajsc.myper|mymachine|manage diff --git a/bundleconfig-csi/etc/appprops/PostProcessorInterceptors.properties b/bundleconfig-csi/etc/appprops/PostProcessorInterceptors.properties index 0e0c4d5..a39131c 100644 --- a/bundleconfig-csi/etc/appprops/PostProcessorInterceptors.properties +++ b/bundleconfig-csi/etc/appprops/PostProcessorInterceptors.properties @@ -19,7 +19,6 @@ # ECOMP is a trademark and service mark of AT&T Intellectual Property. # ############################################################################### -#This properties file is for defining any PostProcessorInterceptors that have been created for your AJSC service. For more -#information, please go to the wiki link: http://wiki.web.att.com/display/ajsc/AJSC+Interceptor+Framework +#This properties file is for defining any PostProcessorInterceptors that have been created for your AJSC service. /**=ajsc.beans.interceptors.CsiPostInterceptor diff --git a/bundleconfig-csi/etc/appprops/PreProcessorInterceptors.properties b/bundleconfig-csi/etc/appprops/PreProcessorInterceptors.properties index ed659ba..966bae8 100644 --- a/bundleconfig-csi/etc/appprops/PreProcessorInterceptors.properties +++ b/bundleconfig-csi/etc/appprops/PreProcessorInterceptors.properties @@ -19,7 +19,6 @@ # ECOMP is a trademark and service mark of AT&T Intellectual Property. # ############################################################################### -#This properties file is for defining any PreProcessorInterceptors that have been created for your AJSC service. For more -#information, please go to the wiki link: http://wiki.web.att.com/display/ajsc/AJSC+Interceptor+Framework +#This properties file is for defining any PreProcessorInterceptors that have been created for your AJSC service. /**=com.att.ajsc.csi.restmethodmap.RestMethodMapInterceptor,ajsc.beans.interceptors.CsiPreInterceptor diff --git a/bundleconfig-csi/etc/service-file-monitor.properties b/bundleconfig-csi/etc/service-file-monitor.properties index 8daa5c0..9596440 100644 --- a/bundleconfig-csi/etc/service-file-monitor.properties +++ b/bundleconfig-csi/etc/service-file-monitor.properties @@ -20,7 +20,6 @@ # ############################################################################### #This properties file is used for defining any file paths that you would like to have monitored. -#For more information, please goto wiki link: http://wiki.web.att.com/display/ajsc/Dynamic+Configuration+of+service+properties+running+within+AJSC+Container #user config file paths go here as (key-value) pairs. File extension will have to be either .properties or .json in order for it to be monitored. #file1=/opt/app/yourService/file.properties diff --git a/bundleconfig-csi/etc/sysprops/sys-props.properties b/bundleconfig-csi/etc/sysprops/sys-props.properties index 23679b6..11fc0f1 100644 --- a/bundleconfig-csi/etc/sysprops/sys-props.properties +++ b/bundleconfig-csi/etc/sysprops/sys-props.properties @@ -22,7 +22,6 @@ #This file is used for defining AJSC system properties for different configuration schemes and is necessary for the AJSC to run properly. #The sys-props.properties file is used for running locally. The template.sys-props.properties file will be used when deployed #to a SOA/CSI Cloud node. For more information, please goto wiki link: -#http://wiki.web.att.com/pages/viewpage.action?pageId=368909155 #AJSC System Properties. The following properties are required for ALL AJSC services. @@ -36,7 +35,6 @@ authN=authentication-scheme-2 ajscPersistence=file # If using hawtio for local development, these properties will allow for faster server startup and usage for local development -# See wiki for more info on hawtio: http://wiki.web.att.com/display/ajsc/Camel+Route+Debugging+with+AJSC+-+hawtio hawtio.authenticationEnabled=false hawtio.config.pullOnStartup=false diff --git a/bundleconfig-local/README.txt b/bundleconfig-local/README.txt index 6631ffb..a915213 100644 --- a/bundleconfig-local/README.txt +++ b/bundleconfig-local/README.txt @@ -4,8 +4,6 @@ directory. When deploying to a CSI env, the bundleconfig-csi directory will be c directory and will be used for your AJSC service once installed. If you are not deploying to a CSI env, please look at the antBuild/build.xml file for help in some simple copying of the appropriate folders/files for a NON-CSI env. -For more information on these files, please goto wiki link: http://wiki.web.att.com/display/ajsc/Configuration+Opportunities+within+the+AJSC - The ajsc-shared-config directory houses the shared configurations that will be used in CSI envs. This includes the logging functionality of the logback.xml and some csm related artifacts that may be necessary to use while running locally. When running locally, the system property, "AJSC_SHARED_CONFIG", will point to this location to utilize the logback.xml.
\ No newline at end of file diff --git a/bundleconfig-local/etc/appprops/AAFUserRoles.properties b/bundleconfig-local/etc/appprops/AAFUserRoles.properties index c5b2e68..c2edd1a 100644 --- a/bundleconfig-local/etc/appprops/AAFUserRoles.properties +++ b/bundleconfig-local/etc/appprops/AAFUserRoles.properties @@ -22,7 +22,6 @@ #If using AAF for Role based authentication/authorization, define your routes/services which will utilize AAF. The AJSC will #read this file and protect the routes given with the AAF role defined. #For more information on AAF role based permissions, please contact AAF team. -#AAF wiki link: http://wiki.web.att.com/display/aaf/AAF+Documentation #The following example would protect the JAXRS echo example service provided with the archetype. #/services/${namespace}/v1/jaxrsExample/topics/**=com.att.ajsc.myper|mymachine|manage diff --git a/bundleconfig-local/etc/appprops/PostProcessorInterceptors.properties b/bundleconfig-local/etc/appprops/PostProcessorInterceptors.properties index 0e0c4d5..a39131c 100644 --- a/bundleconfig-local/etc/appprops/PostProcessorInterceptors.properties +++ b/bundleconfig-local/etc/appprops/PostProcessorInterceptors.properties @@ -19,7 +19,6 @@ # ECOMP is a trademark and service mark of AT&T Intellectual Property. # ############################################################################### -#This properties file is for defining any PostProcessorInterceptors that have been created for your AJSC service. For more -#information, please go to the wiki link: http://wiki.web.att.com/display/ajsc/AJSC+Interceptor+Framework +#This properties file is for defining any PostProcessorInterceptors that have been created for your AJSC service. /**=ajsc.beans.interceptors.CsiPostInterceptor diff --git a/bundleconfig-local/etc/appprops/PreProcessorInterceptors.properties b/bundleconfig-local/etc/appprops/PreProcessorInterceptors.properties index fad72c9..8a72dfe 100644 --- a/bundleconfig-local/etc/appprops/PreProcessorInterceptors.properties +++ b/bundleconfig-local/etc/appprops/PreProcessorInterceptors.properties @@ -19,8 +19,7 @@ # ECOMP is a trademark and service mark of AT&T Intellectual Property. # ############################################################################### -#This properties file is for defining any PreProcessorInterceptors that have been created for your AJSC service. For more -#information, please go to the wiki link: http://wiki.web.att.com/display/ajsc/AJSC+Interceptor+Framework +#This properties file is for defining any PreProcessorInterceptors that have been created for your AJSC service. /**=com.att.ajsc.csi.restmethodmap.RestMethodMapInterceptor,ajsc.beans.interceptors.CsiPreInterceptor /v1/events/**=com.att.ajsc.csi.restmethodmap.RestMethodMapInterceptor,ajsc.beans.interceptors.CsiPreInterceptor,com.att.nsa.dmaap.util.ContentLengthInterceptor
\ No newline at end of file diff --git a/bundleconfig-local/etc/service-file-monitor.properties b/bundleconfig-local/etc/service-file-monitor.properties index 8daa5c0..9596440 100644 --- a/bundleconfig-local/etc/service-file-monitor.properties +++ b/bundleconfig-local/etc/service-file-monitor.properties @@ -20,7 +20,6 @@ # ############################################################################### #This properties file is used for defining any file paths that you would like to have monitored. -#For more information, please goto wiki link: http://wiki.web.att.com/display/ajsc/Dynamic+Configuration+of+service+properties+running+within+AJSC+Container #user config file paths go here as (key-value) pairs. File extension will have to be either .properties or .json in order for it to be monitored. #file1=/opt/app/yourService/file.properties diff --git a/bundleconfig-local/etc/sysprops/sys-props.properties b/bundleconfig-local/etc/sysprops/sys-props.properties index 957a4dd..3f89611 100644 --- a/bundleconfig-local/etc/sysprops/sys-props.properties +++ b/bundleconfig-local/etc/sysprops/sys-props.properties @@ -21,8 +21,7 @@ ############################################################################### #This file is used for defining AJSC system properties for different configuration schemes and is necessary for the AJSC to run properly. #The sys-props.properties file is used for running locally. The template.sys-props.properties file will be used when deployed -#to a SOA/CSI Cloud node. For more information, please goto wiki link: -#http://wiki.web.att.com/pages/viewpage.action?pageId=368909155 +#to a SOA/CSI Cloud node. For more information, #AJSC System Properties. The following properties are required for ALL AJSC services. If you are adding System Properties for your #particular service, please add them AFTER all AJSC related System Properties. @@ -37,7 +36,6 @@ authN=authentication-scheme-2 ajscPersistence=file # If using hawtio for local development, these properties will allow for faster server startup and usage for local development -# See wiki for more info on hawtio: http://wiki.web.att.com/display/ajsc/Camel+Route+Debugging+with+AJSC+-+hawtio hawtio.authenticationEnabled=false hawtio.config.pullOnStartup=false @@ -168,4 +166,4 @@ RESTLET_COMPONENT_REUSE_ADDRESS=true #100mb maxcontentlength=10000 msg_size_exceeds=Message size exceeds the default size. -forceAAF=false
\ No newline at end of file +forceAAF=false diff --git a/bundleconfig-local/etc/sysprops/template.sys-props.properties b/bundleconfig-local/etc/sysprops/template.sys-props.properties index 3ef53d3..8061bd4 100644 --- a/bundleconfig-local/etc/sysprops/template.sys-props.properties +++ b/bundleconfig-local/etc/sysprops/template.sys-props.properties @@ -22,7 +22,6 @@ #This file is used for defining AJSC system properties for different configuration schemes and is necessary for the AJSC to run properly. #The sys-props.properties file is used for running locally. The template.sys-props.properties file will be used when deployed #to a SOA/CSI Cloud node. Upon SOA cloud install, all of the "double underscore" variables will be replaced by SWM node variables. -#For more information, please goto wiki link: http://wiki.web.att.com/pages/viewpage.action?pageId=368909155 #For Cadi Authorization, use value="authentication-scheme-1" CadiAuthN=__AJSC_CADI_AUTHN__ @@ -38,7 +37,6 @@ logback.configurationFile=__LOGBACK_CONFIG_FILE__ # If using hawtio for local development, these properties will allow for faster server startup and usage for local development. # You may wish to deploy hawtio.war to dev/test environments to help debugging as well, but should not be used in PROD env. -# See wiki for more info on hawtio: http://wiki.web.att.com/display/ajsc/Camel+Route+Debugging+with+AJSC+-+hawtio hawtio.authenticationEnabled=__HAWTIO_AUTHENTICATION_ENABLED__ hawtio.config.pullOnStartup=__HAWTIO_CONFIG_PULLONSTARTUP__ @@ -249,7 +249,7 @@ <module.ajsc.namespace.name>dmaap</module.ajsc.namespace.name> <module.ajsc.namespace.version>v1</module.ajsc.namespace.version> - <ajscRuntimeVersion>3.0.1-oss</ajscRuntimeVersion> + <ajscRuntimeVersion>3.0.3-oss</ajscRuntimeVersion> <!-- This will be the Absolute Root of the Project and should contain NO Versioning --> @@ -311,8 +311,7 @@ so). If you have a startup failure related to a missing dme2 class not found exception, please contact the AJSC team for assistance. You can email support at ajsc-Support <DL-ajsc-Support@att.com>. For more information regarding - the usage of the AJSC service pom.xml and management of dependencies, please - goto wiki link:http://wiki.web.att.com/display/ajsc/pom.xml --> + the usage of the AJSC service pom.xml and management of dependencies, --> <dependencies> <!-- cmn-CommonDataModel dependency added to resolve build issue not finding @@ -344,7 +343,7 @@ <dependency> <groupId>org.onap.dmaap.messagerouter.msgrtr</groupId> <artifactId>msgrtr</artifactId> - <version>1.1.1</version> + <version>1.1.2</version> <exclusions> <exclusion> <groupId>org.slf4j</groupId> @@ -477,15 +476,9 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.att.aft</groupId> - <artifactId>dme2</artifactId> - <version>3.1.200</version> - <!-- <scope>provided</scope> --> - </dependency> - <dependency> <groupId>com.att.ajsc</groupId> <artifactId>ajsc-archetype-parent</artifactId> - <version>3.0.1-oss</version> + <version>3.0.3-oss</version> <type>pom</type> </dependency> @@ -617,13 +610,13 @@ <dependency> <groupId>com.att.ajsc</groupId> <artifactId>ajsc-runner</artifactId> - <version>3.0.1-oss</version> + <version>3.0.3-oss</version> <scope>runtime</scope> </dependency> <dependency> <groupId>com.att.ajsc</groupId> <artifactId>ajsc-core</artifactId> - <version>3.0.1-oss</version> + <version>3.0.3-oss</version> <scope>provided</scope> </dependency> </dependencies> 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" |