From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Fri, 23 Nov 2007 10:36:13 +0000 (+0000)
Subject: made static file path configurable, default is to serve them via applicationServlet
X-Git-Tag: 6.7.0.beta1~5504
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=71bd96caf10474e8138278532732f541bc8ccd21;p=vaadin-framework.git

made static file path configurable, default is to serve them via applicationServlet

svn changeset:2907/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
index e59907a70f..9b7595d18e 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -111,6 +111,8 @@ public class ApplicationServlet extends HttpServlet {
     // Configurable parameter names
     private static final String PARAMETER_DEBUG = "Debug";
 
+    private static final String PARAMETER_ITMILL_RESOURCES = "Resources";
+
     private static final int DEFAULT_BUFFER_SIZE = 32 * 1024;
 
     private static final int MAX_BUFFER_SIZE = 64 * 1024;
@@ -515,17 +517,18 @@ public class ApplicationServlet extends HttpServlet {
             widgetset = DEFAULT_WIDGETSET;
         }
 
-        String contextPath = request.getContextPath();
+        String staticFilePath = getApplicationOrSystemProperty(
+                PARAMETER_ITMILL_RESOURCES, appUrl);
 
         // Default theme does not use theme URI
         String themeUri = null;
         if (themeName != null) {
             // Using custom theme
-            themeUri = contextPath + "/" + THEME_DIRECTORY_PATH + themeName;
+            themeUri = staticFilePath + "/" + THEME_DIRECTORY_PATH + themeName;
         }
         page.write("', pathInfo: '" + pathInfo + "', themeUri: '" + themeUri
                 + "'\n};\n" + "</script>\n"
-                + "<script language='javascript' src='" + contextPath + "/"
+                + "<script language='javascript' src='" + staticFilePath + "/"
                 + WIDGETSET_DIRECTORY_PATH + widgetset + "/" + widgetset
                 + ".nocache.js'></script>\n");