diff options
| author | Marko Grönroos <magi@iki.fi> | 2008-02-26 13:18:54 +0000 |
|---|---|---|
| committer | Marko Grönroos <magi@iki.fi> | 2008-02-26 13:18:54 +0000 |
| commit | 9e5b1f5171cf6d2c84ba00ad514ee791f3f6e61c (patch) | |
| tree | 7676ae2502ac1fc7d8690112cee7c798dd376495 /build | |
| parent | 58836873a3358a56669643f97d7966d3f0b3e03c (diff) | |
| download | vaadin-framework-9e5b1f5171cf6d2c84ba00ad514ee791f3f6e61c.tar.gz vaadin-framework-9e5b1f5171cf6d2c84ba00ad514ee791f3f6e61c.zip | |
Merged /branches/5.1 (3858:3929) back to trunk.
svn changeset:3930/svn branch:trunk
Diffstat (limited to 'build')
| -rw-r--r-- | build/ITMillApache2LicenseForJavaFiles.txt | 2 | ||||
| -rw-r--r-- | build/VERSION.properties | 2 | ||||
| -rw-r--r-- | build/html-style.properties | 6 | ||||
| -rw-r--r-- | build/package/eclipse-classpath | 6 | ||||
| -rw-r--r-- | build/readme.txt | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/build/ITMillApache2LicenseForJavaFiles.txt b/build/ITMillApache2LicenseForJavaFiles.txt index f32820a01d..905e646125 100644 --- a/build/ITMillApache2LicenseForJavaFiles.txt +++ b/build/ITMillApache2LicenseForJavaFiles.txt @@ -1,4 +1,4 @@ - * Copyright 2007 IT Mill Ltd. + * Copyright 2008 IT Mill Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/build/VERSION.properties b/build/VERSION.properties index 506f5f1c91..0e24ef5838 100644 --- a/build/VERSION.properties +++ b/build/VERSION.properties @@ -1 +1 @@ -version=5.1.0-rc1
\ No newline at end of file +version=5.1.0
\ No newline at end of file diff --git a/build/html-style.properties b/build/html-style.properties index c0c2eb8804..59b28f63c5 100644 --- a/build/html-style.properties +++ b/build/html-style.properties @@ -3,13 +3,13 @@ html.body.endtag=</body> docbook.head.title=<xsl:apply-templates select="." mode="object.title.markup.textonly"/> html.body.start1=<div id="container"><div id="header"><h1> html.body.start2=</h1></div><div id="itmilllogo"></div> -html.body.end=<div id="footer"><span>Version: ${version}</span>© Oy IT Mill Ltd. 2000-2007</div></div> +html.body.end=<div id="footer"><span>Version: ${version}</span>© Oy IT Mill Ltd. 2000-2008</div></div> html.head.tag=<head> html.head.endtag=</head> html.head.style=<link rel="stylesheet" type="text/css" href="styles/demos.css" /> javadoc.doctitle=<h1>IT Mill Toolkit</h1> -javadoc.bottom=<i>Copyright © 2000-2007 IT Mill Ltd. All Rights Reserved.</i> +javadoc.bottom=<i>Copyright © 2000-2008 IT Mill Ltd. All Rights Reserved.</i> www.manual.body.start1=<div id="container"><div id="header"><h1> www.manual.body.start2=</h1></div><div id="itmilllogo"></div> -www.manual.body.end=<div id="footer"><span>Version: ${version}</span>© Oy IT Mill Ltd. 2000-2007</div></div> +www.manual.body.end=<div id="footer"><span>Version: ${version}</span>© Oy IT Mill Ltd. 2000-2008</div></div> www.manual.docbook.head.title=<xsl:apply-templates select="." mode="object.title.markup.textonly"/>
\ No newline at end of file diff --git a/build/package/eclipse-classpath b/build/package/eclipse-classpath index 729516fe66..c1871f6042 100644 --- a/build/package/eclipse-classpath +++ b/build/package/eclipse-classpath @@ -6,9 +6,9 @@ <classpathentry kind="lib" path="gwt/gwt-servlet.jar" /> <classpathentry kind="lib" path="gwt/gwt-user.jar" /> <classpathentry kind="lib" path="WebContent/demo/lib/reservr/googlemaps_gwt.jar" /> - <classpathentry kind="lib" path="WebContent/demo/lib/jetty/jetty-6.1.5.jar"/> - <classpathentry kind="lib" path="WebContent/demo/lib/jetty/jetty-util-6.1.5.jar"/> - <classpathentry kind="lib" path="WebContent/demo/lib/jetty/servlet-api-2.5-6.1.5.jar"/> + <classpathentry kind="lib" path="WebContent/demo/lib/jetty/jetty-6.1.7.jar"/> + <classpathentry kind="lib" path="WebContent/demo/lib/jetty/jetty-util-6.1.7.jar"/> + <classpathentry kind="lib" path="WebContent/demo/lib/jetty/servlet-api-2.5-6.1.7.jar"/> <classpathentry kind="output" path="WebContent/WEB-INF/classes"/> <platform-specific-entries></platform-specific-entries> </classpath> diff --git a/build/readme.txt b/build/readme.txt index 43fcd20a12..491f129db6 100644 --- a/build/readme.txt +++ b/build/readme.txt @@ -10,7 +10,7 @@ See documentation on build.xml how product is build. 3. Extract or link GWT distribution under build/gwt/<platform> directory / directories - <platform> = linux|windows|mac -4. Update Eclipse project classpath build/gwt/<platform>/gwt-user.jav and gwt-dev-<platform>.jar +4. Update Eclipse project classpath build/gwt/<platform>/gwt-user.jar and gwt-dev-<platform>.jar Note: All GWT distributions have been moved to https://svn.itmill.com/svn/itmill-toolkit/gwt |