Merge branch 'master' of https://github.com/wso2/product-emm

wso2-attic · Aug 25, 2016 · 5fdda90 · 5fdda90
2 parents 578ed7e + 570cb15
commit 5fdda90
Show file tree

Hide file tree

Showing 89 changed files with 2,750 additions and 2,163 deletions.
diff --git a/modules/apps/jaggery/emm-web-agent/pom.xml b/modules/apps/jaggery/emm-web-agent/pom.xml
@@ -4,14 +4,14 @@
     <parent>
     	<groupId>org.wso2.mdm</groupId>
     	<artifactId>wso2mdm-parent</artifactId>
-    	<version>2.1.0-SNAPSHOT</version>
+    	<version>2.2.0-SNAPSHOT</version>
 	<relativePath>../../../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>emm-web-agent</artifactId>
     <name>WSO2 EMM - Enterprise Mobility Manager Web Agent</name>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <build>

diff --git a/modules/apps/jaggery/emm-web-agent/src/emm-web-agent/config/config.json b/modules/apps/jaggery/emm-web-agent/src/emm-web-agent/config/config.json
@@ -33,7 +33,7 @@
         "keyStoreName" : "/repository/resources/security/wso2carbon.jks"
     },
     "generalConfig" : {
-        "host" : "http://localhost:9763",
+        "host" : "%http.ip%",
         "companyName" : "WSO2 Enterprise Mobility Manager",
         "browserTitle" : "WSO2 EMM",
         "copyrightText" : "\u00A9 %date-year%, WSO2 Inc. (http://www.wso2.org) All Rights Reserved."

diff --git a/modules/apps/jaggery/emm/pom.xml b/modules/apps/jaggery/emm/pom.xml
@@ -4,14 +4,14 @@
     <parent>
     	<groupId>org.wso2.mdm</groupId>
     	<artifactId>wso2mdm-parent</artifactId>
-    	<version>2.1.0-SNAPSHOT</version>
+    	<version>2.2.0-SNAPSHOT</version>
 	<relativePath>../../../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mdm-enduser-app</artifactId>
     <name>WSO2 EMM - Enterprise Mobility Manager End-user Web Application</name>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <build>

diff --git a/modules/apps/jaggery/emm/src/emm/modules/backend-service-invoker.js b/modules/apps/jaggery/emm/src/emm/modules/backend-service-invoker.js
@@ -90,10 +90,10 @@ var backendServiceInvoker = function () {
         log.debug("Service Invoker-URL: " + endpoint);
         log.debug("Service Invoker-Method: " + httpMethod);
 
-        /*log.info("Request : " + httpMethod + " " + endpoint);
+        log.info("Request : " + httpMethod + " " + endpoint);
         log.info("Request payload if any : " + stringify(requestPayload));
         log.info("Response status : " + xmlHttpRequest.status);
-        log.info("Response payload : " + xmlHttpRequest.responseText);*/
+        log.info("Response payload if any : " + xmlHttpRequest.responseText);
         //log.info("Response headers : " + xmlHttpRequest.getAllResponseHeaders());
 
         if (xmlHttpRequest.status == 401 && (xmlHttpRequest.responseText == TOKEN_EXPIRED ||

diff --git a/modules/apps/jaggery/emm/src/emm/units/policy-listing/policy-listing.hbs b/modules/apps/jaggery/emm/src/emm/units/policy-listing/policy-listing.hbs
@@ -562,7 +562,6 @@
             </div>
         </div>
     </div>
-
 {{/zone}}
 {{#zone "bottomJs"}}
     <script src="{{self.publicURL}}/js/policy-list.js"></script>

diff --git a/modules/distribution/LICENSE.txt b/modules/distribution/LICENSE.txt
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
@@ -22,13 +22,13 @@
     <parent>
         <groupId>org.wso2.mdm</groupId>
         <artifactId>wso2mdm-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>wso2emm</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Mobile Device Manager (MDM) - Distribution</name>
     <description>WSO2 Mobile Device Manager (MDM) Distribution</description>