community/product-iots
1
0
Fork 0
mirror of https://repository.entgra.net/community/product-iots.git synced 2025-09-16 23:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing plugin installation issues and verifying virtual fire alarm.

Browse Source
This commit is contained in:
sinthuja 2017-03-15 23:29:15 +05:30
parent 50c4ee7039
commit 1dcbcaec2a
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/distribution/src/analytics/conf/tomcat/carbon/WEB-INF/web.xml
View File

@ -19,16 +19,6 @@
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd"> "http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app id="WebApp"> <web-app id="WebApp">
<security-constraint>
<display-name>Restrict access to carbon console</display-name>
<web-resource-collection>
<web-resource-name>Restricted Console UI</web-resource-name>
<url-pattern>/carbon/*</url-pattern>
</web-resource-collection>
<auth-constraint/>
</security-constraint>
<!-- OWASP CSRFGuard per-application configuration property file location--> <!-- OWASP CSRFGuard per-application configuration property file location-->
<context-param> <context-param>
<param-name>Owasp.CsrfGuard.Config</param-name> <param-name>Owasp.CsrfGuard.Config</param-name>

4
modules/distribution/src/assembly/bin.xml
View File

@ -676,6 +676,10 @@
<exclude>**/webapp-classloading-environments.xml</exclude> <exclude>**/webapp-classloading-environments.xml</exclude>
<exclude>**/tomcat/carbon/WEB-INF/web.xml</exclude> <exclude>**/tomcat/carbon/WEB-INF/web.xml</exclude>
<exclude>**/spark-udf-config.xml</exclude> <exclude>**/spark-udf-config.xml</exclude>
<exclude>**/security/cipher-text.properties</exclude>
<exclude>**/security/authenticators.xml</exclude>
<exclude>**/security/cipher-tool.properties</exclude>
<exclude>**/security/Owasp.CsrfGuard.Carbon.properties</exclude>
</excludes> </excludes>
</fileSet> </fileSet>

2
modules/distribution/src/core/conf/log4j.properties
View File

@ -82,7 +82,7 @@ log4j.logger.org.apache.spark.util.ClosureCleaner=ERROR
# The console appender is used to display general information at console # The console appender is used to display general information at console
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.apache.log4j.PatternLayout log4j.appender.CARBON_CONSOLE.layout=org.apache.log4j.PatternLayout
log4j.appender.CARBON_CONSOLE.layout.ConversionPattern=[%d{ISO8601}] [${logger.server.name}] %5p - %c{1} %m%n log4j.appender.CARBON_CONSOLE.layout.ConversionPattern=[%d{ISO8601}] [${logger.server.name}] %5p - {%c} %m%n
# LOGEVENT is set to be a LogEventAppender using a PatternLayout to send logs to LOGEVENT # LOGEVENT is set to be a LogEventAppender using a PatternLayout to send logs to LOGEVENT
log4j.appender.LOGEVENT=org.wso2.carbon.logging.service.appender.LogEventAppender log4j.appender.LOGEVENT=org.wso2.carbon.logging.service.appender.LogEventAppender

4
pom.xml
View File

@ -1576,8 +1576,8 @@
<!-- IoT Broker Dependencies --> <!-- IoT Broker Dependencies -->
<product.iot.broker.version>${product.iot.version}</product.iot.broker.version> <product.iot.broker.version>${product.iot.version}</product.iot.broker.version>
<andes.version>3.1.3</andes.version> <andes.version>3.1.12</andes.version>
<carbon.messaging.version>3.1.16</carbon.messaging.version> <carbon.messaging.version>3.1.17-SNAPSHOT</carbon.messaging.version>
<!-- Third Party Dependencies--> <!-- Third Party Dependencies-->
<spongycastle.version>1.51.0.0</spongycastle.version> <spongycastle.version>1.51.0.0</spongycastle.version>