=== renamed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cache.manifest' => 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cache.manifest 2011-08-08 17:57:47 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm 2011-08-09 09:48:09 +0000 @@ -3,43 +3,42 @@ NETWORK: * CACHE: -dhis-web-commons/css/light_blue/dom.js -dhis-web-commons/css/light_blue/head.png -dhis-web-commons/css/light_blue/light_blue.css -dhis-web-commons/css/light_blue/logo_background.png -dhis-web-commons/css/light_blue/logo_banner.png -dhis-web-commons/css/light_blue/logo_left.png -dhis-web-commons/css/light_blue/logo_right.png -dhis-web-commons/css/light_blue/logo_separator.png -dhis-web-commons/css/widgets.css -dhis-web-commons/javascripts/jQuery/jquery-1.6.1.min.js -dhis-web-commons/javascripts/jQuery/jquery.metadata.js -dhis-web-commons/javascripts/jQuery/jquery.glob.js -dhis-web-commons/javascripts/jQuery/jquery.date.js -dhis-web-commons/javascripts/jQuery/jquery.tmpl.js -dhis-web-commons/javascripts/commons.js -dhis-web-commons/javascripts/lists.js -dhis-web-commons/javascripts/periodType.js -dhis-web-commons/javascripts/date.js -main.js -dhis-web-commons/ouwt/ouwt.js -dhis-web-commons/fonts/LiberationSans-Regular-webfont.eot -dhis-web-commons/fonts/LiberationSans-Regular-webfont.woff -dhis-web-commons/fonts/LiberationSans-Regular-webfont.ttf -dhis-web-commons/fonts/LiberationSans-Regular-webfont.svg -dhis-web-commons/fonts/LiberationSans-Bold-webfont.eot -dhis-web-commons/fonts/LiberationSans-Bold-webfont.woff -dhis-web-commons/fonts/LiberationSans-Bold-webfont.ttf -dhis-web-commons/fonts/LiberationSans-Bold-webfont.svg -dhis-web-commons/images/treeview-gray-line.gif -images/show_menu.png -images/hide_menu.png -images/search.png -images/colapse.png -images/help.png -images/hide.png -images/ajax-loader-circle.gif -dhis-web-dataentry/javascript/entry.js -dhis-web-dataentry/javascript/form.js -dhis-web-dataentry/javascript/history.js -dhis-web-dataentry/style/dhis-web-dataentry.css \ No newline at end of file +css/light_blue/dom.js +css/light_blue/head.png +css/light_blue/light_blue.css +css/light_blue/logo_background.png +css/light_blue/logo_banner.png +css/light_blue/logo_left.png +css/light_blue/logo_right.png +css/light_blue/logo_separator.png +css/widgets.css +javascripts/jQuery/jquery-1.6.1.min.js +javascripts/jQuery/jquery.metadata.js +javascripts/jQuery/jquery.glob.js +javascripts/jQuery/jquery.date.js +javascripts/jQuery/jquery.tmpl.js +javascripts/commons.js +javascripts/lists.js +javascripts/periodType.js +javascripts/date.js +../main.js +ouwt/ouwt.js +fonts/LiberationSans-Regular-webfont.eot +fonts/LiberationSans-Regular-webfont.woff +fonts/LiberationSans-Regular-webfont.ttf +fonts/LiberationSans-Regular-webfont.svg +fonts/LiberationSans-Bold-webfont.eot +fonts/LiberationSans-Bold-webfont.woff +fonts/LiberationSans-Bold-webfont.ttf +fonts/LiberationSans-Bold-webfont.svg +images/treeview-gray-line.gif +../images/show_menu.png +../images/hide_menu.png +../images/search.png +../images/colapse.png +../images/help.png +../images/hide.png +../images/ajax-loader-circle.gif +../dhis-web-dataentry/javascript/form.js +../dhis-web-dataentry/javascript/entry.js +../dhis-web-dataentry/javascript/history.js \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2011-08-08 17:57:47 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2011-08-09 09:48:09 +0000 @@ -1,5 +1,5 @@ - + DHIS 2 === added file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/VelocityCacheManifestResult.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/VelocityCacheManifestResult.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/VelocityCacheManifestResult.java 2011-08-09 09:48:09 +0000 @@ -0,0 +1,18 @@ +package org.hisp.dhis.result; + +import org.apache.struts2.dispatcher.VelocityResult; + +public class VelocityCacheManifestResult + extends VelocityResult +{ + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = 1038408987156030639L; + + @Override + protected final String getContentType( String templateLocation ) + { + return "text/cache-manifest"; + } +} === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2011-08-08 18:21:36 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2011-08-09 09:48:09 +0000 @@ -25,6 +25,7 @@ + @@ -104,6 +105,7 @@ ${exception.class.name}: ${exception.message} + @@ -267,6 +269,12 @@ + + + + /cacheManifest.vm + + /main.vm /dhis-web-commons/i18n/translate.vm === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/WEB-INF/web.xml' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/WEB-INF/web.xml 2011-08-08 17:57:47 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/WEB-INF/web.xml 2011-08-09 09:48:09 +0000 @@ -13,11 +13,6 @@ ghostAdmin - - manifest - text/cache-manifest - - RedirectFilter org.hisp.dhis.servlet.filter.HttpRedirectFilter === modified file 'dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml' --- dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml 2011-08-08 17:57:47 +0000 +++ dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml 2011-08-09 09:48:09 +0000 @@ -13,11 +13,6 @@ databaseAdmin - - manifest - text/cache-manifest - - RedirectFilter org.hisp.dhis.servlet.filter.HttpRedirectFilter