From 1b4857b7fd9a483b5966c7b4c9554420249dce19 Mon Sep 17 00:00:00 2001
From: geethkokila <geeth@wso2.com>
Date: Tue, 20 Dec 2016 11:19:58 +0530
Subject: [PATCH] Fixing conflicts

---
 .../org.wso2.carbon.certificate.mgt.core/pom.xml       | 10 ++++++----
 .../main/resources/jaggeryapps/devicemgt/jaggery.conf  |  2 +-
 .../jaggeryapps/uuf-template-app/jaggery.conf          |  2 +-
 .../uuf-template-app/lib/modules/auth/auth.js          |  4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
index 3d6927cb7d..cf23d12014 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
+++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>certificate-mgt</artifactId>
-        <version>2.0.4-SNAPSHOT</version>
+        <version>2.0.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
-    <version>2.0.4-SNAPSHOT</version>
+    <version>2.0.3-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Certificate Management Core</name>
     <description>WSO2 Carbon - Certificate Management Core</description>
@@ -51,7 +51,8 @@
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>Device Management Core Bundle</Bundle-Description>
                         <Private-Package>
-                            org.wso2.carbon.certificate.mgt.core.internal
+                            org.wso2.carbon.certificate.mgt.core.internal,
+                            org.wso2.carbon.certificate.mgt.core.util
                         </Private-Package>
                         <Import-Package>
                             org.osgi.framework,
@@ -59,7 +60,7 @@
                             org.apache.commons.logging,
                             javax.security.auth.x500,
                             javax.xml.*,
-			    javax.xml.parsers;version="${javax.xml.parsers.import.pkg.version}";resolution:=optional,
+			                javax.xml.parsers;version="${javax.xml.parsers.import.pkg.version}";resolution:=optional,
                             org.apache.commons.codec.binary,
                             org.bouncycastle.asn1,
                             org.bouncycastle.asn1.x500,
@@ -97,6 +98,7 @@
                         </Import-Package>
                         <Export-Package>
                             !org.wso2.carbon.certificate.mgt.core.internal.*,
+                            !org.wso2.carbon.certificate.mgt.core.util,
                             org.wso2.carbon.certificate.mgt.core.*
                         </Export-Package>
                     </instructions>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/jaggery.conf b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/jaggery.conf
index fb71f60e96..832c1ab252 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/jaggery.conf
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/jaggery.conf
@@ -108,7 +108,7 @@
     "contextParams" : [
       {
         "name" : "Owasp.CsrfGuard.Config",
-        "value" : "/repository/conf/security/Owasp.CsrfGuard.Carbon.properties"
+        "value" : "/repository/conf/security/Owasp.CsrfGuard.dashboard.properties"
       }
     ]
 }
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/jaggery.conf b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/jaggery.conf
index 7c5a2d41c9..f97bae72cf 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/jaggery.conf
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/jaggery.conf
@@ -71,7 +71,7 @@
      "contextParams" : [
        {
          "name" : "Owasp.CsrfGuard.Config",
-         "value" : "/repository/conf/security/Owasp.CsrfGuard.Carbon.properties"
+         "value" : "/repository/conf/security/Owasp.CsrfGuard.dashboard.properties"
        }
      ]
 }
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/lib/modules/auth/auth.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/lib/modules/auth/auth.js
index 2cf9771bea..a18d2efc50 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/lib/modules/auth/auth.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/lib/modules/auth/auth.js
@@ -520,7 +520,7 @@ var module = {};
                       response.sendError(500, msg);
                       return;
                   }
-                
+
                 /**
                  * @type {{sessionId: string, loggedInUser: string, sessionIndex: string, samlToken:
                  *     string}}
@@ -533,7 +533,7 @@ var module = {};
                      if (ssoSession.sessionIndex) {
                         module.loadTenant(ssoSession.loggedInUser);
                         var carbonUser = (require("carbon")).server.tenantUser(ssoSession.loggedInUser);
-			module.loadTenant(ssoSession.loggedInUser);
+                        module.loadTenant(ssoSession.loggedInUser);
                         utils.setCurrentUser(carbonUser.username, carbonUser.domain, carbonUser.tenantId);
                         var scriptArgument = {input: {samlToken: ssoSession.samlToken}, user: module.getCurrentUser()};
                         handleEvent(OPERATION_LOGIN, EVENT_SUCCESS, scriptArgument);