Merge pull request #1798 from rasika/master

Enable compression in catalina-server.xml

modules/distribution/src/assembly/bin.xml

@@ -715,7 +715,6 @@
                 <exclude>**/LICENSE.txt</exclude>
                 <exclude>**/release-notes.html</exclude>
                 <exclude>**/webapp-mode/WEB-INF/web.xml</exclude>
-                <exclude>**/tomcat/catalina-server.xml</exclude>
             </excludes>
         </fileSet>
 
@@ -1012,7 +1011,6 @@
                 <exclude>**/LICENSE.txt</exclude>
                 <exclude>**/release-notes.html</exclude>
                 <exclude>**/dbscripts</exclude>
-                <exclude>**/tomcat/catalina-server.xml</exclude>
             </excludes>
         </fileSet>
 
@@ -1260,18 +1258,6 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <file>
-            <source>src/core/conf/tomcat/catalina-server.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/conf/tomcat</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
-        <file>
-            <source>src/core/conf/tomcat/catalina-server.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/broker/conf/tomcat</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
         <!-- Copying synapse-handlers.xml file -->
         <file>
             <source>src/core/conf/synapse-handlers.xml</source>

modules/distribution/src/core/conf/tomcat/catalina-server.xml

@@ -38,7 +38,7 @@
                    maxKeepAliveRequests="200"
                    acceptCount="200"
                    server="WSO2 Carbon Server"
-                   compression="off"
+                   compression="on"
                    compressionMinSize="2048"
                    noCompressionUserAgents="gozilla, traviata"
                    compressableMimeType="text/html,text/javascript,application/x-javascript,application/javascript,application/xml,text/css,application/xslt+xml,text/xsl,image/gif,image/jpg,image/jpeg"
@@ -65,7 +65,7 @@
                    acceptCount="200"
                    server="WSO2 Carbon Server"
                    clientAuth="want"
-                   compression="off"
+                   compression="on"
                    scheme="https"
                    secure="true"
                    SSLEnabled="true"