Demo and QuickStart fixes: use UTF-8 encoding for source files (#2544) and include...

svn changeset:6763/svn branch:trunk

diff --git a/build/build.xml b/build/build.xml
index dbef9fded9e9a2e1a9ffdf3b0e22e00e81f0485e..dc7cb03f5be98c9ce6539dcbc71ec647f541537a 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -458,6 +458,7 @@
                                <include name="eclipse-project" />
                                <include name="eclipse*launch" />
                                <include name="build-widgetset.xml" />
+                               <include name="eclipse-org.eclipse.core.resources.prefs" />
                        </fileset>
                </copy>
                <move file="${output-dir}/build-widgetset.xml" tofile="${output-dir}/WebContent/doc/example-source/build-widgetset.xml" />
@@ -465,6 +466,8 @@
                <move file="${output-dir}/eclipse-project" tofile="${output-dir}/.project" />
                <move file="${output-dir}/eclipse-IT Mill Toolkit Hosted Mode-launch" tofile="${output-dir}/IT Mill Toolkit Hosted Mode.launch" />
                <move file="${output-dir}/eclipse-IT Mill Toolkit Web Mode-launch" tofile="${output-dir}/IT Mill Toolkit Web Mode.launch" />
+               <mkdir dir="${output-dir}/.settings" />
+               <move file="${output-dir}/eclipse-org.eclipse.core.resources.prefs" tofile="${output-dir}/.settings/org.eclipse.core.resources.prefs" />
                <if>
                        <equals arg1="${package-platform}" arg2="windows" />
                        <then>

diff --git a/build/package/eclipse-IT Mill Toolkit Web Mode-launch b/build/package/eclipse-IT Mill Toolkit Web Mode-launch
index 2c60ed49d35a7f70c87011f557f58962c5c95791..ab9efe4b1d9454d74314fdf58ac2ea4e6f62546f 100644 (file)
--- a/build/package/eclipse-IT Mill Toolkit Web Mode-launch
+++ b/build/package/eclipse-IT Mill Toolkit Web Mode-launch
@@ -12,6 +12,12 @@
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
 </listAttribute>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;itmill-toolkit-examples&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; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;itmill-toolkit-examples&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/itmill-toolkit-examples/WebContent/WEB-INF/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.itmill.toolkit.launcher.ITMillToolkitWebMode"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="<eclipse-workspace-name></eclipse-workspace-name>"/>
 </launchConfiguration>

diff --git a/build/package/eclipse-org.eclipse.core.resources.prefs b/build/package/eclipse-org.eclipse.core.resources.prefs
new file mode 100644 (file)
index 0000000..bedbb5b
--- /dev/null
+++ b/build/package/eclipse-org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+#Mon Feb 09 04:14:03 EET 2009
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

diff --git a/build/package/start.bat b/build/package/start.bat
index 6bb33d5de1d24e5679998bd1184157fcefa29244..004df312510c356e8243dced35826c2e647a7bad 100644 (file)
--- a/build/package/start.bat
+++ b/build/package/start.bat
@@ -1 +1 @@
-@java -cp "WebContent\demo\lib\jetty\jetty-6.1.7.jar;WebContent\demo\lib\jetty\jetty-util-6.1.7.jar;WebContent\demo\lib\jetty\servlet-api-2.5-6.1.7.jar;WebContent\WEB-INF\classes" com.itmill.toolkit.launcher.ITMillToolkitDesktopMode\r
+@java -cp "WebContent\demo\lib\jetty\jetty-6.1.7.jar;WebContent\demo\lib\jetty\jetty-util-6.1.7.jar;WebContent\demo\lib\jetty\servlet-api-2.5-6.1.7.jar;WebContent\WEB-INF\classes;WebContent\WEB-INF\src" com.itmill.toolkit.launcher.ITMillToolkitDesktopMode\r

diff --git a/build/package/start.sh b/build/package/start.sh
index 95b3d60beedb64374e0b0fe0fe7e368573ede840..448d3184155a50ea839264a3015b54101eedb5dd 100644 (file)
--- a/build/package/start.sh
+++ b/build/package/start.sh
@@ -4,4 +4,4 @@ if [ "$1" != "" ] ; then
   cd $1
 fi
 
-java -cp WebContent/demo/lib/jetty/jetty-6.1.7.jar:WebContent/demo/lib/jetty/jetty-util-6.1.7.jar:WebContent/demo/lib/jetty/servlet-api-2.5-6.1.7.jar:WebContent/WEB-INF/classes com.itmill.toolkit.launcher.ITMillToolkitDesktopMode
+java -cp WebContent/demo/lib/jetty/jetty-6.1.7.jar:WebContent/demo/lib/jetty/jetty-util-6.1.7.jar:WebContent/demo/lib/jetty/servlet-api-2.5-6.1.7.jar:WebContent/WEB-INF/classes:WebContent/WEB-INF/src com.itmill.toolkit.launcher.ITMillToolkitDesktopMode