ruwin
/
product-iots
forked from community/product-iots
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #142 from milanperera/apim

Browse Source 
Implemented API publishing to Synapse Gateway
application-manager-new
Milan Perera 9 years ago
parent e50ee7edad 870009915f
commit 70079b9035
8 changed files with 167 additions and 131 deletions
Show Stats Download Patch File Download Diff File

3
modules/distribution/src/api-resources/api_templates/velocity_template.xml
Unescape View File

@ -329,7 +329,6 @@
#end #end
</inSequence> </inSequence>
<outSequence> <outSequence>
<class name="org.wso2.carbon.apimgt.usage.publisher.APIMgtResponseHandler"/>
## check and set response caching ## check and set response caching
#if($responseCacheEnabled) #if($responseCacheEnabled)
<cache scope="per-host" collector="true"/> <cache scope="per-host" collector="true"/>
@ -343,6 +342,7 @@
#if($handlers.size() > 0) #if($handlers.size() > 0)
<handlers xmlns="http://ws.apache.org/ns/synapse"> <handlers xmlns="http://ws.apache.org/ns/synapse">
#foreach($handler in $handlers) #foreach($handler in $handlers)
#if($handler.className != 'org.wso2.carbon.apimgt.usage.publisher.APIMgtUsageHandler')
<handler xmlns="http://ws.apache.org/ns/synapse" class="$handler.className"> <handler xmlns="http://ws.apache.org/ns/synapse" class="$handler.className">
#if($handler.hasProperties()) #if($handler.hasProperties())
#set ($map = $handler.getProperties() ) #set ($map = $handler.getProperties() )
@ -352,6 +352,7 @@
#end #end
</handler> </handler>
#end #end
#end
</handlers> </handlers>
#end #end
#end #end

1
modules/distribution/src/api-resources/synapse-configs/default/sequences/fault.xml
Unescape View File

@ -58,7 +58,6 @@
<property name="HTTP_SC" value="500" scope="axis2"/> <property name="HTTP_SC" value="500" scope="axis2"/>
</else> </else>
</filter> </filter>
<class name="org.wso2.carbon.apimgt.usage.publisher.APIMgtFaultHandler"/>
<property name="RESPONSE" value="true"/> <property name="RESPONSE" value="true"/>
<header name="To" action="remove"/> <header name="To" action="remove"/>
<property name="NO_ENTITY_BODY" scope="axis2" action="remove"/> <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>

15
modules/distribution/src/assembly/bin.xml
Unescape View File

@ -510,6 +510,12 @@
<directory>src/api-resources/synapse-configs/default/sequences</directory> <directory>src/api-resources/synapse-configs/default/sequences</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/apim-synapse-config/</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/apim-synapse-config/</outputDirectory>
</fileSet> </fileSet>
<fileSet>
<directory>src/api-resources/synapse-configs/default/sequences</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/synapse-configs/default/sequences</outputDirectory>
</fileSet>
<fileSet> <fileSet>
<directory>src/api-resources/api_templates</directory> <directory>src/api-resources/api_templates</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/api_templates</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/api_templates</outputDirectory>
@ -1010,6 +1016,15 @@
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!-- Copying webapp-publisher-config.xml -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/webapp-publisher-config.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<!--cdm plugin config file--> <!--cdm plugin config file-->
<file> <file>
<source> <source>

6
modules/distribution/src/repository/conf/api-manager.xml
Unescape View File

@ -26,7 +26,7 @@
<DataSourceName>jdbc/WSO2AM_DB</DataSourceName> <DataSourceName>jdbc/WSO2AM_DB</DataSourceName>
<!-- This parameter is used when adding api management capability to other products like GReg, AS, DSS etc.--> <!-- This parameter is used when adding api management capability to other products like GReg, AS, DSS etc.-->
<GatewayType>None</GatewayType> <GatewayType>Synapse</GatewayType>
<!-- This parameter is used to enable the securevault support when try to publish endpoint secured APIs. Values should be "true" or "false". <!-- This parameter is used to enable the securevault support when try to publish endpoint secured APIs. Values should be "true" or "false".
By default secure vault is disabled.--> By default secure vault is disabled.-->
@ -310,12 +310,12 @@
-ThriftServerHost - Allows to configure a hostname for the thrift server. It uses the carbon hostname by default. -ThriftServerHost - Allows to configure a hostname for the thrift server. It uses the carbon hostname by default.
--> -->
<KeyValidatorClientType>ThriftClient</KeyValidatorClientType> <KeyValidatorClientType>WSClient</KeyValidatorClientType>
<ThriftClientPort>10397</ThriftClientPort> <ThriftClientPort>10397</ThriftClientPort>
<ThriftClientConnectionTimeOut>10000</ThriftClientConnectionTimeOut> <ThriftClientConnectionTimeOut>10000</ThriftClientConnectionTimeOut>
<ThriftServerPort>10397</ThriftServerPort> <ThriftServerPort>10397</ThriftServerPort>
<!--ThriftServerHost>localhost</ThriftServerHost--> <!--ThriftServerHost>localhost</ThriftServerHost-->
<EnableThriftServer>true</EnableThriftServer> <EnableThriftServer>false</EnableThriftServer>
<!-- <!--
Scope used for marking Application Tokens. If a token is generated with this scope, they will be treated as Application Access Tokens Scope used for marking Application Tokens. If a token is generated with this scope, they will be treated as Application Access Tokens

5
modules/distribution/src/repository/conf/cdm-config.xml
Unescape View File

@ -57,10 +57,5 @@
</Operation> </Operation>
</Operations> </Operations>
</TaskConfiguration> </TaskConfiguration>
<DTDeploymentConfiguration>
<!-- Hostname and port of Device Type Management node goes here -->
<DTHostAddress>localhost</DTHostAddress>
<DTHostPort>9443</DTHostPort>
</DTDeploymentConfiguration>
</DeviceMgtConfiguration> </DeviceMgtConfiguration>

4
modules/distribution/src/repository/conf/identity/identity.xml
Unescape View File

@ -130,7 +130,7 @@
</SupportedGrantType> </SupportedGrantType>
<SupportedGrantType> <SupportedGrantType>
<GrantTypeName>password</GrantTypeName> <GrantTypeName>password</GrantTypeName>
<GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.PasswordGrantHandler</GrantTypeHandlerImplClass> <GrantTypeHandlerImplClass>org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.ExtendedPasswordGrantHandler</GrantTypeHandlerImplClass>
</SupportedGrantType> </SupportedGrantType>
<SupportedGrantType> <SupportedGrantType>
<GrantTypeName>refresh_token</GrantTypeName> <GrantTypeName>refresh_token</GrantTypeName>
@ -157,7 +157,7 @@
<OAuthCallbackHandlers> <OAuthCallbackHandlers>
<OAuthCallbackHandler Class="org.wso2.carbon.device.mgt.oauth.extensions.handlers.DeviceMgtOAuthCallbackHandler"/> <OAuthCallbackHandler Class="org.wso2.carbon.device.mgt.oauth.extensions.handlers.DeviceMgtOAuthCallbackHandler"/>
</OAuthCallbackHandlers> </OAuthCallbackHandlers>
<OAuthScopeValidator class="org.wso2.carbon.device.mgt.oauth.extensions.validators.PermissionBasedScopeValidator"/> <OAuthScopeValidator class="org.wso2.carbon.device.mgt.oauth.extensions.validators.ExtendedJDBCScopeValidator"/>
<TokenValidators> <TokenValidators>
<TokenValidator type="bearer" class="org.wso2.carbon.identity.oauth2.validators.DefaultOAuth2TokenValidator"/> <TokenValidator type="bearer" class="org.wso2.carbon.identity.oauth2.validators.DefaultOAuth2TokenValidator"/>
</TokenValidators> </TokenValidators>

244
modules/distribution/src/repository/conf/log4j.properties
Unescape View File

@ -1,5 +1,5 @@
# #
# Copyright 2009 WSO2, Inc. (http://wso2.com) # Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -14,70 +14,64 @@
# limitations under the License. # limitations under the License.
# #
##
# This is the log4j configuration file used by WSO2 ESB
# =====================================================
# #
# This is the log4j configuration file used by WSO2 Carbon # IMPORTANT : Please do not remove or change the names of any of the Appenders defined here.
# # The layout pattern & log file can be changed using the WSO2 ESB Management Console, and those
# IMPORTANT : Please do not remove or change the names of any
# of the Appenders defined here. The layout pattern & log file
# can be changed using the WSO2 Carbon Management Console, and those
# settings will override the settings in this file. # settings will override the settings in this file.
# ##
##
# WSO2 ESB is now able to create per-service trace logs at runtime. Thus while a message
# is being processed through a Proxy service or the Synapse service (i.e. message mediation through
# the 'main' sequence), tracing may be turned 'on' at any Proxy, Sequence or Mediator level. This
# trace state 'flows' with the message - i.e from a trace enabled sequence to another sequence etc.
# and applies to all mediators within a trace enabled sequence etc. unless another sequence or
# mediator does not override and specify a different trace setting.
##
log4j.rootLogger=INFO, CARBON_CONSOLE, CARBON_LOGFILE, CARBON_MEMORY, CARBON_SYS_LOG # the root category is ERROR (applies for all 3rd party JARs etc) and will be logged to the
# LOG_APPENDER and the CONSOLE_APPENDER
log4j.rootLogger=ERROR, CARBON_CONSOLE, CARBON_LOGFILE, CARBON_MEMORY, CARBON_SYS_LOG, ERROR_LOGFILE
log4j.logger.AUDIT_LOG=INFO, AUDIT_LOGFILE log4j.logger.AUDIT_LOG=INFO, AUDIT_LOGFILE
log4j.logger.org.apache.axis2.wsdl.codegen.writer.PrettyPrinter=ERROR, CARBON_LOGFILE, CARBON_MEMORY
log4j.logger.org.apache.axis2.clustering=INFO, CARBON_CONSOLE, CARBON_LOGFILE log4j.category.org.apache.synapse=INFO
log4j.logger.org.apache=INFO, CARBON_LOGFILE, CARBON_MEMORY log4j.category.org.apache.synapse.transport=INFO
log4j.logger.org.apache.catalina=WARN log4j.category.org.apache.axis2=INFO
log4j.logger.org.apache.tomcat=WARN log4j.category.org.apache.axis2.transport=INFO
log4j.logger.org.wso2.carbon.apacheds=WARN
log4j.logger.org.apache.directory.server.ldap=ERROR
log4j.logger.org.apache.directory.server.core.event=WARN
log4j.logger.com.atomikos=INFO,ATOMIKOS log4j.logger.com.atomikos=INFO,ATOMIKOS
log4j.logger.org.quartz=WARN log4j.logger.org.quartz=WARN
log4j.logger.org.apache.jackrabbit.webdav=WARN log4j.logger.org.wso2=INFO
log4j.logger.org.apache.juddi=ERROR log4j.logger.org.wso2.carbon=INFO
log4j.logger.org.apache.commons.digester.Digester=WARN #log4j.category.org.apache.synapse.transport.nhttp.util=DEBUG
log4j.logger.org.apache.jasper.compiler.TldLocationsCache=WARN #log4j.category.org.apache.http.impl.nio.reactor=DEBUG
#log4j.logger.org.wso2.carbon.utils.deployment.ComponentBuilder=DEBUG
#log4j.logger.org.wso2.carbon.utils.deployment.OSGiBundleDeployer=DEBUG
log4j.logger.org.apache.catalina=WARN
log4j.logger.org.apache.coyote=WARN
log4j.logger.org.apache.axis2.enterprise=FATAL
log4j.logger.de.hunsicker.jalopy.io=FATAL
# uncomment the following logs to see HTTP headers and messages
#log4j.logger.org.apache.synapse.transport.http.headers=DEBUG
#log4j.logger.org.apache.synapse.transport.http.wire=DEBUG
#only WARN allowed for access loggers in http transport by default
log4j.logger.org.apache.synapse.transport.http.access=WARN
# uncomment the flowing entries to see HTTP headers and messages of Callout mediator/MessageProcessor
#log4j.logger.httpclient.wire.header=DEBUG
#log4j.logger.httpclient.wire.content=DEBUG
# qpid related logs for the message broker
log4j.logger.qpid=WARN
log4j.logger.org.apache.qpid=WARN log4j.logger.org.apache.qpid=WARN
log4j.logger.org.apache.qpid.server.Main=INFO log4j.logger.org.apache.qpid.server.Main=INFO
log4j.logger.qpid.message=WARN log4j.logger.qpid.message=WARN
log4j.logger.qpid.message.broker.listening=INFO log4j.logger.qpid.message.broker.listening=INFO
log4j.logger.org.apache.tiles=WARN
log4j.logger.org.apache.commons.httpclient=ERROR
log4j.logger.org.apache.coyote=WARN
log4j.logger.org.apache.solr=ERROR
log4j.logger.me.prettyprint.cassandra.hector.TimingLogger=ERROR
log4j.logger.org.wso2=INFO
log4j.logger.JAGGERY.config=OFF
log4j.logger.org.apache.axis2.enterprise=FATAL, CARBON_LOGFILE, CARBON_MEMORY
log4j.logger.org.opensaml.xml=WARN, CARBON_LOGFILE, CARBON_MEMORY
log4j.logger.org.apache.directory.shared.ldap=WARN, CARBON_LOGFILE, CARBON_MEMORY
log4j.logger.org.apache.directory.server.ldap.handlers=WARN, CARBON_LOGFILE, CARBON_MEMORY
#Following are to remove false error messages from startup (IS)
log4j.logger.org.apache.directory.shared.ldap.entry.DefaultServerAttribute=FATAL, CARBON_LOGFILE, CARBON_MEMORY
log4j.logger.org.apache.directory.server.core.DefaultDirectoryService=ERROR, CARBON_LOGFILE, CARBON_MEMORY
log4j.logger.org.apache.directory.shared.ldap.ldif.LdifReader=ERROR, CARBON_LOGFILE, CARBON_MEMORY
log4j.logger.org.apache.directory.server.ldap.LdapProtocolHandler=ERROR, CARBON_LOGFILE, CARBON_MEMORY
log4j.logger.org.apache.directory.server.core=ERROR, CARBON_LOGFILE, CARBON_MEMORY
log4j.logger.org.apache.directory.server.ldap.LdapSession=ERROR, CARBON_LOGFILE, CARBON_MEMORY
#Hive Related Log configurations
log4j.logger.DataNucleus=ERROR
log4j.logger.JAGGERY.config=OFF
log4j.logger.Datastore=ERROR
log4j.logger.Datastore.Schema=ERROR
log4j.logger.JPOX.Datastore=ERROR
log4j.logger.JPOX.Plugin=ERROR
log4j.logger.JPOX.MetaData=ERROR
log4j.logger.JPOX.Query=ERROR
log4j.logger.JPOX.General=ERROR
log4j.logger.JPOX.Enhancer=ERROR
log4j.logger.org.apache.hadoop.hive=WARN
log4j.logger.hive=WARN
log4j.logger.ExecMapper=WARN
log4j.logger.ExecReducer=WARN
log4j.logger.net.sf.ehcache.config.ConfigurationFactory=ERROR
#spark log components #spark log components
log4j.logger.org.apache.spark=WARN log4j.logger.org.apache.spark=WARN
@ -85,34 +79,47 @@ log4j.logger.org.spark-project=WARN
log4j.logger.akka=WARN log4j.logger.akka=WARN
log4j.logger.org.apache.spark.util.ClosureCleaner=ERROR log4j.logger.org.apache.spark.util.ClosureCleaner=ERROR
log4j.logger.trace.messages=TRACE,CARBON_TRACE_LOGFILE # The console appender is used to display general information at console
log4j.logger.JAGGERY.config=OFF
log4j.additivity.org.apache.axis2.clustering=false
log4j.additivity.com.atomikos=false
log4j.additivity.org.apache=false
# Suppresses spring-related unnecessary INFO logs
log4j.logger.org.springframework.beans.factory.support=ERROR
log4j.logger.org.springframework.beans.factory.xml=ERROR
log4j.logger.org.springframework.web.context.support=ERROR
# CARBON_CONSOLE is set to be a ConsoleAppender using a PatternLayout.
log4j.appender.CARBON_CONSOLE=org.wso2.carbon.utils.logging.appenders.CarbonConsoleAppender log4j.appender.CARBON_CONSOLE=org.wso2.carbon.utils.logging.appenders.CarbonConsoleAppender
log4j.appender.CARBON_CONSOLE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout log4j.appender.CARBON_CONSOLE.layout=org.apache.log4j.PatternLayout
# ConversionPattern will be overridden by the configuration setting in the DB log4j.appender.CARBON_CONSOLE.layout.ConversionPattern=[%d{ISO8601}] %5p - %c{1} %m%n
log4j.appender.CARBON_CONSOLE.layout.ConversionPattern=[%d] %P%5p {%c} - %x %m%n
log4j.appender.CARBON_CONSOLE.layout.TenantPattern=%U%@%D[%T] # LOGEVENT is set to be a LogEventAppender using a PatternLayout to send logs to LOGEVENT
log4j.appender.CARBON_CONSOLE.threshold=DEBUG log4j.appender.LOGEVENT=org.wso2.carbon.logging.service.appender.LogEventAppender
log4j.appender.LOGEVENT.url=tcp://localhost:7611
# CARBON_MEMORY is set to be a MemoryAppender using a PatternLayout. log4j.appender.LOGEVENT.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout
log4j.appender.CARBON_MEMORY=org.wso2.carbon.utils.logging.appenders.MemoryAppender log4j.appender.LOGEVENT.columnList=%T,%S,%A,%d,%c,%p,%m,%I,%Stacktrace
log4j.appender.CARBON_MEMORY.layout=org.apache.log4j.PatternLayout log4j.appender.LOGEVENT.userName=admin
log4j.appender.CARBON_MEMORY.bufferSize=200 log4j.appender.LOGEVENT.password=admin
# ConversionPattern will be overridden by the configuration setting in the DB log4j.appender.LOGEVENT.processingLimit=1000
#log4j.appender.CARBON_MEMORY.layout.ConversionPattern=[%d] %5p - %x %m {%c}%n log4j.appender.LOGEVENT.maxTolerableConsecutiveFailure=20
log4j.appender.CARBON_MEMORY.layout.ConversionPattern=[%d] %5p {%c} - %x %m %n
log4j.appender.CARBON_MEMORY.threshold=DEBUG # Configure the service logger at INFO level. Writes only run-time/mediation-time audit messages
log4j.category.SERVICE_LOGGER=INFO, SERVICE_APPENDER
log4j.additivity.SERVICE_LOGGER=false
log4j.appender.SERVICE_APPENDER=org.apache.log4j.RollingFileAppender
log4j.appender.SERVICE_APPENDER.File=${carbon.home}/repository/logs/${instance.log}/wso2-esb-service${instance.log}.log
log4j.appender.SERVICE_APPENDER.MaxFileSize=1000KB
log4j.appender.SERVICE_APPENDER.MaxBackupIndex=10
log4j.appender.SERVICE_APPENDER.layout=org.apache.log4j.PatternLayout
log4j.appender.SERVICE_APPENDER.layout.ConversionPattern=%d{ISO8601} [%X{ip}-%X{host}] [%t] %5p %c{1} %m%n
# The trace logger dumps enough information @INFO level, but maybe pushed upto TRACE.
# Writes only run-time/mediation time tracing/debug messages for messages passing through trace
# enabled sequences, mediators and services. Enabling tracing on these has a performance impact
log4j.category.TRACE_LOGGER=INFO, TRACE_APPENDER, TRACE_MEMORYAPPENDER
log4j.additivity.TRACE_LOGGER=false
log4j.appender.TRACE_APPENDER=org.apache.log4j.DailyRollingFileAppender
log4j.appender.TRACE_APPENDER.File=${carbon.home}/repository/logs/${instance.log}/wso2-esb-trace${instance.log}.log
log4j.appender.TRACE_APPENDER.Append=true
log4j.appender.TRACE_APPENDER.layout=org.apache.log4j.PatternLayout
log4j.appender.TRACE_APPENDER.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%X{ip}-%X{host}] [%t] %5p %c{1} %m%n
# The memory appender for trace logger
log4j.appender.TRACE_MEMORYAPPENDER=org.wso2.carbon.utils.logging.appenders.MemoryAppender
log4j.appender.TRACE_MEMORYAPPENDER.bufferSize=2000
log4j.appender.TRACE_MEMORYAPPENDER.layout=org.apache.log4j.PatternLayout
log4j.appender.TRACE_MEMORYAPPENDER.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%X{ip}-%X{host}] [%t] %5p %m%n
# CARBON_LOGFILE is set to be a DailyRollingFileAppender using a PatternLayout. # CARBON_LOGFILE is set to be a DailyRollingFileAppender using a PatternLayout.
log4j.appender.CARBON_LOGFILE=org.wso2.carbon.utils.logging.appenders.CarbonDailyRollingFileAppender log4j.appender.CARBON_LOGFILE=org.wso2.carbon.utils.logging.appenders.CarbonDailyRollingFileAppender
@ -122,60 +129,69 @@ log4j.appender.CARBON_LOGFILE.File=${carbon.home}/repository/logs/${instance.log
log4j.appender.CARBON_LOGFILE.Append=true log4j.appender.CARBON_LOGFILE.Append=true
log4j.appender.CARBON_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout log4j.appender.CARBON_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout
# ConversionPattern will be overridden by the configuration setting in the DB # ConversionPattern will be overridden by the configuration setting in the DB
log4j.appender.CARBON_LOGFILE.layout.ConversionPattern=TID: [%T] [%S] [%d] %P%5p {%c} - %x %m %n log4j.appender.CARBON_LOGFILE.layout.ConversionPattern=TID: [%T] [%S] [%d] %P%5p {%c} - %x %m {%c}%n
log4j.appender.CARBON_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S] log4j.appender.CARBON_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S]
log4j.appender.CARBON_LOGFILE.threshold=DEBUG log4j.appender.CARBON_LOGFILE.threshold=DEBUG
# The standard error log where all the warnings, errors and fatal errors will be logged
log4j.appender.ERROR_LOGFILE=org.apache.log4j.FileAppender
log4j.appender.ERROR_LOGFILE.File=${carbon.home}/repository/logs/${instance.log}/wso2-esb-errors.log
log4j.appender.ERROR_LOGFILE.layout=org.apache.log4j.PatternLayout
log4j.appender.ERROR_LOGFILE.layout.ConversionPattern=%d{ISO8601} [%X{ip}-%X{host}] [%t] %5p %c{1} %m%n
log4j.appender.ERROR_LOGFILE.threshold=WARN
# The memory appender for logging
log4j.appender.CARBON_MEMORY=org.wso2.carbon.logging.service.appender.CarbonMemoryAppender
log4j.appender.CARBON_MEMORY.bufferSize=2000
log4j.appender.CARBON_MEMORY.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout
# ConversionPattern will be overridden by the configuration setting in the DB
log4j.appender.CARBON_MEMORY.layout.ConversionPattern=TID: [%T] [%S] [%d] %P%5p {%c} - %x %m {%c}%n
log4j.appender.CARBON_MEMORY.layout.TenantPattern=%U%@%D [%T] [%S]
log4j.appender.CARBON_MEMORY.columnList=%T,%S,%A,%d,%c,%p,%m,%H,%I,%Stacktrace
log4j.appender.CARBON_MEMORY.threshold=DEBUG
log4j.appender.CARBON_SYS_LOG = org.apache.log4j.net.SyslogAppender log4j.appender.CARBON_SYS_LOG = org.apache.log4j.net.SyslogAppender
log4j.appender.CARBON_SYS_LOG.layout=org.apache.log4j.PatternLayout log4j.appender.CARBON_SYS_LOG.layout=org.apache.log4j.PatternLayout
log4j.appender.CARBON_SYS_LOG.layout.ConversionPattern=[%d] %5p {%c} - %x %m %n log4j.appender.CARBON_SYS_LOG.layout.ConversionPattern=[%d] %5p - %x %m {%c}%n
log4j.appender.CARBON_SYS_LOG.SyslogHost=localhost log4j.appender.CARBON_SYS_LOG.SyslogHost=localhost
log4j.appender.CARBON_SYS_LOG.Facility=USER log4j.appender.CARBON_SYS_LOG.Facility=USER
log4j.appender.CARBON_SYS_LOG.threshold=DEBUG log4j.appender.CARBON_SYS_LOG.threshold=DEBUG
# LOGEVENT is set to be a LogEventAppender using a PatternLayout to send logs to LOGEVENT log4j.logger.org.apache.directory.shared.ldap=WARN, CARBON_CONSOLE
log4j.appender.LOGEVENT=org.wso2.carbon.logging.service.appender.LogEventAppender log4j.logger.org.apache.directory.server.ldap.handlers=WARN, CARBON_CONSOLE
log4j.appender.LOGEVENT.url=tcp://10.100.3.103:7611 log4j.logger.org.apache.directory.shared.ldap.entry.DefaultServerAttribute=FATAL, CARBON_CONSOLE
log4j.appender.LOGEVENT.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout log4j.logger.org.apache.directory.shared.ldap.ldif.LdifReader=ERROR, CARBON_CONSOLE
log4j.appender.LOGEVENT.columnList=%T,%S,%A,%d,%c,%p,%m,%H,%I,%Stacktrace log4j.logger.org.apache.directory.server.ldap.LdapProtocolHandler=ERROR, CARBON_CONSOLE
log4j.appender.LOGEVENT.userName=admin
log4j.appender.LOGEVENT.password=admin ## Trace Logger configuration which will append to a XMPP chatroom or JID ##
#log4j.appender.LOGEVENT.password=secretAlias:Log4j.Appender.LOGEVENT.Password #log4j.appender.XMPP_APPENDER=org.wso2.carbon.utils.logging.IMAppender
#log4j.appender.XMPP_APPENDER.host=jabber.org
# Appender config to CARBON_TRACE_LOGFILE #log4j.appender.XMPP_APPENDER.username=wso2esb
log4j.appender.CARBON_TRACE_LOGFILE=org.apache.log4j.DailyRollingFileAppender #log4j.appender.XMPP_APPENDER.password=wso2esb
log4j.appender.CARBON_TRACE_LOGFILE.File=${carbon.home}/repository/logs/${instance.log}/wso2carbon-trace-messages${instance.log}.log #log4j.appender.XMPP_APPENDER.recipient=ruwan@jabber.org
log4j.appender.CARBON_TRACE_LOGFILE.Append=true #log4j.appender.XMPP_APPENDER.layout=org.apache.log4j.PatternLayout
log4j.appender.CARBON_TRACE_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout #log4j.appender.XMPP_APPENDER.layout.ConversionPattern=[%X{host}] [%t] %-5p [%d{HH:mm:ss,SSS}] %C{1} - %m%n
log4j.appender.CARBON_TRACE_LOGFILE.layout.ConversionPattern=[%d] %P%5p {%c} - %x %m %n
log4j.appender.CARBON_TRACE_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S]
log4j.appender.CARBON_TRACE_LOGFILE.threshold=TRACE
log4j.additivity.trace.messages=false
# Appender config to AUDIT_LOGFILE # Appender config to AUDIT_LOGFILE
log4j.appender.AUDIT_LOGFILE=org.wso2.carbon.utils.logging.appenders.CarbonDailyRollingFileAppender log4j.appender.AUDIT_LOGFILE=org.apache.log4j.DailyRollingFileAppender
log4j.appender.AUDIT_LOGFILE.File=${carbon.home}/repository/logs/audit.log log4j.appender.AUDIT_LOGFILE.File=${carbon.home}/repository/logs/audit.log
log4j.appender.AUDIT_LOGFILE.Append=true log4j.appender.AUDIT_LOGFILE.Append=true
log4j.appender.AUDIT_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout log4j.appender.AUDIT_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout
log4j.appender.AUDIT_LOGFILE.layout.ConversionPattern=[%d] %P%5p {%c}- %x %m %n log4j.appender.AUDIT_LOGFILE.layout.ConversionPattern=[%d] %P%5p - %x %m %n
log4j.appender.AUDIT_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S] log4j.appender.AUDIT_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S]
log4j.appender.AUDIT_LOGFILE.threshold=INFO log4j.appender.AUDIT_LOGFILE.threshold=INFO
log4j.additivity.AUDIT_LOG=false log4j.additivity.AUDIT_LOG=false
# Appender config to send Atomikos transaction logs to new log file tm.out. # Appender config to send Atomikos transaction logs to new log file tm.out.
log4j.appender.ATOMIKOS = org.apache.log4j.RollingFileAppender log4j.appender.ATOMIKOS = org.apache.log4j.RollingFileAppender
log4j.appender.ATOMIKOS.File = repository/logs/tm.out log4j.appender.ATOMIKOS.File = repository/logs/tm.out
log4j.appender.ATOMIKOS.Append = true log4j.appender.ATOMIKOS.Append = true
log4j.appender.ATOMIKOS.layout = org.apache.log4j.PatternLayout log4j.appender.ATOMIKOS.layout = org.apache.log4j.PatternLayout
log4j.appender.ATOMIKOS.layout.ConversionPattern=%p %t %c - %m%n log4j.appender.ATOMIKOS.layout.ConversionPattern=%p %t %c - %m%n
log4j.additivity.com.atomikos=false
# This file is used to override the default logger settings, and is used to remove unwanted logs from Shindig appearing on the console.
# Specification of Handler used by Console Logger
handlers=java.util.logging.ConsoleHandler
# Replacing default INFO level with SEVERE
java.util.logging.ConsoleHandler.level=SEVERE
#andes specific #andes specific
log4j.logger.org.wso2.andes.server.handler.ConnectionStartOkMethodHandler=WARN log4j.logger.org.wso2.andes.server.handler.ConnectionStartOkMethodHandler=WARN
@ -214,3 +230,13 @@ log4j.appender.EVENT_TRACE_MEMORYAPPENDER=org.wso2.carbon.utils.logging.appender
log4j.appender.EVENT_TRACE_MEMORYAPPENDER.bufferSize=2000 log4j.appender.EVENT_TRACE_MEMORYAPPENDER.bufferSize=2000
log4j.appender.EVENT_TRACE_MEMORYAPPENDER.layout=org.apache.log4j.PatternLayout log4j.appender.EVENT_TRACE_MEMORYAPPENDER.layout=org.apache.log4j.PatternLayout
log4j.appender.EVENT_TRACE_MEMORYAPPENDER.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%X{ip}-%X{host}] [%t] %5p %m%n log4j.appender.EVENT_TRACE_MEMORYAPPENDER.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%X{ip}-%X{host}] [%t] %5p %m%n
# Changing events specific info logs to warn
log4j.logger.org.wso2.carbon.application.deployer.internal.ApplicationManager=WARN
log4j.logger.org.wso2.carbon.event.stream.core.EventStreamDeployer=WARN
log4j.logger.org.wso2.carbon.event.input.adapter.core.internal.InputAdapterRuntime=WARN
log4j.logger.org.wso2.carbon.event.stream.core.internal.EventJunction=WARN
log4j.logger.org.wso2.carbon.event.receiver.core.EventReceiverDeployer=WARN
log4j.logger.org.wso2.carbon.analytics.spark.core.SparkScriptCAppDeployer=WARN
log4j.logger.org.wso2.carbon.analytics.eventsink.AnalyticsEventStoreDeployer=WARN
log4j.logger.org.wso2.carbon.event.processor.core.EventProcessorDeployer=WARN

2
pom.xml
Unescape View File

@ -1127,7 +1127,7 @@
<carbon.device.mgt.plugin.version>2.1.0-SNAPSHOT</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>2.1.0-SNAPSHOT</carbon.device.mgt.plugin.version>
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>5.0.3</carbon.api.mgt.version> <carbon.api.mgt.version>5.0.4</carbon.api.mgt.version>
<!-- Carbon Mediation --> <!-- Carbon Mediation -->
<carbon.mediation.version>4.5.1</carbon.mediation.version> <carbon.mediation.version>4.5.1</carbon.mediation.version>

Write Preview
Loading…
Cancel
Save