From 778326f23995fb253c350faceb2e83d82c7d57b6 Mon Sep 17 00:00:00 2001
From: kasungayan <kbandara149@gmail.com>
Date: Fri, 7 Oct 2016 12:51:40 +0530
Subject: [PATCH 1/2] Fixing IDENTITY-4785

---
 modules/distribution/src/assembly/bin.xml | 15 ++++++++++-----
 pom.xml                                   |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index da0a6ed7c8d..f48d4d0ba81 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -173,29 +173,29 @@
             </includes>
         </fileSet>
 
-        <!--copy web app for application authentication feature -->
+
+        <!--copy jaxrs web app for Mex feature-->
         <fileSet>
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
             <includes>
-                <include>authenticationendpoint.war</include>
+                <include>mexut.war</include>
             </includes>
         </fileSet>
 
-        <!--copy web app for entitlement endpoint feature -->
+        <!--copy web app for application authentication feature -->
         <fileSet>
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
             <includes>
-                <include>entitlement.war</include>
+                <include>authenticationendpoint.war</include>
             </includes>
         </fileSet>
 
-
         <!--copy the social authenticator jars Facebook,Google,Windows-Live,Yahoo.-->
         <fileSet>
             <directory>../social-authenticators/target/socialauthenticatorCopied/jar</directory>
@@ -775,5 +775,10 @@
             <outputDirectory>wso2is-${pom.version}/repository/conf/identity</outputDirectory>
             <fileMode>644</fileMode>
         </file>
+        <file>
+            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mex/metadata.xml</source>
+            <outputDirectory>wso2is-${pom.version}/repository/deployment/server/webapps/mex/</outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
     </files>
 </assembly>
diff --git a/pom.xml b/pom.xml
index 3496d50a905..ee846a4531c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1212,7 +1212,7 @@
         <identity.inbound.auth.oauth.version>5.2.1</identity.inbound.auth.oauth.version>
         <identity.inbound.auth.openid.version>5.2.0</identity.inbound.auth.openid.version>
         <identity.agent.sso.version>5.1.3</identity.agent.sso.version>
-        <identity.inbound.auth.sts.version>5.1.3</identity.inbound.auth.sts.version>
+        <identity.inbound.auth.sts.version>5.1.4</identity.inbound.auth.sts.version>
         <identity.local.auth.fido.version>5.1.3</identity.local.auth.fido.version>
         <identity.outbound.auth.requestpath.basicauth.version>5.1.3</identity.outbound.auth.requestpath.basicauth.version>
         <identity.carbon.auth.mutual.ssl.version>5.1.2</identity.carbon.auth.mutual.ssl.version>

From 3f8039f6930c039b866691bfbc70bfabfb51e450 Mon Sep 17 00:00:00 2001
From: kasungayan <kbandara149@gmail.com>
Date: Fri, 7 Oct 2016 13:51:56 +0530
Subject: [PATCH 2/2] Fixing IDENTITY-4785

---
 modules/distribution/src/assembly/bin.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index f48d4d0ba81..436cb1c9418 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -196,6 +196,18 @@
             </includes>
         </fileSet>
 
+        <!--copy web app for entitlement endpoint feature -->
+        <fileSet>
+            <directory>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
+            </directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
+            <includes>
+                <include>entitlement.war</include>
+            </includes>
+        </fileSet>
+
+
         <!--copy the social authenticator jars Facebook,Google,Windows-Live,Yahoo.-->
         <fileSet>
             <directory>../social-authenticators/target/socialauthenticatorCopied/jar</directory>