From eb21a4612020a84738d61339e1c6cffbdd3f1df6 Mon Sep 17 00:00:00 2001
From: Jani Laakso <jani.laakso@itmill.com>
Date: Tue, 16 Oct 2007 07:32:46 +0000
Subject: [PATCH] Packaging related changes.

svn changeset:2518/svn branch:trunk
---
 build/VERSION                           |  2 +-
 build/workspace-eclipse/.classpath      | 13 ++++
 build/workspace-eclipse/.project        | 18 ++++++
 build/workspace-eclipse/build.xml       | 80 +++++++++++++++++++++++++
 ReleaseNotes.html => release-notes.html |  0
 5 files changed, 112 insertions(+), 1 deletion(-)
 create mode 100644 build/workspace-eclipse/.classpath
 create mode 100644 build/workspace-eclipse/.project
 create mode 100644 build/workspace-eclipse/build.xml
 rename ReleaseNotes.html => release-notes.html (100%)

diff --git a/build/VERSION b/build/VERSION
index 3ea5d68dce..85156983ae 100644
--- a/build/VERSION
+++ b/build/VERSION
@@ -1 +1 @@
-version=5.0.0-testing
+version=5.0.0-alpha
diff --git a/build/workspace-eclipse/.classpath b/build/workspace-eclipse/.classpath
new file mode 100644
index 0000000000..8d6914ec8a
--- /dev/null
+++ b/build/workspace-eclipse/.classpath
@@ -0,0 +1,13 @@
+<?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="lib/demo/reservr/googlemaps_gwt.jar" />
+	<classpathentry kind="src" path="WebServer/src"/>
+	<classpathentry kind="lib" path="WebServer/winstone-0.9.9.jar"/>
+	<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
+</classpath>
diff --git a/build/workspace-eclipse/.project b/build/workspace-eclipse/.project
new file mode 100644
index 0000000000..2ca2072634
--- /dev/null
+++ b/build/workspace-eclipse/.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/workspace-eclipse/build.xml b/build/workspace-eclipse/build.xml
new file mode 100644
index 0000000000..29c594f67b
--- /dev/null
+++ b/build/workspace-eclipse/build.xml
@@ -0,0 +1,80 @@
+<!--
+
+Creates two packages:
+
+1. WAR package that can be deployed to application server or servlet container.
+
+2. JAR package which requires JRE only, includes embedded web server.
+
+-->
+<project name="itmill-toolkit-examples" basedir="." default="package">
+
+	<target name="init">
+		<echo message="Creating two packages:" />
+		<echo message="1. WAR package that can be deployed to application server or servlet container." />
+		<echo message="2. JAR package which requires JRE only, includes embedded web server." />
+		<property name="server.main.class" value="com.itmill.toolkit.demo.DesktopServer" />
+		<property name="webserver.jar" value="WebServer/winstone-0.9.9.jar" />
+		<property file="build.properties" />
+		<mkdir dir="build" />
+	</target>
+
+	<target name="clean">
+		<delete dir="build" />
+	</target>
+
+	<!-- Compiles your Toolkit application -->
+	<target name="compile" depends="init">
+		<echo message="Compiling Toolkit application sources." />
+		<path id="compile.class.path">
+			<fileset dir="WebContent">
+				<include name="WEB-INF/lib/*.jar" />
+			</fileset>
+			<fileset dir="WebServer">
+				<include name="*.jar" />
+			</fileset>
+		</path>
+
+		<javac srcdir="WebContent/src" destdir="WebContent/WEB-INF/classes" classpathref="compile.class.path">
+		</javac>
+		<javac srcdir="WebServer/src" destdir="WebServer/classes" classpathref="compile.class.path">
+		</javac>
+	</target>
+
+	<!-- Creates Toolkit WAR package (requires Application Server / Servlet Container)-->
+	<target name="war-package" depends="compile">
+		<echo message="Creating WAR package." />
+		<war warfile="build/${ant.project.name}.war" webxml="WebContent/WEB-INF/web.xml">
+			<fileset dir="WebContent">
+				<include name="**/*" />
+				<exclude name="WEB-INF/web.xml" />
+			</fileset>
+		</war>
+	</target>
+
+	<!-- Creates Toolkit JAR package that contains embedded WebServer -->
+	<target name="jar-package" depends="war-package">
+		<echo message="Creating JAR package." />
+		<copy tofile="build/WebServer-temp/embedded.war" file="build/${ant.project.name}.war" />
+		<unjar src="${webserver.jar}" dest="build/WebServer-temp" />
+		<manifest file="build/WebServer-temp/META-INF/MANIFEST.MF">
+			<attribute name="Main-Class" value="${server.main.class}" />
+		</manifest>
+		<copy todir="build/WebServer-temp">
+			<fileset dir="WebServer/classes">
+				<include name="**/*" />
+			</fileset>
+		</copy>
+	</target>
+
+	<!-- Creates both Toolkit WAR and JAR packages -->
+	<target name="package" depends="jar-package">
+		<jar destfile="build/${ant.project.name}.jar" basedir="build/WebServer-temp" manifest="build/WebServer-temp/META-INF/MANIFEST.MF" />
+		<echo message="Created WAR-file to build/${ant.project.name}.war." />
+		<echo message="Deploy this file to your application server or servlet container." />
+		<echo message=" " />
+		<echo message="Created JAR-file to build/${ant.project.name}.jar" />
+		<echo message="Run your application using command like: java -jar build/${ant.project.name}.jar" />
+	</target>
+
+</project>
diff --git a/ReleaseNotes.html b/release-notes.html
similarity index 100%
rename from ReleaseNotes.html
rename to release-notes.html
-- 
2.39.5