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

Merge pull request #236 from GPrathap/master

Browse Source 
fixed: IOTS-204, IOTS-344
This commit is contained in:
Rasika Perera 2017-01-05 14:42:16 +05:30 committed by GitHub
commit c5d00adc43
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/analytics/distribution/src/repository/conf/carbon.xml
View File

@ -75,10 +75,8 @@
Ex : <Role>.*</Role> means this server can act any role Ex : <Role>.*</Role> means this server can act any role
--> -->
<ServerRoles> <ServerRoles>
<Role>${default.server.role}</Role>
<Role>${cep.server.role}</Role> <Role>${cep.server.role}</Role>
<Role>${das.server.role}</Role> <Role>${das.server.role}</Role>
<Role>${cdmf.platform.role}</Role>
<Role>${geodashboard.role}</Role> <Role>${geodashboard.role}</Role>
</ServerRoles> </ServerRoles>

6
modules/core/distribution/pom.xml
View File

@ -288,7 +288,7 @@
<!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" dest="${jardir}/shindig-common-${shindig.version}"> <!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" dest="${jardir}/shindig-common-${shindig.version}">
<patternset> <patternset>
<exclude name="**/shindig.properties" /> <exclude name="**/shindig.properties" />
d <exclude name="**/shindig.properties" /> <exclude name="**/shindig.properties" />
</patternset> </patternset>
</unzip> </unzip>
<copy file="src/repository/conf/shindig.properties" todir="${jardir}/shindig-common-${shindig.version}" /> <copy file="src/repository/conf/shindig.properties" todir="${jardir}/shindig-common-${shindig.version}" />
@ -299,10 +299,6 @@ d <exclude name="**/shindig.properties" /
</delete> </delete>
<copy file="src/repository/resources/shindig/index.jsp" todir="target/shindig" />--> <copy file="src/repository/resources/shindig/index.jsp" todir="target/shindig" />-->
<concat destfile="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/log4j.properties">
log4j.logger.net.sf.ehcache=ERROR
</concat>
<delete file="target/${project.artifactId}-${project.version}.zip" /> <delete file="target/${project.artifactId}-${project.version}.zip" />
<delete dir="${tempdir}" /> <delete dir="${tempdir}" />
</tasks> </tasks>

4
modules/core/distribution/src/repository/conf/carbon.xml
View File

@ -77,12 +77,8 @@
--> -->
<ServerRoles> <ServerRoles>
<Role>${default.server.role}</Role> <Role>${default.server.role}</Role>
<Role>${das.server.role}</Role>
<Role>${cep.server.role}</Role>
<Role>${cdmf.analytics.role}</Role> <Role>${cdmf.analytics.role}</Role>
<Role>IoTServer</Role>
<Role>CDMFPlatform</Role> <Role>CDMFPlatform</Role>
<Role>GeoDashboard</Role>
</ServerRoles> </ServerRoles>
<!-- uncommnet this line to subscribe to a bam instance automatically --> <!-- uncommnet this line to subscribe to a bam instance automatically -->

3
modules/core/distribution/src/repository/conf/log4j.properties
View File

@ -240,4 +240,5 @@ 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.spark.core.SparkScriptCAppDeployer=WARN
log4j.logger.org.wso2.carbon.analytics.eventsink.AnalyticsEventStoreDeployer=WARN log4j.logger.org.wso2.carbon.analytics.eventsink.AnalyticsEventStoreDeployer=WARN
log4j.logger.org.wso2.carbon.event.processor.core.EventProcessorDeployer=WARN log4j.logger.org.wso2.carbon.event.processor.core.EventProcessorDeployer=WARN
log4j.logger.org.wso2.carbon.core.services.util.CarbonAuthenticationUtil=WARN log4j.logger.org.wso2.carbon.core.services.util.CarbonAuthenticationUtil=WARN
log4j.logger.net.sf.ehcache=ERROR