From f709353fc50bbf3402dd226f01ead5baa7f36069 Mon Sep 17 00:00:00 2001
From: Maninda <mwe163@gmail.com>
Date: Mon, 16 Jan 2017 11:27:06 +0530
Subject: [PATCH] Corrected the security fixed web-app replacing configuration

---
 .../core/distribution/src/assembly/bin.xml    | 88 +++++++++++++++----
 1 file changed, 71 insertions(+), 17 deletions(-)

diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml
index 7edbbeed..61755aa2 100644
--- a/modules/core/distribution/src/assembly/bin.xml
+++ b/modules/core/distribution/src/assembly/bin.xml
@@ -608,23 +608,6 @@
             </includes>
         </fileSet>
 
-        <fileSet>
-            <directory>src/repository/resources/web-apps</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
-            <includes>
-                <include>api-application-registration.war</include>
-                <include>api#device-mgt#v1.0.war</include>
-                <include>api#scep-mgt#v1.0.war</include>
-                <include>client-registration#v0.11.war</include>
-                <include>secured-websocket.war</include>
-                <include>api#certificate-mgt#v1.0.war</include>
-                <include>api#identity#entitlement.war</include>
-                <include>authenticationendpoint.war</include>
-                <include>oauth2.war</include>
-                <include>shindig.war</include>
-            </includes>
-        </fileSet>
-
         <fileSet>
             <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/social/</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/social</outputDirectory>
@@ -1371,5 +1354,76 @@
             </outputDirectory>
             <fileMode>755</fileMode>
         </file>
+
+        <file>
+            <source>src/repository/resources/web-apps/api-application-registration.war</source>
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
+            </outputDirectory>
+            <fileMode>755</fileMode>
+        </file>
+        <file>
+            <source>src/repository/resources/web-apps/api#device-mgt#v1.0.war</source>
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
+            </outputDirectory>
+            <fileMode>755</fileMode>
+        </file>
+        <file>
+            <source>src/repository/resources/web-apps/api#scep-mgt#v1.0.war</source>
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
+            </outputDirectory>
+            <fileMode>755</fileMode>
+        </file>
+        <file>
+            <source>src/repository/resources/web-apps/client-registration#v0.11.war</source>
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
+            </outputDirectory>
+            <fileMode>755</fileMode>
+        </file>
+        <file>
+            <source>src/repository/resources/web-apps/secured-websocket.war</source>
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
+            </outputDirectory>
+            <fileMode>755</fileMode>
+        </file>
+        <file>
+            <source>src/repository/resources/web-apps/api#certificate-mgt#v1.0.war</source>
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
+            </outputDirectory>
+            <fileMode>755</fileMode>
+        </file>
+        <file>
+            <source>src/repository/resources/web-apps/api#identity#entitlement.war</source>
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
+            </outputDirectory>
+            <fileMode>755</fileMode>
+        </file>
+        <file>
+            <source>src/repository/resources/web-apps/authenticationendpoint.war</source>
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
+            </outputDirectory>
+            <fileMode>755</fileMode>
+        </file>
+        <file>
+            <source>src/repository/resources/web-apps/oauth2.war</source>
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
+            </outputDirectory>
+            <fileMode>755</fileMode>
+        </file>
+        <file>
+            <source>src/repository/resources/web-apps/shindig.war</source>
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
+            </outputDirectory>
+            <fileMode>755</fileMode>
+        </file>
     </files>
 </assembly>