Merge pull request #236 from GPrathap/master

fixed: IOTS-204, IOTS-344

modules/analytics/distribution/src/repository/conf/carbon.xml

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

modules/core/distribution/pom.xml

@@ -288,7 +288,7 @@
 								<!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" dest="${jardir}/shindig-common-${shindig.version}">
 									<patternset>
 										<exclude name="**/shindig.properties" />
-d                                        <exclude name="**/shindig.properties" />
+                                        <exclude name="**/shindig.properties" />
 									</patternset>
 								</unzip>
 								<copy file="src/repository/conf/shindig.properties" todir="${jardir}/shindig-common-${shindig.version}" />
@@ -299,10 +299,6 @@ d                                        <exclude name="**/shindig.properties" /
 								</delete>
 								<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 dir="${tempdir}" />
 							</tasks>

modules/core/distribution/src/repository/conf/carbon.xml

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

modules/core/distribution/src/repository/conf/log4j.properties

@@ -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.eventsink.AnalyticsEventStoreDeployer=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