From a08688e7bb834b0eb15c0e29726bfc0aa9546a36 Mon Sep 17 00:00:00 2001
From: Jani Laakso <jani.laakso@itmill.com>
Date: Tue, 9 Oct 2007 09:05:30 +0000
Subject: [PATCH] Refactored WebContent/ITK-INF to WebContent/ITMILL

svn changeset:2463/svn branch:trunk
---
 Hosted Mode Browser Linux.launch              |   6 +++---
 Hosted Mode Browser Mac.launch                |  20 +++++++++---------
 .../layouts/featurebrowser-mainlayout.html    |   0
 .../themes/demo/layouts/img/header.png        | Bin
 .../demo/layouts/img/hide_properties.png      | Bin
 .../themes/demo/layouts/img/m_bg.png          | Bin
 .../demo/layouts/img/show_properties.png      | Bin
 .../themes/demo/layouts/img/tab_handle.png    | Bin
 .../themes/demo/styles.css                    |   0
 .../themes/example/layouts/Contact.html       |   0
 .../themes/example/layouts/Developers.html    |   0
 .../themes/example/layouts/News.html          |   0
 .../themes/example/layouts/Products.html      |   0
 .../themes/example/layouts/Support.html       |   0
 .../themes/example/layouts/Welcome.html       |   0
 .../themes/example/layouts/icon_intro.png     | Bin
 .../themes/example/layouts/mainLayout.html    |   0
 .../themes/example/styles.css                 |   0
 .../themes/reservr/styles.css                 |   0
 WebContent/reservr.html                       |   4 ++--
 build/bin/compile-gwt-components              |   8 +++----
 build/bin/compile-gwt-components.bat          |   4 ++--
 .../terminal/gwt/client/ui/ICustomLayout.java |   2 +-
 .../gwt/public/default/table/table.css        |   2 +-
 .../gwt/server/ApplicationServlet.java        |   4 ++--
 25 files changed, 25 insertions(+), 25 deletions(-)
 rename WebContent/{ITK-INF => ITMILL}/themes/demo/layouts/featurebrowser-mainlayout.html (100%)
 rename WebContent/{ITK-INF => ITMILL}/themes/demo/layouts/img/header.png (100%)
 rename WebContent/{ITK-INF => ITMILL}/themes/demo/layouts/img/hide_properties.png (100%)
 rename WebContent/{ITK-INF => ITMILL}/themes/demo/layouts/img/m_bg.png (100%)
 rename WebContent/{ITK-INF => ITMILL}/themes/demo/layouts/img/show_properties.png (100%)
 rename WebContent/{ITK-INF => ITMILL}/themes/demo/layouts/img/tab_handle.png (100%)
 rename WebContent/{ITK-INF => ITMILL}/themes/demo/styles.css (100%)
 rename WebContent/{ITK-INF => ITMILL}/themes/example/layouts/Contact.html (100%)
 rename WebContent/{ITK-INF => ITMILL}/themes/example/layouts/Developers.html (100%)
 rename WebContent/{ITK-INF => ITMILL}/themes/example/layouts/News.html (100%)
 rename WebContent/{ITK-INF => ITMILL}/themes/example/layouts/Products.html (100%)
 rename WebContent/{ITK-INF => ITMILL}/themes/example/layouts/Support.html (100%)
 rename WebContent/{ITK-INF => ITMILL}/themes/example/layouts/Welcome.html (100%)
 rename WebContent/{ITK-INF => ITMILL}/themes/example/layouts/icon_intro.png (100%)
 rename WebContent/{ITK-INF => ITMILL}/themes/example/layouts/mainLayout.html (100%)
 rename WebContent/{ITK-INF => ITMILL}/themes/example/styles.css (100%)
 rename WebContent/{ITK-INF => ITMILL}/themes/reservr/styles.css (100%)

diff --git a/Hosted Mode Browser Linux.launch b/Hosted Mode Browser Linux.launch
index 0c02b9ebd2..55460ba6e4 100644
--- a/Hosted Mode Browser Linux.launch	
+++ b/Hosted Mode Browser Linux.launch	
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/tk-trunk/build/gwt/gwt/gwt-dev-linux.jar"/>
+<listEntry value="/tk-trunk"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
+<listEntry value="4"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
 <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
diff --git a/Hosted Mode Browser Mac.launch b/Hosted Mode Browser Mac.launch
index 71946f5405..cd912055c6 100644
--- a/Hosted Mode Browser Mac.launch	
+++ b/Hosted Mode Browser Mac.launch	
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#10;&amp;lt;javaProject name=&amp;quot;tk-trunk&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/tk-trunk"/>
+</listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
 </listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#10;&amp;lt;javaProject name=&amp;quot;tk-trunk&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
 <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;GwtClient&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/build/gwt/gwt/gwt-user.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/build/gwt/gwt/gwt-dev-mac.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noserver -whitelist &quot;127.0.0.1  ^http[:][/][/]127[.]0[.]0[.]1[:]8080&quot; -logLevel ALL -out WebContents/gwt -style PRETTY  http://127.0.0.1:8080/tk/com.itmill.toolkit.terminal.gwt.Client/gwt-test.html"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noserver -whitelist &quot;127.0.0.1  ^http[:][/][/]127[.]0[.]0[.]1[:]8080&quot; -logLevel ALL -out WebContents/gwt -style PRETTY  http://127.0.0.1:8080/tk-trunk/TestBench/"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tk-trunk"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/tk-trunk"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread -Xms300M -Xmx512M"/>
 </launchConfiguration>
diff --git a/WebContent/ITK-INF/themes/demo/layouts/featurebrowser-mainlayout.html b/WebContent/ITMILL/themes/demo/layouts/featurebrowser-mainlayout.html
similarity index 100%
rename from WebContent/ITK-INF/themes/demo/layouts/featurebrowser-mainlayout.html
rename to WebContent/ITMILL/themes/demo/layouts/featurebrowser-mainlayout.html
diff --git a/WebContent/ITK-INF/themes/demo/layouts/img/header.png b/WebContent/ITMILL/themes/demo/layouts/img/header.png
similarity index 100%
rename from WebContent/ITK-INF/themes/demo/layouts/img/header.png
rename to WebContent/ITMILL/themes/demo/layouts/img/header.png
diff --git a/WebContent/ITK-INF/themes/demo/layouts/img/hide_properties.png b/WebContent/ITMILL/themes/demo/layouts/img/hide_properties.png
similarity index 100%
rename from WebContent/ITK-INF/themes/demo/layouts/img/hide_properties.png
rename to WebContent/ITMILL/themes/demo/layouts/img/hide_properties.png
diff --git a/WebContent/ITK-INF/themes/demo/layouts/img/m_bg.png b/WebContent/ITMILL/themes/demo/layouts/img/m_bg.png
similarity index 100%
rename from WebContent/ITK-INF/themes/demo/layouts/img/m_bg.png
rename to WebContent/ITMILL/themes/demo/layouts/img/m_bg.png
diff --git a/WebContent/ITK-INF/themes/demo/layouts/img/show_properties.png b/WebContent/ITMILL/themes/demo/layouts/img/show_properties.png
similarity index 100%
rename from WebContent/ITK-INF/themes/demo/layouts/img/show_properties.png
rename to WebContent/ITMILL/themes/demo/layouts/img/show_properties.png
diff --git a/WebContent/ITK-INF/themes/demo/layouts/img/tab_handle.png b/WebContent/ITMILL/themes/demo/layouts/img/tab_handle.png
similarity index 100%
rename from WebContent/ITK-INF/themes/demo/layouts/img/tab_handle.png
rename to WebContent/ITMILL/themes/demo/layouts/img/tab_handle.png
diff --git a/WebContent/ITK-INF/themes/demo/styles.css b/WebContent/ITMILL/themes/demo/styles.css
similarity index 100%
rename from WebContent/ITK-INF/themes/demo/styles.css
rename to WebContent/ITMILL/themes/demo/styles.css
diff --git a/WebContent/ITK-INF/themes/example/layouts/Contact.html b/WebContent/ITMILL/themes/example/layouts/Contact.html
similarity index 100%
rename from WebContent/ITK-INF/themes/example/layouts/Contact.html
rename to WebContent/ITMILL/themes/example/layouts/Contact.html
diff --git a/WebContent/ITK-INF/themes/example/layouts/Developers.html b/WebContent/ITMILL/themes/example/layouts/Developers.html
similarity index 100%
rename from WebContent/ITK-INF/themes/example/layouts/Developers.html
rename to WebContent/ITMILL/themes/example/layouts/Developers.html
diff --git a/WebContent/ITK-INF/themes/example/layouts/News.html b/WebContent/ITMILL/themes/example/layouts/News.html
similarity index 100%
rename from WebContent/ITK-INF/themes/example/layouts/News.html
rename to WebContent/ITMILL/themes/example/layouts/News.html
diff --git a/WebContent/ITK-INF/themes/example/layouts/Products.html b/WebContent/ITMILL/themes/example/layouts/Products.html
similarity index 100%
rename from WebContent/ITK-INF/themes/example/layouts/Products.html
rename to WebContent/ITMILL/themes/example/layouts/Products.html
diff --git a/WebContent/ITK-INF/themes/example/layouts/Support.html b/WebContent/ITMILL/themes/example/layouts/Support.html
similarity index 100%
rename from WebContent/ITK-INF/themes/example/layouts/Support.html
rename to WebContent/ITMILL/themes/example/layouts/Support.html
diff --git a/WebContent/ITK-INF/themes/example/layouts/Welcome.html b/WebContent/ITMILL/themes/example/layouts/Welcome.html
similarity index 100%
rename from WebContent/ITK-INF/themes/example/layouts/Welcome.html
rename to WebContent/ITMILL/themes/example/layouts/Welcome.html
diff --git a/WebContent/ITK-INF/themes/example/layouts/icon_intro.png b/WebContent/ITMILL/themes/example/layouts/icon_intro.png
similarity index 100%
rename from WebContent/ITK-INF/themes/example/layouts/icon_intro.png
rename to WebContent/ITMILL/themes/example/layouts/icon_intro.png
diff --git a/WebContent/ITK-INF/themes/example/layouts/mainLayout.html b/WebContent/ITMILL/themes/example/layouts/mainLayout.html
similarity index 100%
rename from WebContent/ITK-INF/themes/example/layouts/mainLayout.html
rename to WebContent/ITMILL/themes/example/layouts/mainLayout.html
diff --git a/WebContent/ITK-INF/themes/example/styles.css b/WebContent/ITMILL/themes/example/styles.css
similarity index 100%
rename from WebContent/ITK-INF/themes/example/styles.css
rename to WebContent/ITMILL/themes/example/styles.css
diff --git a/WebContent/ITK-INF/themes/reservr/styles.css b/WebContent/ITMILL/themes/reservr/styles.css
similarity index 100%
rename from WebContent/ITK-INF/themes/reservr/styles.css
rename to WebContent/ITMILL/themes/reservr/styles.css
diff --git a/WebContent/reservr.html b/WebContent/reservr.html
index 20db089d83..ac1270fdf5 100644
--- a/WebContent/reservr.html
+++ b/WebContent/reservr.html
@@ -8,8 +8,8 @@
 		};
 	</script>
 	<script src="http://maps.google.com/maps?file=api&amp;v=2" type="text/javascript"></script>
-	<script language='javascript' src='ITK-INF/widgetsets/com.itmill.toolkit.demo.reservation.gwt.WidgetSet/com.itmill.toolkit.demo.reservation.gwt.WidgetSet.nocache.js'></script>
-	<link REL="stylesheet" TYPE="text/css" HREF="ITK-INF/themes/reservr/styles.css">
+	<script language='javascript' src='ITMILL/widgetsets/com.itmill.toolkit.demo.reservation.gwt.WidgetSet/com.itmill.toolkit.demo.reservation.gwt.WidgetSet.nocache.js'></script>
+	<link REL="stylesheet" TYPE="text/css" HREF="ITMILL/themes/reservr/styles.css">
 </head>
 <body>
 	<iframe id="__gwt_historyFrame" style="width:0;height:0;border:0"></iframe>
diff --git a/build/bin/compile-gwt-components b/build/bin/compile-gwt-components
index d6130d5e88..887aa0265c 100755
--- a/build/bin/compile-gwt-components
+++ b/build/bin/compile-gwt-components
@@ -13,7 +13,7 @@ else
 	PLATFORM="linux"
 fi
 
-rm -r ../../WebContent/ITK-INF/widgetsets/com.itmill.toolkit.terminal.gwt.DefaultWidgetSet/*
-java $JVMVARS -cp "../../src:../gwt/gwt/gwt-user.jar:../gwt/gwt/gwt-dev-$PLATFORM.jar" com.google.gwt.dev.GWTCompiler -out "../../WebContent/ITK-INF/widgetsets" "$@" com.itmill.toolkit.terminal.gwt.DefaultWidgetSet -style DETAILED;
-java $JVMVARS -cp "../../src:../gwt/gwt/gwt-user.jar:../gwt/gwt/gwt-dev-$PLATFORM.jar" com.google.gwt.dev.GWTCompiler -out "../../WebContent/ITK-INF/widgetsets" "$@" com.itmill.toolkit.demo.colorpicker.gwt.WidgetSet -style DETAILED;
-java $JVMVARS -cp "../../src:../gwt/gwt/gwt-user.jar:../../lib/reservr/googlemaps_gwt.jar:../gwt/gwt/gwt-dev-$PLATFORM.jar" com.google.gwt.dev.GWTCompiler -out "../../WebContent/ITK-INF/widgetsets" "$@" com.itmill.toolkit.demo.reservation.gwt.WidgetSet -style DETAILED;
+rm -r ../../WebContent/ITMILL/widgetsets/*
+java $JVMVARS -cp "../../src:../gwt/gwt/gwt-user.jar:../gwt/gwt/gwt-dev-$PLATFORM.jar" com.google.gwt.dev.GWTCompiler -out "../../WebContent/ITMILL/widgetsets" "$@" com.itmill.toolkit.terminal.gwt.DefaultWidgetSet -style DETAILED;
+java $JVMVARS -cp "../../src:../gwt/gwt/gwt-user.jar:../gwt/gwt/gwt-dev-$PLATFORM.jar" com.google.gwt.dev.GWTCompiler -out "../../WebContent/ITMILL/widgetsets" "$@" com.itmill.toolkit.demo.colorpicker.gwt.WidgetSet -style DETAILED;
+java $JVMVARS -cp "../../src:../gwt/gwt/gwt-user.jar:../../lib/reservr/googlemaps_gwt.jar:../gwt/gwt/gwt-dev-$PLATFORM.jar" com.google.gwt.dev.GWTCompiler -out "../../WebContent/ITMILL/widgetsets" "$@" com.itmill.toolkit.demo.reservation.gwt.WidgetSet -style DETAILED;
diff --git a/build/bin/compile-gwt-components.bat b/build/bin/compile-gwt-components.bat
index fb5a2c077e..9d034fd6d8 100644
--- a/build/bin/compile-gwt-components.bat
+++ b/build/bin/compile-gwt-components.bat
@@ -1,2 +1,2 @@
-@java -cp "%~dp0\../../src;%~dp0\bin;%~dp0\../gwt/gwt/gwt-user.jar;%~dp0\../gwt/gwt/gwt-dev-windows.jar" com.google.gwt.dev.GWTCompiler -out "%~dp0\../../WebContent/ITK-INF/widgetsets" %* com.itmill.toolkit.terminal.gwt.DefaultWidgetSet
-@java -cp "%~dp0\../../src;%~dp0\bin;%~dp0\../gwt/gwt/gwt-user.jar;%~dp0\../../lib/reservr/googlemaps_gwt.jar;%~dp0\../gwt/gwt/gwt-dev-windows.jar" com.google.gwt.dev.GWTCompiler -out "%~dp0\../../WebContent/ITK-INF/widgetsets" %* com.itmill.toolkit.demo.reservation.gwt.WidgetSet
\ No newline at end of file
+@java -cp "%~dp0\../../src;%~dp0\bin;%~dp0\../gwt/gwt/gwt-user.jar;%~dp0\../gwt/gwt/gwt-dev-windows.jar" com.google.gwt.dev.GWTCompiler -out "%~dp0\../../WebContent/ITMILL/widgetsets" %* com.itmill.toolkit.terminal.gwt.DefaultWidgetSet
+@java -cp "%~dp0\../../src;%~dp0\bin;%~dp0\../gwt/gwt/gwt-user.jar;%~dp0\../../lib/reservr/googlemaps_gwt.jar;%~dp0\../gwt/gwt/gwt-dev-windows.jar" com.google.gwt.dev.GWTCompiler -out "%~dp0\../../WebContent/ITMILL/widgetsets" %* com.itmill.toolkit.demo.reservation.gwt.WidgetSet
\ No newline at end of file
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java
index ba143440cf..135a20cce7 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java
@@ -153,7 +153,7 @@ public class ICustomLayout extends ComplexPanel implements Paintable, Container
 		while (parent != null && !(parent instanceof IView))
 			parent = parent.getParent();
 		if (parent != null && ((IView) parent).getTheme() != null) {
-			prefixImgSrcs(getElement(), "../ITK-INF/themes/"
+			prefixImgSrcs(getElement(), "../ITMILL/themes/"
 					+ ((IView) parent).getTheme() + "/layouts/");
 		} else {
 			throw (new IllegalStateException(
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/table/table.css b/src/com/itmill/toolkit/terminal/gwt/public/default/table/table.css
index 914c469958..bd06ccb010 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/table/table.css
+++ b/src/com/itmill/toolkit/terminal/gwt/public/default/table/table.css
@@ -167,5 +167,5 @@
 /* IE specific styles */
 * html .i-table-scrollposition {
 	background: transparent;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../ITK-INF/widgetsets/com.itmill.toolkit.terminal.gwt.DefaultWidgetSet/default/table/img/scroll-position-bg.png", sizingMethod="scale");
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../ITMILL/widgetsets/com.itmill.toolkit.terminal.gwt.DefaultWidgetSet/default/table/img/scroll-position-bg.png", sizingMethod="scale");
 }
\ No newline at end of file
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
index a11cb67de0..9f574c8878 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -133,14 +133,14 @@ public class ApplicationServlet extends HttpServlet {
 
 	private static final String AJAX_UIDL_URI = "/UIDL/";
 
-	static final String THEME_DIRECTORY_PATH = "ITK-INF/themes/";
+	static final String THEME_DIRECTORY_PATH = "ITMILL/themes/";
 
 	// 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/";
+	static final String WIDGETSET_DIRECTORY_PATH = "ITMILL/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
-- 
2.39.5