Browse Source
Refactored WebContent/ITK-INF to WebContent/ITMILL
svn changeset:2463/svn branch:trunktags/6.7.0.beta1
Jani Laakso
16 years ago
25 changed files with 25 additions and 25 deletions
+ 3
- 3
Hosted Mode Browser Linux.launch
View File
| @@ -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"/> | |||
+ 10
- 10
Hosted Mode Browser Mac.launch
View File
| @@ -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> | |||
WebContent/ITK-INF/themes/demo/layouts/featurebrowser-mainlayout.html → WebContent/ITMILL/themes/demo/layouts/featurebrowser-mainlayout.html
View File
WebContent/ITK-INF/themes/demo/layouts/img/header.png → WebContent/ITMILL/themes/demo/layouts/img/header.png
View File
WebContent/ITK-INF/themes/demo/layouts/img/hide_properties.png → WebContent/ITMILL/themes/demo/layouts/img/hide_properties.png
View File
WebContent/ITK-INF/themes/demo/layouts/img/m_bg.png → WebContent/ITMILL/themes/demo/layouts/img/m_bg.png
View File
WebContent/ITK-INF/themes/demo/layouts/img/show_properties.png → WebContent/ITMILL/themes/demo/layouts/img/show_properties.png
View File
WebContent/ITK-INF/themes/demo/layouts/img/tab_handle.png → WebContent/ITMILL/themes/demo/layouts/img/tab_handle.png
View File
WebContent/ITK-INF/themes/demo/styles.css → WebContent/ITMILL/themes/demo/styles.css
View File
WebContent/ITK-INF/themes/example/layouts/Contact.html → WebContent/ITMILL/themes/example/layouts/Contact.html
View File
WebContent/ITK-INF/themes/example/layouts/Developers.html → WebContent/ITMILL/themes/example/layouts/Developers.html
View File
WebContent/ITK-INF/themes/example/layouts/News.html → WebContent/ITMILL/themes/example/layouts/News.html
View File
WebContent/ITK-INF/themes/example/layouts/Products.html → WebContent/ITMILL/themes/example/layouts/Products.html
View File
WebContent/ITK-INF/themes/example/layouts/Support.html → WebContent/ITMILL/themes/example/layouts/Support.html
View File
WebContent/ITK-INF/themes/example/layouts/Welcome.html → WebContent/ITMILL/themes/example/layouts/Welcome.html
View File
WebContent/ITK-INF/themes/example/layouts/icon_intro.png → WebContent/ITMILL/themes/example/layouts/icon_intro.png
View File
WebContent/ITK-INF/themes/example/layouts/mainLayout.html → WebContent/ITMILL/themes/example/layouts/mainLayout.html
View File
WebContent/ITK-INF/themes/example/styles.css → WebContent/ITMILL/themes/example/styles.css
View File
WebContent/ITK-INF/themes/reservr/styles.css → WebContent/ITMILL/themes/reservr/styles.css
View File
+ 2
- 2
WebContent/reservr.html
View File
| @@ -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> | |||
+ 4
- 4
build/bin/compile-gwt-components
View File
| @@ -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; | |||
+ 2
- 2
build/bin/compile-gwt-components.bat
View File
| @@ -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 | |||
| @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 | |||
+ 1
- 1
src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java
View File
| @@ -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( | |||
+ 1
- 1
src/com/itmill/toolkit/terminal/gwt/public/default/table/table.css
View File
| @@ -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"); | |||
| } | |||
+ 2
- 2
src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
View File
| @@ -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 | |||
Loading…