diff options
| -rw-r--r-- | Hosted Mode Browser Linux.launch | 6 | ||||
| -rw-r--r-- | Hosted Mode Browser Mac.launch | 20 | ||||
| -rw-r--r-- | WebContent/ITMILL/themes/demo/layouts/featurebrowser-mainlayout.html (renamed from WebContent/ITK-INF/themes/demo/layouts/featurebrowser-mainlayout.html) | 0 | ||||
| -rw-r--r-- | WebContent/ITMILL/themes/demo/layouts/img/header.png (renamed from WebContent/ITK-INF/themes/demo/layouts/img/header.png) | bin | 2389 -> 2389 bytes | |||
| -rw-r--r-- | WebContent/ITMILL/themes/demo/layouts/img/hide_properties.png (renamed from WebContent/ITK-INF/themes/demo/layouts/img/hide_properties.png) | bin | 360 -> 360 bytes | |||
| -rw-r--r-- | WebContent/ITMILL/themes/demo/layouts/img/m_bg.png (renamed from WebContent/ITK-INF/themes/demo/layouts/img/m_bg.png) | bin | 4071 -> 4071 bytes | |||
| -rw-r--r-- | WebContent/ITMILL/themes/demo/layouts/img/show_properties.png (renamed from WebContent/ITK-INF/themes/demo/layouts/img/show_properties.png) | bin | 829 -> 829 bytes | |||
| -rw-r--r-- | WebContent/ITMILL/themes/demo/layouts/img/tab_handle.png (renamed from WebContent/ITK-INF/themes/demo/layouts/img/tab_handle.png) | bin | 308 -> 308 bytes | |||
| -rw-r--r-- | WebContent/ITMILL/themes/demo/styles.css (renamed from WebContent/ITK-INF/themes/demo/styles.css) | 0 | ||||
| -rw-r--r-- | WebContent/ITMILL/themes/example/layouts/Contact.html (renamed from WebContent/ITK-INF/themes/example/layouts/Contact.html) | 0 | ||||
| -rw-r--r-- | WebContent/ITMILL/themes/example/layouts/Developers.html (renamed from WebContent/ITK-INF/themes/example/layouts/Developers.html) | 0 | ||||
| -rw-r--r-- | WebContent/ITMILL/themes/example/layouts/News.html (renamed from WebContent/ITK-INF/themes/example/layouts/News.html) | 0 | ||||
| -rw-r--r-- | WebContent/ITMILL/themes/example/layouts/Products.html (renamed from WebContent/ITK-INF/themes/example/layouts/Products.html) | 0 | ||||
| -rw-r--r-- | WebContent/ITMILL/themes/example/layouts/Support.html (renamed from WebContent/ITK-INF/themes/example/layouts/Support.html) | 0 | ||||
| -rw-r--r-- | WebContent/ITMILL/themes/example/layouts/Welcome.html (renamed from WebContent/ITK-INF/themes/example/layouts/Welcome.html) | 0 | ||||
| -rw-r--r-- | WebContent/ITMILL/themes/example/layouts/icon_intro.png (renamed from WebContent/ITK-INF/themes/example/layouts/icon_intro.png) | bin | 2465 -> 2465 bytes | |||
| -rw-r--r-- | WebContent/ITMILL/themes/example/layouts/mainLayout.html (renamed from WebContent/ITK-INF/themes/example/layouts/mainLayout.html) | 0 | ||||
| -rw-r--r-- | WebContent/ITMILL/themes/example/styles.css (renamed from WebContent/ITK-INF/themes/example/styles.css) | 0 | ||||
| -rw-r--r-- | WebContent/ITMILL/themes/reservr/styles.css (renamed from WebContent/ITK-INF/themes/reservr/styles.css) | 0 | ||||
| -rw-r--r-- | WebContent/reservr.html | 4 | ||||
| -rwxr-xr-x | build/bin/compile-gwt-components | 8 | ||||
| -rw-r--r-- | build/bin/compile-gwt-components.bat | 4 | ||||
| -rw-r--r-- | src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java | 2 | ||||
| -rw-r--r-- | src/com/itmill/toolkit/terminal/gwt/public/default/table/table.css | 2 | ||||
| -rw-r--r-- | src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java | 4 |
25 files changed, 25 insertions, 25 deletions
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="<?xml version="1.0" encoding="UTF-8"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;javaProject name=&quot;tk-trunk&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;default/&gt;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/> -<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="<?xml version="1.0" encoding="UTF-8"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;javaProject name=&quot;tk-trunk&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;default/&gt;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/> <listAttribute key="org.eclipse.jdt.launching.CLASSPATH"> <listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="GwtClient" path="1" type="4"/> "/> <listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/tk-trunk/build/gwt/gwt/gwt-user.jar" path="3" type="2"/> "/> <listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/tk-trunk/build/gwt/gwt/gwt-dev-mac.jar" path="3" type="2"/> "/> <listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/tk-trunk/src" path="3" type="2"/> "/> </listAttribute> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noserver -whitelist "127.0.0.1 ^http[:][/][/]127[.]0[.]0[.]1[:]8080" -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 "127.0.0.1 ^http[:][/][/]127[.]0[.]0[.]1[:]8080" -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 index ee66b4919e..ee66b4919e 100644 --- a/WebContent/ITK-INF/themes/demo/layouts/featurebrowser-mainlayout.html +++ b/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 Binary files differindex bf64ac4e17..bf64ac4e17 100644 --- a/WebContent/ITK-INF/themes/demo/layouts/img/header.png +++ b/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 Binary files differindex 0069db75d9..0069db75d9 100644 --- a/WebContent/ITK-INF/themes/demo/layouts/img/hide_properties.png +++ b/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 Binary files differindex 2d37f7ffae..2d37f7ffae 100644 --- a/WebContent/ITK-INF/themes/demo/layouts/img/m_bg.png +++ b/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 Binary files differindex 6427452419..6427452419 100644 --- a/WebContent/ITK-INF/themes/demo/layouts/img/show_properties.png +++ b/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 Binary files differindex ed0c34cabb..ed0c34cabb 100644 --- a/WebContent/ITK-INF/themes/demo/layouts/img/tab_handle.png +++ b/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 index 735fa83e3c..735fa83e3c 100644 --- a/WebContent/ITK-INF/themes/demo/styles.css +++ b/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 index a37425078c..a37425078c 100644 --- a/WebContent/ITK-INF/themes/example/layouts/Contact.html +++ b/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 index 50e054a4f4..50e054a4f4 100644 --- a/WebContent/ITK-INF/themes/example/layouts/Developers.html +++ b/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 index f6ab7c7f7f..f6ab7c7f7f 100644 --- a/WebContent/ITK-INF/themes/example/layouts/News.html +++ b/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 index 1b9b74c128..1b9b74c128 100644 --- a/WebContent/ITK-INF/themes/example/layouts/Products.html +++ b/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 index aca7e2a66d..aca7e2a66d 100644 --- a/WebContent/ITK-INF/themes/example/layouts/Support.html +++ b/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 index 964753da5b..964753da5b 100644 --- a/WebContent/ITK-INF/themes/example/layouts/Welcome.html +++ b/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 Binary files differindex 032712985c..032712985c 100644 --- a/WebContent/ITK-INF/themes/example/layouts/icon_intro.png +++ b/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 index 5679ecbc62..5679ecbc62 100644 --- a/WebContent/ITK-INF/themes/example/layouts/mainLayout.html +++ b/WebContent/ITMILL/themes/example/layouts/mainLayout.html diff --git a/WebContent/ITK-INF/themes/example/styles.css b/WebContent/ITMILL/themes/example/styles.css index e69de29bb2..e69de29bb2 100644 --- a/WebContent/ITK-INF/themes/example/styles.css +++ b/WebContent/ITMILL/themes/example/styles.css diff --git a/WebContent/ITK-INF/themes/reservr/styles.css b/WebContent/ITMILL/themes/reservr/styles.css index 569fcaf8c6..569fcaf8c6 100644 --- a/WebContent/ITK-INF/themes/reservr/styles.css +++ b/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&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 |
