From: Marc Englund <marc.englund@itmill.com>
Date: Tue, 18 Sep 2007 15:15:45 +0000 (+0000)
Subject: widgetset / directory structure changes
X-Git-Tag: 6.7.0.beta1~6001
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1f01633ff8820e46f2a9c3215d0bb8bc98a6bb42;p=vaadin-framework.git

widgetset / directory structure changes

svn changeset:2318/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 7ad8a3258f..87b45c9cb0 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -132,13 +132,14 @@ public class ApplicationServlet extends HttpServlet {
 
     private static final String AJAX_UIDL_URI = "/UIDL/";
 
-    static final String THEME_DIRECTORY_PATH = "/theme/";
+    static final String THEME_DIRECTORY_PATH = "ITK-INF/theme/";
 
     // Maximum delay between request for an user to be considered active (in ms)
     private static final long ACTIVE_USER_REQUEST_INTERVAL = 1000 * 45;
 
     private static final int DEFAULT_THEME_CACHETIME = 1000 * 60 * 60 * 24;
 
+    static final String WIDGETSET_DIRECTORY_PATH = "ITK-INF/widgetsets/";
     // Name of the default widget set, used if not specified in web.xml
     private static final String DEFAULT_WIDGETSET = "com.itmill.toolkit.terminal.gwt.DefaultWidgetSet";
     // Widget set narameter name
@@ -476,12 +477,14 @@ public class ApplicationServlet extends HttpServlet {
 			+ "<script language='javascript' src='"
 			+ (hasSlash ? "../" : "")
 			+ relative
+			+ WIDGETSET_DIRECTORY_PATH
 			+ widgetset
 			+ "/"
 			+ widgetset
 			+ ".nocache.js'></script>"
 			+ "<link REL=\"stylesheet\" TYPE=\"text/css\" HREF=\""
 			+ request.getContextPath()
+			+ "/" // TODO relative url as above?
 			+ THEME_DIRECTORY_PATH
 			+ themeName
 			+ "/styles.css\">"