Refactoring package files.

svn changeset:2558/svn branch:trunk

diff --git a/build/package/build.xml b/build/package/build.xml
new file mode 100644 (file)
index 0000000..29c594f
--- /dev/null
+++ b/build/package/build.xml
@@ -0,0 +1,80 @@
+<!--\r
+\r
+Creates two packages:\r
+\r
+1. WAR package that can be deployed to application server or servlet container.\r
+\r
+2. JAR package which requires JRE only, includes embedded web server.\r
+\r
+-->\r
+<project name="itmill-toolkit-examples" basedir="." default="package">\r
+\r
+       <target name="init">\r
+               <echo message="Creating two packages:" />\r
+               <echo message="1. WAR package that can be deployed to application server or servlet container." />\r
+               <echo message="2. JAR package which requires JRE only, includes embedded web server." />\r
+               <property name="server.main.class" value="com.itmill.toolkit.demo.DesktopServer" />\r
+               <property name="webserver.jar" value="WebServer/winstone-0.9.9.jar" />\r
+               <property file="build.properties" />\r
+               <mkdir dir="build" />\r
+       </target>\r
+\r
+       <target name="clean">\r
+               <delete dir="build" />\r
+       </target>\r
+\r
+       <!-- Compiles your Toolkit application -->\r
+       <target name="compile" depends="init">\r
+               <echo message="Compiling Toolkit application sources." />\r
+               <path id="compile.class.path">\r
+                       <fileset dir="WebContent">\r
+                               <include name="WEB-INF/lib/*.jar" />\r
+                       </fileset>\r
+                       <fileset dir="WebServer">\r
+                               <include name="*.jar" />\r
+                       </fileset>\r
+               </path>\r
+\r
+               <javac srcdir="WebContent/src" destdir="WebContent/WEB-INF/classes" classpathref="compile.class.path">\r
+               </javac>\r
+               <javac srcdir="WebServer/src" destdir="WebServer/classes" classpathref="compile.class.path">\r
+               </javac>\r
+       </target>\r
+\r
+       <!-- Creates Toolkit WAR package (requires Application Server / Servlet Container)-->\r
+       <target name="war-package" depends="compile">\r
+               <echo message="Creating WAR package." />\r
+               <war warfile="build/${ant.project.name}.war" webxml="WebContent/WEB-INF/web.xml">\r
+                       <fileset dir="WebContent">\r
+                               <include name="**/*" />\r
+                               <exclude name="WEB-INF/web.xml" />\r
+                       </fileset>\r
+               </war>\r
+       </target>\r
+\r
+       <!-- Creates Toolkit JAR package that contains embedded WebServer -->\r
+       <target name="jar-package" depends="war-package">\r
+               <echo message="Creating JAR package." />\r
+               <copy tofile="build/WebServer-temp/embedded.war" file="build/${ant.project.name}.war" />\r
+               <unjar src="${webserver.jar}" dest="build/WebServer-temp" />\r
+               <manifest file="build/WebServer-temp/META-INF/MANIFEST.MF">\r
+                       <attribute name="Main-Class" value="${server.main.class}" />\r
+               </manifest>\r
+               <copy todir="build/WebServer-temp">\r
+                       <fileset dir="WebServer/classes">\r
+                               <include name="**/*" />\r
+                       </fileset>\r
+               </copy>\r
+       </target>\r
+\r
+       <!-- Creates both Toolkit WAR and JAR packages -->\r
+       <target name="package" depends="jar-package">\r
+               <jar destfile="build/${ant.project.name}.jar" basedir="build/WebServer-temp" manifest="build/WebServer-temp/META-INF/MANIFEST.MF" />\r
+               <echo message="Created WAR-file to build/${ant.project.name}.war." />\r
+               <echo message="Deploy this file to your application server or servlet container." />\r
+               <echo message=" " />\r
+               <echo message="Created JAR-file to build/${ant.project.name}.jar" />\r
+               <echo message="Run your application using command like: java -jar build/${ant.project.name}.jar" />\r
+       </target>\r
+\r
+</project>\r

diff --git a/build/package/classpath-linux b/build/package/classpath-linux
new file mode 100644 (file)
index 0000000..15b5e6d
--- /dev/null
+++ b/build/package/classpath-linux
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="src" path="WebContent/src"/>
+       <classpathentry kind="lib" path="WebContent/WEB-INF/lib/itmill-toolkit-<version></version>.jar" sourcepath="WebContent/WEB-INF/lib/itmill-toolkit-src-<version></version>.jar"/>
+       <classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-fileupload-1.2.jar" />
+       <classpathentry kind="lib" path="gwt/gwt-servlet.jar" />
+       <classpathentry kind="lib" path="gwt/gwt-user.jar" />
+       <classpathentry kind="lib" path="gwt/gwt-dev-linux.jar"/>
+       <classpathentry kind="lib" path="lib/demo/reservr/googlemaps_gwt.jar" />
+       <classpathentry kind="lib" path="lib/jetty/jetty-6.1.5.jar"/>
+       <classpathentry kind="lib" path="lib/jetty/jetty-util-6.1.5.jar"/>
+       <classpathentry kind="lib" path="lib/jetty/servlet-api-2.5-6.1.5.jar"/>
+       <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
+</classpath>

diff --git a/build/package/classpath-mac b/build/package/classpath-mac
new file mode 100644 (file)
index 0000000..62b2763
--- /dev/null
+++ b/build/package/classpath-mac
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="src" path="WebContent/src"/>
+       <classpathentry kind="lib" path="WebContent/WEB-INF/lib/itmill-toolkit-<version></version>.jar" sourcepath="WebContent/WEB-INF/lib/itmill-toolkit-src-<version></version>.jar"/>
+       <classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-fileupload-1.2.jar" />
+       <classpathentry kind="lib" path="gwt/gwt-servlet.jar" />
+       <classpathentry kind="lib" path="gwt/gwt-user.jar" />
+       <classpathentry kind="lib" path="gwt/gwt-dev-mac.jar"/>
+       <classpathentry kind="lib" path="lib/demo/reservr/googlemaps_gwt.jar" />
+       <classpathentry kind="lib" path="lib/jetty/jetty-6.1.5.jar"/>
+       <classpathentry kind="lib" path="lib/jetty/jetty-util-6.1.5.jar"/>
+       <classpathentry kind="lib" path="lib/jetty/servlet-api-2.5-6.1.5.jar"/>
+       <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
+</classpath>

diff --git a/build/package/classpath-windows b/build/package/classpath-windows
new file mode 100644 (file)
index 0000000..42ff093
--- /dev/null
+++ b/build/package/classpath-windows
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="src" path="WebContent/src"/>
+       <classpathentry kind="lib" path="WebContent/WEB-INF/lib/itmill-toolkit-<version></version>.jar" sourcepath="WebContent/WEB-INF/lib/itmill-toolkit-src-<version></version>.jar"/>
+       <classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-fileupload-1.2.jar" />
+       <classpathentry kind="lib" path="gwt/gwt-servlet.jar" />
+       <classpathentry kind="lib" path="gwt/gwt-user.jar" />
+       <classpathentry kind="lib" path="gwt/gwt-dev-windows.jar"/>
+       <classpathentry kind="lib" path="lib/demo/reservr/googlemaps_gwt.jar" />
+       <classpathentry kind="lib" path="lib/jetty/jetty-6.1.5.jar"/>
+       <classpathentry kind="lib" path="lib/jetty/jetty-util-6.1.5.jar"/>
+       <classpathentry kind="lib" path="lib/jetty/servlet-api-2.5-6.1.5.jar"/>
+       <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
+</classpath>

diff --git a/build/package/project b/build/package/project
new file mode 100644 (file)
index 0000000..2ca2072
--- /dev/null
+++ b/build/package/project
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>itmill-toolkit-examples</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.jdt.core.javabuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.jdt.core.javanature</nature>
+               <nature>com.sysdeo.eclipse.tomcat.tomcatnature</nature>
+       </natures>
+</projectDescription>

diff --git a/build/package/start-demo.bat b/build/package/start-demo.bat
new file mode 100644 (file)
index 0000000..d6eb609
--- /dev/null
+++ b/build/package/start-demo.bat
@@ -0,0 +1 @@
+@java -cp "lib\itmill-5.0.0-alpha.jar;lib\jetty\jetty-6.1.5.jar;lib\jetty\jetty-util-6.1.5.jar;lib\jetty\servlet-api-2.5-6.1.5.jar;WebContent\WEB-INF\classes" com.itmill.toolkit.launcher.ITMillDesktopLaunch\r

diff --git a/build/package/start-demo.sh b/build/package/start-demo.sh
new file mode 100644 (file)
index 0000000..3a7b612
--- /dev/null
+++ b/build/package/start-demo.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+java -cp lib/jetty/jetty-6.1.5.jar:lib/jetty/jetty-util-6.1.5.jar:lib/jetty/servlet-api-2.5-6.1.5.jar:WebContent/WEB-INF/classes com.itmill.toolkit.launcher.ITMillDesktopLaunch

diff --git a/build/package/start-demo.txt b/build/package/start-demo.txt
new file mode 100644 (file)
index 0000000..b8433ae
--- /dev/null
+++ b/build/package/start-demo.txt
@@ -0,0 +1,15 @@
+Starting Toolkit demos\r
+\r
+\r
+1) Under Windows environment\r
+\r
+Doubleclick start-demo.bat\r
+\r
+\r
+2) Under Linux or OSX environment\r
+\r
+Open shell and execute "sh start-demo.sh"\r
+\r
+\r
+This starts an integrated Servlet Container which runs Toolkit demo\r
+applications. Your default web browser should be opened automatically.\r