From cb6357f53c1d998cc9a6b0afd610b3d181405b4e Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sun, 13 Feb 2011 17:49:41 +0100
Subject: [PATCH] added max-age to cache control

---
 .../resources/AbstractManagerResource.java    | 28 +++++++++++++++++++
 .../webapp/resources/js/sonia.repository.js   |  1 +
 2 files changed, 29 insertions(+)

diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractManagerResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractManagerResource.java
index 87052b147b..1fb4c02270 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractManagerResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractManagerResource.java
@@ -262,6 +262,30 @@ public abstract class AbstractManagerResource<T extends ModelObject,
     return createResponse(request, items);
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public int getCacheMaxAge()
+  {
+    return cacheMaxAge;
+  }
+
+  //~--- set methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param cacheMaxAge
+   */
+  public void setCacheMaxAge(int cacheMaxAge)
+  {
+    this.cacheMaxAge = cacheMaxAge;
+  }
+
   //~--- methods --------------------------------------------------------------
 
   /**
@@ -324,6 +348,7 @@ public abstract class AbstractManagerResource<T extends ModelObject,
   {
     CacheControl cc = new CacheControl();
 
+    cc.setMaxAge(cacheMaxAge);
     rb.cacheControl(cc);
   }
 
@@ -395,6 +420,9 @@ public abstract class AbstractManagerResource<T extends ModelObject,
 
   //~--- fields ---------------------------------------------------------------
 
+  /** Field description */
+  protected int cacheMaxAge = 1;
+
   /** Field description */
   protected Manager<T, E> manager;
 }
diff --git a/scm-webapp/src/main/webapp/resources/js/sonia.repository.js b/scm-webapp/src/main/webapp/resources/js/sonia.repository.js
index 1d19b0418b..dfa121978f 100644
--- a/scm-webapp/src/main/webapp/resources/js/sonia.repository.js
+++ b/scm-webapp/src/main/webapp/resources/js/sonia.repository.js
@@ -83,6 +83,7 @@ Sonia.repository.Grid = Ext.extend(Sonia.rest.Grid, {
   initComponent: function(){
 
     var repositoryStore = new Sonia.rest.JsonStore({
+      id: 'repositoryStore',
       proxy: new Ext.data.HttpProxy({
         url: restUrl + 'repositories.json',
         disableCaching: false