You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2015/05/19 09:55:20 UTC

[3/4] stratos git commit: xml format modules/distribution/pom.xml and modules/distribution/src/assembly/bin.xml

xml format modules/distribution/pom.xml and modules/distribution/src/assembly/bin.xml


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a7c7dd80
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a7c7dd80
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a7c7dd80

Branch: refs/heads/master
Commit: a7c7dd800211e1b148f8035e1d46c7b6eb5fba29
Parents: 5bc41d1
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue May 19 12:49:06 2015 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Tue May 19 12:49:21 2015 +0530

----------------------------------------------------------------------
 products/stratos/modules/distribution/pom.xml   |  73 +--
 .../modules/distribution/src/assembly/bin.xml   | 553 +++++++++----------
 2 files changed, 267 insertions(+), 359 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/a7c7dd80/products/stratos/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/pom.xml b/products/stratos/modules/distribution/pom.xml
index fbbdb51..5465903 100755
--- a/products/stratos/modules/distribution/pom.xml
+++ b/products/stratos/modules/distribution/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Licensed to the Apache Software Foundation (ASF) under one
   ~ or more contributor license agreements.  See the NOTICE file
@@ -16,22 +17,18 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos</artifactId>
         <version>4.1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apache-stratos</artifactId>
     <packaging>jar</packaging>
     <name>Apache Stratos - Distribution</name>
     <description>Apache Stratos Manager Distribution</description>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.rampart</groupId>
@@ -94,7 +91,6 @@
             <version>${carbon.kernel.version}</version>
             <type>zip</type>
         </dependency>
-
         <!-- Synapse dependencies -->
         <!--dependency>
             <groupId>org.apache.synapse</groupId>
@@ -126,7 +122,6 @@
             <artifactId>synapse-extensions</artifactId>
             <version>${synapse.version}</version>
         </dependency-->
-
         <!-- Carbon mediation initializer -->
         <dependency>
             <groupId>org.wso2.carbon</groupId>
@@ -143,8 +138,6 @@
             <artifactId>org.wso2.carbon.mediation.dependency.mgt</artifactId>
             <version>${carbon.version}</version>
         </dependency>
-
-
         <!-- ### Required Carbon components ### -->
         <!-- Transport managament components -->
         <dependency>
@@ -204,21 +197,18 @@
             <artifactId>org.wso2.carbon.mediator.command.services</artifactId>
             <version>${carbon.version}</version>
         </dependency>
-
         <!--Entitlement mediator dependency -->
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.identity.entitlement.mediator</artifactId>
             <version>${carbon.version}</version>
         </dependency>
-
         <!--OAuth mediator dependency -->
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.identity.oauth.mediator</artifactId>
             <version>${carbon.version}</version>
         </dependency>
-
         <!--Drools dependency-->
         <dependency>
             <groupId>org.drools.wso2</groupId>
@@ -291,19 +281,16 @@
             <artifactId>rampart-policy</artifactId>
             <version>1.6.1.wso2v1</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.rampart.wso2</groupId>
             <artifactId>rampart-trust</artifactId>
             <version>1.6.1.wso2v1</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.rampart.wso2</groupId>
             <artifactId>rampart-core</artifactId>
             <version>1.6.1.wso2v1</version>
         </dependency>
-
         <!-- Policy Editor component -->
         <dependency>
             <groupId>org.wso2.carbon</groupId>
@@ -362,7 +349,6 @@
             <artifactId>org.wso2.carbon.rm</artifactId>
             <version>${carbon.version}</version>
         </dependency>
-
         <!-- Menus -->
         <dependency>
             <groupId>org.wso2.carbon</groupId>
@@ -446,20 +432,17 @@
             <artifactId>bcprov-jdk15</artifactId>
             <version>132</version>
         </dependency>
-
         <!-- autoscale components -->
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.mediator.autoscale</artifactId>
             <version>4.0.3</version>
         </dependency>
-
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.discovery.core</artifactId>
             <version>${carbon.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.relay</artifactId>
@@ -502,7 +485,6 @@
             <version>4.2.0-stratos</version>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -560,7 +542,6 @@
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
@@ -573,38 +554,24 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy
-                                        todir="target/wso2carbon-core-4.2.0/dbscripts/identity"
-                                        overwrite="false">
-                                    <fileset
-                                            dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-4.2.0/dbscripts/identity/">
-                                    </fileset>
+                                <copy todir="target/wso2carbon-core-4.2.0/dbscripts/identity" overwrite="false">
+                                    <fileset dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-4.2.0/dbscripts/identity/" />
                                 </copy>
                                 <path id="h2.classpath">
-                                    <path refid="maven.compile.classpath"/>
+                                    <path refid="maven.compile.classpath" />
                                 </path>
-                                <echo message="########### Adding identity , identity/application-mgt tables to WSO2Carbon DB ##############"/>
-                                <sql
-                                        driver="org.h2.Driver"
-                                        url="jdbc:h2:${basedir}/target/wso2carbon-core-4.2.0/repository/database//WSO2CARBON_DB"
-                                        userid="wso2carbon" password="wso2carbon" autocommit="true"
-                                        onerror="continue">
+                                <echo message="########### Adding identity , identity/application-mgt tables to WSO2Carbon DB ##############" />
+                                <sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/target/wso2carbon-core-4.2.0/repository/database//WSO2CARBON_DB" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
                                     <classpath>
-                                        <path refid="h2.classpath"/>
+                                        <path refid="h2.classpath" />
                                     </classpath>
-                                    <fileset
-                                            file="target/wso2carbon-core-4.2.0/dbscripts/identity/application-mgt/h2.sql"/>
+                                    <fileset file="target/wso2carbon-core-4.2.0/dbscripts/identity/application-mgt/h2.sql" />
                                 </sql>
-                                <sql
-                                        driver="org.h2.Driver"
-                                        url="jdbc:h2:${basedir}/target/wso2carbon-core-4.2.0/repository/database/WSO2CARBON_DB"
-                                        userid="wso2carbon" password="wso2carbon" autocommit="true"
-                                        onerror="continue">
+                                <sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/target/wso2carbon-core-4.2.0/repository/database/WSO2CARBON_DB" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
                                     <classpath>
-                                        <path refid="h2.classpath"/>
+                                        <path refid="h2.classpath" />
                                     </classpath>
-                                    <fileset
-                                            file="target/wso2carbon-core-4.2.0/dbscripts/identity/h2.sql"/>
+                                    <fileset file="target/wso2carbon-core-4.2.0/dbscripts/identity/h2.sql" />
                                 </sql>
                             </tasks>
                         </configuration>
@@ -614,14 +581,14 @@
                         <phase>install</phase>
                         <configuration>
                             <tasks>
-                                <delete dir="target/archive-tmp"/>
-                                <delete dir="target/dependency-maven-plugin-markers"/>
-                                <delete dir="target/maven-archiver"/>
-                                <delete dir="target/wso2carbon-core-${carbon.kernel.version}"/>
-                                <delete dir="target/shopping-cart-global-${shoppingcart.global.version}"/>
-                                <delete file="target/${project.artifactId}-${project.version}.jar"/>
-                                <delete dir="target/sources"/>
-                                <delete dir="target/database"/>
+                                <delete dir="target/archive-tmp" />
+                                <delete dir="target/dependency-maven-plugin-markers" />
+                                <delete dir="target/maven-archiver" />
+                                <delete dir="target/wso2carbon-core-${carbon.kernel.version}" />
+                                <delete dir="target/shopping-cart-global-${shoppingcart.global.version}" />
+                                <delete file="target/${project.artifactId}-${project.version}.jar" />
+                                <delete dir="target/sources" />
+                                <delete dir="target/database" />
                             </tasks>
                         </configuration>
                         <goals>

http://git-wip-us.apache.org/repos/asf/stratos/blob/a7c7dd80/products/stratos/modules/distribution/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/assembly/bin.xml b/products/stratos/modules/distribution/src/assembly/bin.xml
index 22df548..3a53653 100755
--- a/products/stratos/modules/distribution/src/assembly/bin.xml
+++ b/products/stratos/modules/distribution/src/assembly/bin.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Licensed to the Apache Software Foundation (ASF) under one
   ~ or more contributor license agreements.  See the NOTICE file
@@ -22,14 +23,13 @@
         <format>zip</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
-
     <fileSets>
         <fileSet>
             <directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
             <excludes>
                 <exclude>**/*.sh</exclude>
-		<exclude>**/wso2server.bat</exclude>
+                <exclude>**/wso2server.bat</exclude>
                 <exclude>**/axis2services/sample01.aar</exclude>
                 <exclude>**/axis2services/echo/**</exclude>
                 <exclude>**/axis2services/version/**</exclude>
@@ -39,47 +39,44 @@
                 <exclude>**/LICENSE.txt</exclude>
                 <exclude>**/NOTICE</exclude>
                 <exclude>**/release-notes.html</exclude>
- 		        <exclude>**/launch.ini</exclude>
+                <exclude>**/launch.ini</exclude>
                 <exclude>**/carbon.xml</exclude>
                 <exclude>**/README*</exclude>
                 <exclude>**/log4j.properties</exclude>
                 <exclude>**/repository/components/**</exclude>
-		        <exclude>**/lib/endorsed/**</exclude>
+                <exclude>**/lib/endorsed/**</exclude>
                 <exclude>**/repository/conf/security/cipher-tool.properties</exclude>
                 <exclude>**/dbscripts/**</exclude>
                 <exclude>**/repository/conf/security/cipher-text.properties</exclude>
-		        <exclude>**/repository/conf/axis2/axis2.xml</exclude>
-		        <exclude>**/repository/conf/registry.xml</exclude>
-
-		<exclude>**/repository/conf/log4j.properties</exclude>
-  		<exclude>**/repository/conf/data-bridge/**</exclude>
-  		<exclude>**/repository/resources/security/client-truststore.jks</exclude>
+                <exclude>**/repository/conf/axis2/axis2.xml</exclude>
+                <exclude>**/repository/conf/registry.xml</exclude>
+                <exclude>**/repository/conf/log4j.properties</exclude>
+                <exclude>**/repository/conf/data-bridge/**</exclude>
+                <exclude>**/repository/resources/security/client-truststore.jks</exclude>
             </excludes>
         </fileSet>
-	<!-- Copying p2 profile and osgi bundles-->
-	<fileSet>
-	    <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory>
-	    <outputDirectory>${pom.artifactId}-${pom.version}/repository/components</outputDirectory>
-	    <excludes>
-	        <exclude>**/eclipse.ini</exclude>
-	        <exclude>**/*.lock</exclude>
-	        <exclude>**/.data</exclude>
-	        <exclude>**/.settings</exclude>
-	        <exclude>**/org.wso2.store.sso.common_1.0.0.jar</exclude>
-	        <exclude>**/org.wso2.stratos.identity.saml2.sso.mgt_2.2.0.jar</exclude>
-	        <exclude>**/org.jaggeryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar</exclude>
+        <!-- Copying p2 profile and osgi bundles-->
+        <fileSet>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/components</outputDirectory>
+            <excludes>
+                <exclude>**/eclipse.ini</exclude>
+                <exclude>**/*.lock</exclude>
+                <exclude>**/.data</exclude>
+                <exclude>**/.settings</exclude>
+                <exclude>**/org.wso2.store.sso.common_1.0.0.jar</exclude>
+                <exclude>**/org.wso2.stratos.identity.saml2.sso.mgt_2.2.0.jar</exclude>
+                <exclude>**/org.jaggeryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar</exclude>
                 <exclude>**/infinispan-core_5.1.2.wso2v1.jar</exclude>
-	        <exclude>**/jboss-logging_3.1.0.wso2v1.jar</exclude>
-		<exclude>**/marshalling_1.3.6.wso2v1.jar</exclude>
-		<exclude>**/jboss-transaction-api_1.1_spec-1.0.0.Final.jar</exclude>
-		<exclude>**/org.wso2.carbon.ui_4.2.0.jar</exclude>
-		<exclude>**/httpclient_4.1.1.wso2v1.jar</exclude>
-		<exclude>**/httpcore_4.1.0.wso2v1.jar</exclude>
-	    </excludes>
-	</fileSet>
-
-
-	<!-- Exclude non-Apache2 compliant dependency from lib/endorsed/ directory-->
+                <exclude>**/jboss-logging_3.1.0.wso2v1.jar</exclude>
+                <exclude>**/marshalling_1.3.6.wso2v1.jar</exclude>
+                <exclude>**/jboss-transaction-api_1.1_spec-1.0.0.Final.jar</exclude>
+                <exclude>**/org.wso2.carbon.ui_4.2.0.jar</exclude>
+                <exclude>**/httpclient_4.1.1.wso2v1.jar</exclude>
+                <exclude>**/httpcore_4.1.0.wso2v1.jar</exclude>
+            </excludes>
+        </fileSet>
+        <!-- Exclude non-Apache2 compliant dependency from lib/endorsed/ directory-->
         <fileSet>
             <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/endorsed</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/lib/endorsed</outputDirectory>
@@ -87,10 +84,9 @@
                 <exclude>**/jboss-transaction-api_1.1_spec-1.0.0.Final.jar</exclude>
             </excludes>
         </fileSet>
-	
         <fileSet>
-        <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps</directory>
-        <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps</outputDirectory>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps</outputDirectory>
             <excludes>
                 <exclude>**/publisher/**</exclude>
                 <exclude>**/store/**</exclude>
@@ -114,12 +110,12 @@
             <excludes>
                 <exclude>**/README</exclude>
             </excludes>
-	 </fileSet>
-         <fileSet>
+        </fileSet>
+        <fileSet>
             <directory>../../../../components/org.apache.stratos.manager.console/sso</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/sso</outputDirectory>
         </fileSet>
-         <fileSet>
+        <fileSet>
             <directory>../../../../components/org.apache.stratos.manager.console/modules/console</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/modules/console</outputDirectory>
         </fileSet>
@@ -128,10 +124,10 @@
             <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
             <excludes>
                 <exclude>**/daemon.sh</exclude>
-		<exclude>**/log4j.properties</exclude>
-		<exclude>**/repository/conf/log4j.properties</exclude>
-		<exclude>**/wso2server.sh</exclude>
-		<exclude>**/wso2server.bat</exclude>
+                <exclude>**/log4j.properties</exclude>
+                <exclude>**/repository/conf/log4j.properties</exclude>
+                <exclude>**/wso2server.sh</exclude>
+                <exclude>**/wso2server.bat</exclude>
             </excludes>
             <includes>
                 <include>**/*.sh</include>
@@ -139,10 +135,9 @@
             </includes>
             <fileMode>755</fileMode>
         </fileSet>
-	<fileSet>
+        <fileSet>
             <directory>../../conf/synapse-configs</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/synapse-configs
-            </outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/synapse-configs</outputDirectory>
         </fileSet>
         <fileSet>
             <directory>../../conf</directory>
@@ -164,16 +159,15 @@
                 <exclude>email-new-tenant-registration.xml</exclude>
                 <exclude>email-password-reset.xml</exclude>
                 <exclude>email-payment-received-customer.xml</exclude>
-		<exclude>email-registration-payment-received-customer.xml</exclude>
+                <exclude>email-registration-payment-received-customer.xml</exclude>
                 <exclude>email-payment-received-wso2.xml</exclude>
                 <exclude>email-registration-complete.xml</exclude>
                 <exclude>email-registration-moderation.xml</exclude>
                 <exclude>email-registration.xml</exclude>
                 <exclude>email-update.xml</exclude>
-		<exclude>tenant-reg-agent.xml</exclude>
+                <exclude>tenant-reg-agent.xml</exclude>
                 <exclude>features-dashboard.xml</exclude>
                 <exclude>**/data-bridge/**</exclude>
-
             </excludes>
         </fileSet>
         <fileSet>
@@ -187,14 +181,14 @@
                 <include>email-password-reset.xml</include>
                 <include>email-payment-received-customer.xml</include>
                 <include>email-registration-payment-received-customer.xml</include>
-				<include>email-payment-received-wso2.xml</include>
+                <include>email-payment-received-wso2.xml</include>
                 <include>email-registration-complete.xml</include>
                 <include>email-registration-moderation.xml</include>
                 <include>email-registration.xml</include>
                 <include>email-update.xml</include>
             </includes>
         </fileSet>
-	<fileSet>
+        <fileSet>
             <directory>../../conf</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/multitenancy</outputDirectory>
             <includes>
@@ -202,16 +196,15 @@
                 <include>features-dashboard.xml</include>
             </includes>
         </fileSet>
-	<fileSet>
+        <fileSet>
             <directory>../../conf</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources</outputDirectory>
             <includes>
                 <include>stratos-datasources.xml</include>
             </includes>
         </fileSet>
-
         <!-- Copying themes, cloud icons-->
-         <fileSet>
+        <fileSet>
             <directory>../../resources</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/resources</outputDirectory>
             <fileMode>755</fileMode>
@@ -223,7 +216,6 @@
                 <exclude>.svn</exclude>
             </excludes>
         </fileSet>
-
         <!--start BAM related files -->
         <!--<fileSet>
             <directory>resources/dataservices</directory>
@@ -245,7 +237,6 @@
                 <include>*.xml</include>
             </includes>
         </fileSet>-->
-
         <fileSet>
             <directory>resources</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources</outputDirectory>
@@ -253,7 +244,7 @@
                 <include>**/*</include>
             </includes>
         </fileSet>
-	<!--fileSet>
+        <!--fileSet>
             <directory>resources/dbscripts</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/</outputDirectory>
             <includes>
@@ -261,128 +252,116 @@
             </includes>
         </fileSet-->
         <!--end BAM related files -->
-
-	<!--qpid related files -->
-	<fileSet>
-           <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/advanced/</directory>
-           <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/advanced</outputDirectory>
-	   <includes>
-               <include>**/*</include>
-           </includes>
-	    <excludes>
+        <!--qpid related files -->
+        <fileSet>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/advanced/</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/advanced</outputDirectory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+            <excludes>
                 <exclude>**/jmx.xml</exclude>
-		<exclude>**/authenticators.xml</exclude>
-		<exclude>**/logging-config.xml</exclude>
+                <exclude>**/authenticators.xml</exclude>
+                <exclude>**/logging-config.xml</exclude>
             </excludes>
         </fileSet>
-	<!-- end of qpid related files -->
-
-	<!-- adc.mgt related files -->
-	<fileSet>
-           <!--directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/</directory-->
-	   <directory>src/main/conf/</directory>
-           <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
-	   <includes>
-               <include>cartridge-config.properties</include>
-               <include>policies.xml</include>
-           </includes>
+        <!-- end of qpid related files -->
+        <!-- adc.mgt related files -->
+        <fileSet>
+            <!--directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/</directory-->
+            <directory>src/main/conf/</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+            <includes>
+                <include>cartridge-config.properties</include>
+                <include>policies.xml</include>
+            </includes>
         </fileSet>
         <fileSet>
-           <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc</directory>
-           <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
-	   <includes>
-               <include>policies.xsd</include>
-           </includes>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
+            <includes>
+                <include>policies.xsd</include>
+            </includes>
         </fileSet>
-	<!-- end of adc.mgt related files -->
-
-	<!-- axis2.xml -->
-	<fileSet>
-           <directory>src/main/conf/</directory>
-           <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/axis2</outputDirectory>
-           <includes>
-               <include>axis2.xml</include>
-           </includes>
+        <!-- end of adc.mgt related files -->
+        <!-- axis2.xml -->
+        <fileSet>
+            <directory>src/main/conf/</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/axis2</outputDirectory>
+            <includes>
+                <include>axis2.xml</include>
+            </includes>
         </fileSet>
-
-	 <fileSet>
-           <directory>../p2-profile/target/wso2carbon-core-${carbon.platform.version}/repository/conf/etc/</directory>
-           <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
-           <includes>
-               <include>**/cassandra.yaml</include>
-           </includes>
+        <fileSet>
+            <directory>../p2-profile/target/wso2carbon-core-${carbon.platform.version}/repository/conf/etc/</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
+            <includes>
+                <include>**/cassandra.yaml</include>
+            </includes>
         </fileSet>
-	<fileSet>
-           <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/</directory>
-           <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
-	   <includes>
-		<include>**/rule-engine-config.xml</include>
-           </includes>
+        <fileSet>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
+            <includes>
+                <include>**/rule-engine-config.xml</include>
+            </includes>
         </fileSet>
-
-	<fileSet>
-           <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/</directory>
-           <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/multitenancy/</outputDirectory>
-           <includes>
+        <fileSet>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/multitenancy/</outputDirectory>
+            <includes>
                 <include>**/multitenancy-packages.xml</include>
                 <include>**/stratos.xml</include>
                 <include>**/usage-throttling-agent-config.xml</include>
-		<!--include>**/cloud-services-desc.xml</include-->
-           </includes>
+                <!--include>**/cloud-services-desc.xml</include-->
+            </includes>
         </fileSet>
-
-		<!-- copy the landing page webapp -->
+        <!-- copy the landing page webapp -->
         <fileSet>
-			<directory>lib/home</directory>
-			<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/STRATOS_ROOT</outputDirectory>
-		</fileSet>
-
-		<fileSet>
-			<directory>../../modules/features-dashboard/target/</directory>
-			<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
-			<includes>
-				<include>**/*.war</include>
-			</includes>
-		</fileSet>
-
-		<fileSet>
-			<directory>../../resources/cloud-services-icons/target/</directory>
-			<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
-			<includes>
-				<include>**/*.war</include>
-			</includes>
-		</fileSet>
-
-		<fileSet>
-	        	<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/</directory>
-        		<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/registry/</outputDirectory>
-            	<excludes>
-                	<exclude>**/identity/**</exclude>
-			<!-- new version of mysql.sql and db2.sql is coming from WSO2-CARBON-PATCH-4.2.0-0001 patch. So excluding them-->
-                	<exclude>mysql.sql</exclude>
-                	<exclude>db2.sql</exclude>
-            	</excludes>
-            	<includes>
-                	<include>**/**.sql</include>
-            	</includes>
-		</fileSet>
-
-		<fileSet>
-	        	<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/</directory>
-        		<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/identity</outputDirectory>
-            	<includes>
-                	<include>**/**.sql</include>
-            	</includes>
-		</fileSet>
-
-		<fileSet>
-	        	<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001/dbscripts</directory>
-        		<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/registry</outputDirectory>
-            	<includes>
-                	<include>**/**.sql</include>
-            	</includes>
-		</fileSet>
-
+            <directory>lib/home</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/STRATOS_ROOT</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../../modules/features-dashboard/target/</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
+            <includes>
+                <include>**/*.war</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../../resources/cloud-services-icons/target/</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
+            <includes>
+                <include>**/*.war</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/registry/</outputDirectory>
+            <excludes>
+                <exclude>**/identity/**</exclude>
+                <!-- new version of mysql.sql and db2.sql is coming from WSO2-CARBON-PATCH-4.2.0-0001 patch. So excluding them-->
+                <exclude>mysql.sql</exclude>
+                <exclude>db2.sql</exclude>
+            </excludes>
+            <includes>
+                <include>**/**.sql</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/identity</outputDirectory>
+            <includes>
+                <include>**/**.sql</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001/dbscripts</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/registry</outputDirectory>
+            <includes>
+                <include>**/**.sql</include>
+            </includes>
+        </fileSet>
         <!-- copy cxf runtime -->
         <fileSet>
             <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes</directory>
@@ -391,26 +370,23 @@
                 <include>*/**</include>
             </includes>
         </fileSet>
-
         <!-- copy jaggery modules -->
         <fileSet>
             <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/modules</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/modules</outputDirectory>
-	    <excludes>
+            <excludes>
                 <exclude>**/carbon/**</exclude>
-	    </excludes>
+            </excludes>
             <includes>
                 <include>*/**</include>
             </includes>
         </fileSet>
-
-		<!-- copy the billing h2 db -->
-		<fileSet>
-			<directory>target/database</directory>
-			<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
-		</fileSet>
-
-        <!-- Kernel Patches-->       
+        <!-- copy the billing h2 db -->
+        <fileSet>
+            <directory>target/database</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
+        </fileSet>
+        <!-- Kernel Patches-->
         <fileSet>
             <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory>
@@ -435,14 +411,14 @@
         <fileSet>
             <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0004</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory>
-	    <excludes>
+            <excludes>
                 <exclude>**/org.wso2.carbon.ui_4.2.0.jar</exclude>
-	    </excludes>
+            </excludes>
             <includes>
                 <include>**/patch0004/*.*</include>
             </includes>
         </fileSet>
-	<fileSet>
+        <fileSet>
             <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0005</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory>
             <includes>
@@ -459,7 +435,7 @@
         <fileSet>
             <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0007</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory>
-	    <excludes>
+            <excludes>
                 <exclude>**/org.wso2.carbon.ui_4.2.0.jar</exclude>
             </excludes>
             <includes>
@@ -473,132 +449,110 @@
                 <include>**/patch0008/*.*</include>
             </includes>
         </fileSet>
-<!--
+        <!--
 		<fileSet>
                    <directory>../../dbscripts/</directory>
                    <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts</outputDirectory>
                 </fileSet>
 -->
-		<fileSet>
-                   <directory>../../payload</directory>
-		   <includes>
-            		<include>user-data</include>
-        	   </includes>
-                   <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources</outputDirectory>
-                </fileSet>
-                <fileSet>
-                   <directory>../../payload/user-data/</directory>
-                   <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/user-data</outputDirectory>
-                </fileSet> 
-	<fileSet>
+        <fileSet>
+            <directory>../../payload</directory>
+            <includes>
+                <include>user-data</include>
+            </includes>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../../payload/user-data/</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/user-data</outputDirectory>
+        </fileSet>
+        <fileSet>
             <directory>../../conf/temp-artifacts/sso</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/modules/sso</outputDirectory>
         </fileSet>
-	<fileSet>
+        <fileSet>
             <directory>../../conf/temp-artifacts/carbon</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/modules/carbon</outputDirectory>
         </fileSet>
-	<fileSet>
+        <fileSet>
             <directory>../../conf/temp-artifacts</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/plugins</outputDirectory>
             <includes>
                 <include>org.wso2.store.sso.common_1.0.0.jar</include>
             </includes>
         </fileSet>
-	<fileSet>
+        <fileSet>
             <directory>../../conf/temp-artifacts</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/plugins</outputDirectory>
             <includes>
                 <include>org.wso2.stratos.identity.saml2.sso.mgt_2.2.0.jar</include>
             </includes>
         </fileSet>
-
-    <!-- autoscaler -->
-    <fileSet>
-	  <directory>src/main/autoscale-policies</directory>
-	  <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/autoscale-policies</outputDirectory>
-	  <directoryMode>0600</directoryMode>
-           <includes>
-              <include>*.xml</include>
-           </includes>
-	</fileSet>
-
-	<fileSet>
-	  <directory>src/main/deployment-policies</directory>
-	  <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/deployment-policies</outputDirectory>
-	  <directoryMode>0600</directoryMode>
-           <includes>
-              <include>*.xml</include>
-           </includes>
-	</fileSet>
-
-	<fileSet>
-	  <directory>src/main/partitions</directory>
-	  <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/partitions</outputDirectory>
-	  <directoryMode>0600</directoryMode>
-           <includes>
-              <include>*.xml</include>
-           </includes>
-	</fileSet>
-
-    <!-- autoscaler -->
-	<fileSet>
+        <!-- autoscaler -->
+        <fileSet>
+            <directory>src/main/autoscale-policies</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/autoscale-policies</outputDirectory>
+            <directoryMode>0600</directoryMode>
+            <includes>
+                <include>*.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/deployment-policies</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/deployment-policies</outputDirectory>
+            <directoryMode>0600</directoryMode>
+            <includes>
+                <include>*.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/partitions</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/partitions</outputDirectory>
+            <directoryMode>0600</directoryMode>
+            <includes>
+                <include>*.xml</include>
+            </includes>
+        </fileSet>
+        <!-- autoscaler -->
+        <fileSet>
             <directory>../../conf/temp-artifacts</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/plugins</outputDirectory>
             <includes>
                 <include>org.jaggeryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar</include>
             </includes>
         </fileSet>
-
-    <!-- cep -->
-	<!--creating an empty input event adaptors directory-->
+        <!-- cep -->
+        <!--creating an empty input event adaptors directory-->
         <fileSet>
             <directory>../../../../extensions/cep/artifacts/inputeventadaptors</directory>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/deployment/server/inputeventadaptors
-            </outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/inputeventadaptors</outputDirectory>
         </fileSet>
-
         <!--creating an empty output event adaptors directory-->
         <fileSet>
             <directory>../../../../extensions/cep/artifacts/outputeventadaptors</directory>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/deployment/server/outputeventadaptors
-            </outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/outputeventadaptors</outputDirectory>
         </fileSet>
-
         <!--creating an empty event builders directory-->
         <fileSet>
             <directory>../../../../extensions/cep/artifacts/eventbuilders</directory>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/deployment/server/eventbuilders
-            </outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/eventbuilders</outputDirectory>
         </fileSet>
-
         <!--creating an empty event formatters directory-->
         <fileSet>
             <directory>../../../../extensions/cep/artifacts/eventformatters</directory>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/deployment/server/eventformatters
-            </outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/eventformatters</outputDirectory>
         </fileSet>
-
         <!--creating an empty execution plans directory-->
         <fileSet>
             <directory>../../../../extensions/cep/artifacts/executionplans</directory>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/deployment/server/executionplans
-            </outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/executionplans</outputDirectory>
         </fileSet>
-
-	<!--customization scripts-->
+        <!--customization scripts-->
         <fileSet>
             <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/scripts</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/scripts</outputDirectory>
         </fileSet>
-     </fileSets>
-
-
+    </fileSets>
     <dependencySets>
         <dependencySet>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/lib</outputDirectory>
@@ -606,7 +560,7 @@
                 <include>bouncycastle:bcprov-jdk15:jar</include>
             </includes>
         </dependencySet>
-	<!-- use the new tool to create a bundles -->
+        <!-- use the new tool to create a bundles -->
         <dependencySet>
             <outputDirectory>${pom.artifactId}-${pom.version}/lib/core/WEB-INF/lib</outputDirectory>
             <includes>
@@ -618,12 +572,10 @@
             <includes>
                 <include>bouncycastle:bcprov-jdk15:jar</include>
             </includes>
-            <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
-            </outputFileNameMapping>
+            <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
         </dependencySet>
         <dependencySet>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/client/modules
-            </outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/client/modules</outputDirectory>
             <includes>
                 <include>org.apache.rampart:rampart:mar</include>
             </includes>
@@ -643,28 +595,27 @@
                 <include>org.apache.stratos:org.apache.stratos.cep.extension:jar</include>
             </includes>
         </dependencySet>
-         <dependencySet>
-          <outputDirectory>${pom.artifactId}-${pom.version}/lib/endorsed</outputDirectory>
+        <dependencySet>
+            <outputDirectory>${pom.artifactId}-${pom.version}/lib/endorsed</outputDirectory>
             <includes>
                 <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar</include>
             </includes>
         </dependencySet>
         <dependencySet>
-          <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/dropins</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/dropins</outputDirectory>
             <includes>
                 <include>org.apache.stratos:org.wso2.carbon.ui:jar</include>
             </includes>
         </dependencySet>
     </dependencySets>
-
     <files>
-		<file>
+        <file>
             <source>src/main/conf/log4j.properties</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
             <filtered>true</filtered>
             <fileMode>600</fileMode>
         </file>
-	<!-- cep -->
+        <!-- cep -->
         <file>
             <source>src/main/conf/siddhi/siddhi.extension</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/siddhi/</outputDirectory>
@@ -675,13 +626,13 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
             <filtered>true</filtered>
         </file>
-		<!-- cloud-controller -->
-		<file>
+        <!-- cloud-controller -->
+        <file>
             <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cloud-controller.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
         </file>
-		<!-- cloud-controller -->
-		<!-- autoscaler -->
+        <!-- cloud-controller -->
+        <!-- autoscaler -->
         <file>
             <source>src/main/conf/autoscaler.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
@@ -694,7 +645,7 @@
             <filtered>true</filtered>
             <fileMode>600</fileMode>
         </file>
-	<!--iindentity.xml and application-authentication.xml for oAuth feature -->
+        <!--iindentity.xml and application-authentication.xml for oAuth feature -->
         <file>
             <source>src/main/conf/identity.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
@@ -755,7 +706,7 @@
             <filtered>true</filtered>
             <fileMode>600</fileMode>
         </file>
-		<!-- autoscaler -->
+        <!-- autoscaler -->
         <file>
             <source>${project.basedir}/INSTALL.txt</source>
             <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
@@ -768,7 +719,7 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-	<file>
+        <file>
             <source>src/main/resources/launch.ini</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
             <filtered>true</filtered>
@@ -780,7 +731,7 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-	 <file>
+        <file>
             <source>src/main/license/LICENSE</source>
             <outputDirectory>apache-stratos-${pom.version}</outputDirectory>
             <filtered>true</filtered>
@@ -811,14 +762,13 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-
-	<!--file>
+        <!--file>
             <source>../../conf/cartridge-config.properties</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file-->
-	<file>
+        <file>
             <source>../../conf/cloud-services-desc.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/multitenancy</outputDirectory>
             <filtered>true</filtered>
@@ -838,7 +788,6 @@
         </file-->
         <file>
             <source>target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt</source>
-
             <outputDirectory>${pom.artifactId}-${pom.version}/bin/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
@@ -855,7 +804,7 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file-->
-	<!--file>
+        <!--file>
             <source>bam-resources/bam.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
             <filtered>true</filtered>
@@ -866,43 +815,42 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/security/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
-	<!--file>
+        <!--file>
             <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
 	    <filtered>true</filtered>
 	    <fileMode>644</fileMode>	
         </file-->
-	
-	<!-- Including logging-config.xml file -->
- 	<file>
+        <!-- Including logging-config.xml file -->
+        <file>
             <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/</outputDirectory>
         </file>
-	<file>
+        <file>
             <source>src/bin/stratos.sh</source>
             <outputDirectory>apache-stratos-${pom.version}/bin/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>755</fileMode>
         </file>
-	<file>
+        <file>
             <source>src/bin/stratos.bat</source>
             <outputDirectory>apache-stratos-${pom.version}/bin/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>755</fileMode>
         </file>
-	<file>
+        <file>
             <source>src/bin/git-folder-structure.sh</source>
             <outputDirectory>apache-stratos-${pom.version}/bin/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>755</fileMode>
         </file>
-	<file>
+        <file>
             <source>src/bin/manage-git-repo.sh</source>
             <outputDirectory>apache-stratos-${pom.version}/bin/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>755</fileMode>
         </file>
-	<file>
+        <file>
             <source>src/bin/set-mysql-password.sh</source>
             <outputDirectory>apache-stratos-${pom.version}/bin/</outputDirectory>
             <filtered>true</filtered>
@@ -920,30 +868,30 @@
             <filtered>true</filtered>
             <fileMode>755</fileMode>
         </file>
-	<file>
+        <file>
             <source>src/bin/update-instance.sh</source>
             <outputDirectory>apache-stratos-${pom.version}/bin/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>755</fileMode>
         </file>
-	<file>
+        <file>
             <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/claim-config.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
-	    <filtered>true</filtered>
-	    <fileMode>644</fileMode>	
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
         </file>
-	<file>
+        <file>
             <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/tasks-config.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
         </file>
-	<file>
+        <file>
             <source>../../conf/zoo.cfg</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
         </file>
-	<file>
+        <file>
             <source>../../conf/jaas.conf</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security</outputDirectory>
-	    <destName>jaas.conf</destName>
+            <destName>jaas.conf</destName>
             <filtered>true</filtered>
         </file>
         <file>
@@ -970,7 +918,7 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
-	    <!--oauth2.war and authenticationendpoint.war is related to oAuth feature  -->
+        <!--oauth2.war and authenticationendpoint.war is related to oAuth feature  -->
         <file>
             <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/oauth2.war</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory>
@@ -982,12 +930,9 @@
             <fileMode>644</fileMode>
         </file>
         <!-- End of REST endpoint webapp -->
-
         <!-- Meta data service webapp -->
         <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/metadata.war
-            </source>
+            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/metadata.war</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
@@ -1007,9 +952,8 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
-
-   <!--Copying config files from kernel patches -->
-<!--
+        <!--Copying config files from kernel patches -->
+        <!--
         <file>
             <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001/dbscripts/mysql.sql</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/registry</outputDirectory>
@@ -1026,13 +970,10 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security/</outputDirectory>
             <filtered>true</filtered>
         </file>
-
-
         <file>
             <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0004/repository/conf/carbon.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
             <filtered>true</filtered>
         </file>
-
     </files>
 </assembly>