dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13299
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-12-18 11:24:14 +0100
message:
  include revision number in appcache files
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/cacheManifest.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/appcache/AppCacheAction.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/cacheManifest.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/cacheManifest.vm	2013-12-18 09:42:14 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/cacheManifest.vm	2013-12-18 10:24:14 +0000
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# 2.14-SNAPSHOT V2
+# 2.14-SNAPSHOT $!systemInfo.revision
 # appcache for user: $username
 
 NETWORK:

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm	2013-12-18 09:42:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm	2013-12-18 10:24:14 +0000
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# 2.14-SNAPSHOT V3
+# 2.14-SNAPSHOT $!systemInfo.revision
 # appcache for user: $username
 
 NETWORK:

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/appcache/AppCacheAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/appcache/AppCacheAction.java	2013-12-18 08:26:45 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/appcache/AppCacheAction.java	2013-12-18 10:24:14 +0000
@@ -29,6 +29,8 @@
  */
 
 import com.opensymphony.xwork2.Action;
+import org.hisp.dhis.system.SystemInfo;
+import org.hisp.dhis.system.SystemService;
 import org.hisp.dhis.user.CurrentUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -45,6 +47,14 @@
         this.currentUserService = currentUserService;
     }
 
+    private SystemService systemService;
+
+    @Autowired
+    public void setSystemService( SystemService systemService )
+    {
+        this.systemService = systemService;
+    }
+
     private String username;
 
     public String getUsername()
@@ -52,11 +62,20 @@
         return username;
     }
 
+    private SystemInfo systemInfo;
+
+    public SystemInfo getSystemInfo()
+    {
+        return systemInfo;
+    }
+
     @Override
     public String execute() throws Exception
     {
         username = currentUserService.getCurrentUsername();
 
+        systemInfo = systemService.getSystemInfo();
+
         return SUCCESS;
     }
 }