diff options
53 files changed, 1283 insertions, 2600 deletions
diff --git a/WebContent/VAADIN/themes/base/common/common.scss b/WebContent/VAADIN/themes/base/common/common.scss index 40bea2c9d6..7fd4d2cc32 100644 --- a/WebContent/VAADIN/themes/base/common/common.scss +++ b/WebContent/VAADIN/themes/base/common/common.scss @@ -252,4 +252,9 @@ div.v-app-loading { overflow: auto; } +/* Enable kinetic scrolling on Mobile Safari 6 */ +.v-ios.v-sa6 .v-scrollable { + -webkit-overflow-scrolling: touch; +} + }
\ No newline at end of file diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml index 5faafc5c36..2f7135fea9 100644 --- a/WebContent/WEB-INF/portlet.xml +++ b/WebContent/WEB-INF/portlet.xml @@ -13,7 +13,7 @@ </init-param> <init-param> <name>widgetset</name> - <value>com.vaadin.portal.gwt.PortalDefaultWidgetSet</value> + <value>com.vaadin.DefaultWidgetSet</value> </init-param> <supports> <mime-type>text/html</mime-type> diff --git a/WebContent/css/styles.css b/WebContent/css/styles.css index 18c2bca5a1..9a5ddc74c1 100644 --- a/WebContent/css/styles.css +++ b/WebContent/css/styles.css @@ -75,7 +75,7 @@ a:link { } a:visited { - color: #003648; + color: #00a248; } a:hover { diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html index a4f0d14b67..8a9a1ab501 100644 --- a/WebContent/release-notes.html +++ b/WebContent/release-notes.html @@ -37,7 +37,7 @@ <h2 id="tableofcontents">Release Notes for Vaadin Framework @version@</h2> <ul> - <li><a href="#overview">Package contents</a></li> + <li><a href="#overview">Overview</a></li> <li><a href="#enhancements">Enhancements in Vaadin @version-minor@</a></li> <li><a href="#changelog">Complete change log for Vaadin @version@</a></li> <li><a href="#migrating">Migrating from Vaadin 6 to Vaadin 7</a></li> @@ -47,27 +47,70 @@ <li><a href="#vaadinontheweb">Vaadin on the Web</a></li> </ul> - <h2 id="overview">Package Contents</h2> + <h2 id="overview">Overview</h2> <p> <b>Vaadin</b> is a Java framework for building modern web applications that look - great, perform well and make you and your users happy. <b>Vaadin</b> is available - under the Apache 2 license (see <tt>license.html</tt>). + great, perform well and make you and your users happy. <b>Vaadin</b> and is + available under the Apache 2 license (see <tt>license.html</tt>). </p> <p> - <b>Vaadin</b> is distributed as a single JAR file. Inside the JAR you will find: + The easiest ways to install <b>Vaadin</b> are: </p> <ul> - <li>Vaadin server and client side classes (<tt>/com</tt>)</li> - <li>Vaadin server and client side sources (<tt>/com</tt>)</li> - <li>The default widget set (<tt>/VAADIN/widgetsets</tt>)</li> - <li>Themes: Runo, Reindeer and Chameleon (<tt>/VAADIN/themes</tt>)</li> - <li>Release notes (<tt>/release-notes.html</tt>)</li> - <li>Licensing information (<tt>/license.html</tt>)</li> + <li>If using Maven, define it as a dependency or use any of the available + archetypes (only <tt>vaadin-application</tt> is available for Vaadin 7 at the time + of this release) to create a new project</li> + + <li>If using Eclipse, use the Vaadin Plugin for Eclipse, which automatically + downloads the Vaadin libraries</li> </ul> + <p> + It is also available as a ZIP package downloadable from <a + href="http://vaadin.com/download">Vaadin Download page</a>. + </p> + + <h3 id="package">Package Contents</h3> + + <p>Inside the ZIP installation package you will find:</p> + + <ul> + <li>Separate server-side (<tt>vaadin-server</tt>) and client-side (<tt>vaadin-client</tt>, <tt>vaadin-client-compiler</tt>) development libraries</li> + <li>Precompiled widget set (<tt>vaadin-client-compiled</tt>) for server-side development</li> + <li>Shared library (<tt>vaadin-shared</tt>) for both server- and client-side libraries</li> + <li>Built-in themes (<tt>vaadin-themes-compiled</tt>) and the theme compiler (<tt>vaadin-theme-compiler</tt>) + <li>Dependency libraries provided under the <tt>lib/</tt> folder</li> + </ul> + + <p> + See the <tt>README.TXT</tt> in the installation package for detailed information + about the package contents. <a href="http://vaadin.com/book">Book of Vaadin</a> + (for Vaadin 7) will give more detailed instructions; it is not yet up-to-date at + the time of this release, but will be updated soon after. + </p> + + <p> + For server-side development, copy the <tt>vaadin-server</tt>, + <tt>vaadin-client-compiled</tt>, <tt>vaadin-shared</tt>, + <tt>vaadin-theme-compiler</tt>, and <tt>vaadin-themes-compiled</tt> from the main + folder and the dependencies from the <tt>lib</tt> folder to the + <tt>WEB-INF/lib</tt> folder of your Vaadin project. (The + <tt>vaadin-client-compiled</tt> is necessary if you do not wish to compile the + widget set by your own, which you need to do if you use almost any add-on + components.) + </p> + + <p> + For pure client-side development, you only need the <tt>vaadin-client</tt> and + <tt>vaadin-client-compiler</tt> JARs, which should be put to a non-deployed + project library folder, such as <tt>lib</tt>. You also need them if you compile + the widget set for any reason, such as using Vaadin add-ons, or create new + server-side components integrated with client-side widgets. + </p> + <h2 id="enhancements">Enhancements in Vaadin @version-minor@</h2> <p> @@ -76,7 +119,7 @@ for the purpose of receiving feedback about the changes. </p> - <p>The major changes in this first beta release are:</p> + <p>The major new changes in this first beta release are:</p> <ul> <li>Applications are now written by extending the <b>UI</b> class @@ -84,13 +127,21 @@ <li>UIs use heartbeat to detect closing</li> </ul> </li> - <li>The <b>Application</b> class is removed altogether</li> - <li><b>ApplicationServlet</b> is replaced with <b>VaadinServlet</b></li> - <li><b>ApplicationResource</b> is replaced with <b>ConnectorResource</b></li> - <li>Themeing with <a href="http://sass-lang.com/">SASS</a> in addition to CSS</li> + <li>The <b>Application</b> class is removed altogether + <ul> + <li><b>ApplicationServlet</b> is replaced with <b>VaadinServlet</b></li> + <li><b>ApplicationResource</b> is replaced with <b>ConnectorResource</b></li> + </ul> + </li> + <li>Themeing with <a href="http://sass-lang.com/">SASS</a> in addition to CSS + <ul> + <li>SASS themes need to (and CSS themes can) be compiled to a single CSS stylesheet with the <tt>vaadin-theme-compiler</tt></li> + </ul> + </li> <li>Add-ons can modify the startup page</i></li> <li>All <tt>addListener()</tt> methods have changed to listener-specific methods, such as <tt>addClickListener()</tt>, <tt>addValueChangeListener()</tt>, etc.</li> - <li>Packaging has changed, now in a ZIP package (again)</li> + <li>Packaging has changed, now in a ZIP package (see <a href="package">Package Contents</a> above) + </li> </ul> <p> @@ -101,6 +152,7 @@ <li>GWT is now built into Vaadin Framework <ul> <li>New SuperDevMode allows debugging client-side Java code in the browser without any plugins</li> + </ul> </li> <li>Navigation API for view navigation <ul> @@ -108,7 +160,7 @@ <li>Access control for views, view change confirmation</li> </ul> </li> - <li>Component and root extensions</li> + <li>Component and UI extensions</li> <li>Resource loading (JS/CSS) by the framework</li> <li>Complete overhaul of the client-server communication architecture <ul> @@ -164,7 +216,15 @@ <p> All Vaadin 6 applications need some changes when migrating to Vaadin 7. The most obvious changes are in the application/window API and require extending either - <b>Root</b> or <b>Root.LegacyApplication</b> instead of <b>Application</b>. + <b>UI</b> or <b>UI.LegacyApplication</b> instead of <b>Application</b>. A detailed + list of migration changes are given in the <a + href="http://dev.vaadin.com/wiki/Vaadin7/MigrationGuide">Vaadin 7 Migration + Guide</a>. + </p> + + <p> + Any custom client-side widgets need to be ported to use the new client-server + communication API, or the Vaadin 6 compatibility API. </p> <p> @@ -173,18 +233,30 @@ for Vaadin 7 support. </p> - <p> - Any custom client-side widgets need to be changed to use the new client-server - communication API or the Vaadin 6 compatibility API. - </p> + <h2 id="dependencies">Vaadin @version@ Dependencies</h2> + <h3>Dependencies Included in Installation package</h3> + <p> - A detailed list of migration changes are given in the <a - href="http://dev.vaadin.com/wiki/Vaadin7/MigrationGuide">Vaadin 7 Migration - Guide</a>. + The Vaadin ZIP installation package includes the following dependencies in the + <tt>lib</tt> subfolder: </p> - <h2 id="dependencies">Vaadin @version@ Dependencies</h2> + <ul> + <li>Apache Ant (<tt>ant-*.jar</tt>)</li> + <li>Args4j (<tt>args4j-*.jar</tt>)</li> + <li>Apache Commons CLI, Collections, Discovery, IO, Lang, Logging, and Math (<tt>commons-*.jar</tt>)</li> + <li>CSS Parser (<tt>cssparser-*.jar</tt>)</li> + <li>Flute (<tt>flute-*.jar</tt>)</li> + <li>Google Collections Library (<tt>google-collections-*.jar</tt>)</li> + <li>JSON (<tt>json-*.jar</tt>)</li> + <li>jsoup (<tt>jsoup-*.jar</tt>)</li> + <li>JUnit (<tt>junit-*.jar</tt>)</li> + <li><tt>portal-service-*.jar</tt></li> + <li>SAC (<tt>sac-*.jar</tt>)</li> + <li>SmartSprites (<tt>smartsprites-*.jar</tt>)</li> + <li>Validation API (<tt>validation-*.jar</tt>)</li> + </ul> <h3>Bean Validation</h3> @@ -212,18 +284,14 @@ </p> <ul> - <li>Recompile your classes using the new Vaadin JAR. Binary + <li>Recompile your classes using the new Vaadin version. Binary compatibility is only guaranteed for maintenance releases of Vaadin.</li> - <li>Recompile any add-ons you have created using the new Vaadin - JAR.</li> - - <li>Recompile your widget set using the new Vaadin JAR and the newly compiled - add-ons.</li> + <li>Recompile any add-ons you have created using the new Vaadin</li> - <li>If you have extracted a theme from the Vaadin JAR, you need to update it with - the theme provided in the new Vaadin JAR.</li> + <li>Unless using the precompiled widget set, recompile your widget set using the + new Vaadin version</li> </ul> <p> @@ -232,8 +300,8 @@ </p> <p> - Using the "?debug" URL parameter you can verify that the version of the servlet - (JAR), the theme and the widgetset all match. + By using the "<tt>?debug</tt>" URL parameter, you can verify that the version of + the servlet, the theme, and the widget set all match. </p> <p> @@ -251,13 +319,16 @@ </p> <p> - <b>Liferay and other portal</b> users must install the new vaadin-@version@.jar as - <t>ROOT/WEB-INF/lib/vaadin.jar</b> in the portal. Additionally the contents of the - <tt>VAADIN</tt> folder from the JAR must be extracted to the - <tt>ROOT/html/VAADIN</tt> directory in the Liferay installation. If your portal - uses custom widgets, install the latest version of <a + <b>Liferay and other portal</b> users must install the Vaadin libraries in + <t>ROOT/WEB-INF/lib/</b> in the portal (and remove a possibly obsolete older + <tt>vaadin.jar</tt>). Additionally, the contents of the + <tt>vaadin-client-compiled</tt> and <tt>vaadin-themes-compiled</tt> must be + extracted to the <tt>ROOT/html/VAADIN</tt> directory in the Liferay + installation. If your portal uses custom widgets, install the latest version of <a href="http://vaadin.com/directory#addon/vaadin-control-panel-for-liferay">Vaadin - Control Panel for Liferay</a> for easy widget set compilation. + Control Panel for Liferay</a> for easy widget set compilation - when it is + available - the add-on is not compatible with Vaadin @version@ at the time of this + Vaadin release. <!-- TODO: Remove note when done --> </p> <h2 id="gae">Notes and Limitations for Google App Engine</h4> @@ -268,8 +339,8 @@ <ul> <li> <p> - Applications must use <b>GAEApplicationServlet</b> instead of - <b>ApplicationServlet</b> in <tt>web.xml</tt>. + Applications must use <b>GAEVaadinServlet</b> instead of + <b>VaadinServlet</b> in <tt>web.xml</tt>. </p> </li> @@ -285,7 +356,7 @@ <li> <p> Avoid using the session for storage, usual App Engine limitations apply (no - synchronization, i.e, unreliable). + synchronization, that is, unreliable). </p> </li> @@ -298,7 +369,7 @@ <li> <p> - The Vaadin <b>WebApplicationContext</b> class is serialized separately into + The Vaadin <b>VaadinSession</b> class is serialized separately into memcache and datastore; the memcache key is <tt>_vac<sessionid></tt> and the datastore entity kind is <tt>_vac</tt> with identifiers of the type <tt>_vac<sessionid></tt>. @@ -307,19 +378,8 @@ <li> <p> - DO NOT update application state when serving an <b>ApplicationResource</b> - (e.g <b>ClassResource</b>.<i>getStream()</i>). - </p> - </li> - - <li> - <p> - AVOID (or be very careful when) updating application state in a - <b>TransactionListener</b> or a <b>HttpServletRequestListener</b> - they are - called even when the application is not locked and won't be serialized (e.g - <b>ApplicationResource</b>), and changes can thus go missing (it should be - safe to update things that can be safely discarded later - i.e valid only for - the current request) + DO NOT update application state when serving an <b>ConnectorResource</b> + (such as <b>ClassResource</b>.<i>getStream()</i>). </p> </li> @@ -339,12 +399,9 @@ <h2 id="supportedversions">Supported Technologies</h2> <p> - Vaadin 7 is compatible with <b>Java 6</b> and it is also compatible with most other - operating system supporting Java 6 or newer. - </p> - - <p> - Vaadin 7 is supported on the following <b>operating systems</b>: + Vaadin 7 is compatible with <b>Java 6</b> and with most operating systems + supporting the Java 6 or newer. Vaadin 7 is especially supported on the following + <b>operating systems</b>: </p> <ul> @@ -360,12 +417,12 @@ </p> <ul> - <li>Apache Tomcat, version 5.0-7.0</li> - <li>Oracle WebLogic® Server, version 9.2-10.3.5(11gR1)</li> - <li>IBM WebSphere® Application Server, version 6.1-8.0</li> - <li>JBoss Application Server, 4.0.0-7.0</li> - <li>Jetty, version 5.0-7.0</li> - <li>Glassfish, version 2.0-3.1</li> + <li>Apache Tomcat, version 5.0 or newer</li> + <li>Oracle WebLogic® Server, version 9.2 or newer</li> + <li>IBM WebSphere® Application Server, version 6.1 or newer</li> + <li>JBoss Application Server, 4.0.0 or newer</li> + <li>Jetty, version 5.0 or newer</li> + <li>Glassfish, version 2.0 or newer</li> </ul> <p> @@ -375,9 +432,9 @@ </p> <ul> - <li>Liferay Portal 5.2-6.0</li> - <li>GateIn Portal 3.1</li> - <li>eXo Platform 3</li> + <li>Liferay Portal 5.2 or newer</li> + <li>GateIn Portal 3.1 or newer</li> + <li>eXo Platform 3 or newer</li> </ul> <p> @@ -389,11 +446,11 @@ </p> <ul> - <li>Mozilla Firefox 12-14</li> - <li>Internet Explorer 8-9</li> - <li>Safari 5</li> - <li>Opera 11-12</li> - <li>Google Chrome 19-21</li> + <li>Mozilla Firefox 5 or newer</li> + <li>Internet Explorer 8-10</li> + <li>Safari 6</li> + <li>Opera 12</li> + <li>Google Chrome 21</li> </ul> <p> @@ -402,8 +459,8 @@ </p> <ul> - <li>iOS 4-5</li> - <li>Android 2-4</li> + <li>iOS 5 and later</li> + <li>Android 2.3 and later</li> </ul> <h2 id="vaadinontheweb">Vaadin on the Web</h2> @@ -448,7 +505,6 @@ </ul> </div> <!-- /content--> - <div id="footer"> <span class="slogan"><strong>vaadin <em>}></em> </strong> thinking of U and I<span> <a href="#top">↑ Back to diff --git a/WebContent/layout-resize-test.html b/WebContent/statictestfiles/layout-resize-test.html index b798402bb7..b798402bb7 100644 --- a/WebContent/layout-resize-test.html +++ b/WebContent/statictestfiles/layout-resize-test.html diff --git a/build/GWT-VERSION.properties b/build/GWT-VERSION.properties deleted file mode 100644 index e5bb635e01..0000000000 --- a/build/GWT-VERSION.properties +++ /dev/null @@ -1,2 +0,0 @@ -gwt-version=2.5.0 -gwt-version-dependencies=validation-api-1.0.0.GA.jar, validation-api-1.0.0.GA-sources.jar diff --git a/build/VERSION.properties b/build/VERSION.properties deleted file mode 100644 index ce706c5d02..0000000000 --- a/build/VERSION.properties +++ /dev/null @@ -1 +0,0 @@ -version=7.0.0
\ No newline at end of file diff --git a/build/VaadinApache2LicenseForJavaFiles.txt b/build/VaadinApache2LicenseForJavaFiles.txt deleted file mode 100644 index ba72a29d84..0000000000 --- a/build/VaadinApache2LicenseForJavaFiles.txt +++ /dev/null @@ -1,13 +0,0 @@ - * Copyright 2011 Vaadin 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 - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License.
\ No newline at end of file diff --git a/build/build.properties b/build/build.properties deleted file mode 100644 index 0260cc54a9..0000000000 --- a/build/build.properties +++ /dev/null @@ -1,18 +0,0 @@ -result-path=build/result -checkout-path=build/checkout -product-file=vaadin -product-name=Vaadin -vaadin-package=com/vaadin -gwt-dir=lib/core/gwt -required.java.version=1.6 - -# repository into which Maven snapshots should be published -snapshot.repository.url=http://oss.sonatype.org/content/repositories/vaadin-snapshots - -# These are required when compiling WebContent/VAADIN/widgetsets (and also -# Java server-side classes). -lib-gwt-dev=${gwt-dir}/gwt-dev.jar -lib-gwt-user=${gwt-dir}/gwt-user.jar -# FIXME: Should use ${gwt-version-dependencies} -lib-gwt-validation=${gwt-dir}/validation-api-1.0.0.GA.jar -lib-gwt-validation-src=${gwt-dir}/validation-api-1.0.0.GA-sources.jar diff --git a/build/build.xml b/build/build.xml deleted file mode 100644 index 40b010f443..0000000000 --- a/build/build.xml +++ /dev/null @@ -1,1419 +0,0 @@ -<?xml version="1.0"?> - -<project xmlns:antcontrib="antlib:net.sf.antcontrib" - xmlns:artifact="antlib:org.apache.maven.artifact.ant" - xmlns:ivy="antlib:org.apache.ivy.ant" - name="Vaadin" - basedir="../" default="package-all"> - - <property name="project.root" value="."/> - <!-- Import common targets --> - <import file="./common.xml" /> - - <!--Call one of package-* targets unless you understand what you are doing. --> - <target name="package-all" depends="clean-all, init, build, javadoc, internal-package-war, internal-package-liferay, differences" description="Build public packages."> - </target> - - <target name="package-jar" depends="clean-result, init, vaadin.jar" description="Create vaadin-x.y.z.jar file."> - </target> - - <target name="package-war" depends="clean-result, init, build, javadoc, internal-package-war, differences"> - </target> - - <target name="package-liferay-zip" depends="clean-result, init, build, internal-package-liferay"> - </target> - - <target name="init-deps" depends="common.init-deps" > - <property name="ivy.resolved" value="1" /> - - <ivy:resolve file="build/ivy/ivy.xml" resolveid="common" conf="server.extdep, shared.extdep, client.extdep, client-compiler.extdep, server.tests.extdep,client-compiler.extdep"/> - <ivy:cachepath pathid="ivy.compile.classpath.server" conf="server.extdep"/> - <ivy:cachepath pathid="ivy.compile.classpath.shared" conf="shared.extdep"/> - <ivy:cachepath pathid="ivy.compile.classpath.client" conf="client.extdep"/> - <ivy:cachepath pathid="ivy.compile.classpath.client-compiler" conf="client-compiler.extdep"/> - <ivy:cachepath pathid="ivy.compile.classpath.server-tests" conf="server.tests.extdep"/> - - <ivy:cachepath pathid="buildhelpers.dependencies" resolveId="buildhelpers" conf="compile" file="build/ivy/buildhelpers-ivy.xml"/> - - <!-- Extra JARs for custom builds - taken into account before JARs from Ivy. --> - <!-- Note that this should not be used for permanent build dependencies. --> - <path id="additional.jar.path"> - <fileset dir="build" includes="lib/**/*.jar" ></fileset> - </path> - - <!-- Default location for GWT check-out: trunk and tools in a directory next to Vaadin project --> - <property name="gwt.root" value="${basedir}/../trunk"/> - - <property name="gwt.build.dir" value="${gwt.root}/build"/> - <property name="gwt.tools" value="${gwt.root}/../tools"/> - <property name="gwt.tools.lib" value="${gwt.tools}/lib"/> - <property name="gwt.lib.dir" value="${gwt.build.dir}/lib"/> - - <property name="gwt.user.jar" value="${gwt.lib.dir}/gwt-user.jar"/> - <property name="gwt.dev.jar" value="${gwt.lib.dir}/gwt-dev.jar"/> - <property name="gwt.codeserver.jar" value="${gwt.lib.dir}/gwt-codeserver.jar"/> - <property name="gwt.elemental.jar" value="${gwt.lib.dir}/gwt-elemental.jar"/> - - <property name="gwt.user.dir" value="${gwt.root}/user"/> - <property name="gwt.user.bin" value="${gwt.build.dir}/out/user/bin"/> - - <!-- GWT --> - <path id="gwt.dev.user.jars"> - <pathelement location="${gwt.user.jar}" /> - <pathelement location="${gwt.dev.jar}" /> - </path> - <path id="compile.classpath.server"> - <path refid="additional.jar.path" /> - <path refid="ivy.compile.classpath.server" /> - </path> - <path id="compile.classpath.shared"> - <path refid="additional.jar.path" /> - <path refid="ivy.compile.classpath.shared" /> - </path> - <path id="compile.classpath.client"> - <path refid="additional.jar.path" /> - <path refid="gwt.dev.user.jars"/> - <path refid="ivy.compile.classpath.client" /> - </path> - <path id="compile.classpath.client-compiler"> - <path refid="additional.jar.path" /> - <path refid="gwt.dev.user.jars"/> - <path refid="ivy.compile.classpath.client-compiler" /> - </path> - <path id="compile.classpath.theme-compiler"> - <path refid="additional.jar.path" /> - <path refid="ivy.compile.classpath.server" /> - <path refid="gwt.dev.user.jars"/> - </path> - <path id="compile.classpath.server-tests"> - <path refid="additional.jar.path" /> - <path refid="gwt.dev.user.jars"/> - <path refid="ivy.compile.classpath.server-tests" /> - </path> - - <path id="compile.classpath.buildhelpers"> - <path refid="additional.jar.path" /> - <path refid="gwt.dev.user.jars"/> - <path refid="buildhelpers.dependencies" /> - </path> - </target> - - <!-- Clean results - - - - - - - - - - - - - - - - - - - - - - - - - --> - <target name="clean-result" depends="build.properties"> - - <!-- Clean build result directory. --> - <delete dir="${result-path}" includes="**/*" followsymlinks="false" defaultexcludes="false" includeemptydirs="true" failonerror="false"/> - </target> - - <target name="build.properties" depends="init-deps"> - <property file="build/build.properties" /> - - <property file="build/VERSION.properties" /> - <property file="build/GWT-VERSION.properties" /> - - <!-- result source and classes folders --> - <property name="result-src-server" value="${result-path}/src/server"/> - <property name="result-src-client" value="${result-path}/src/client"/> - <property name="result-src-client-compiler" value="${result-path}/src/client-compiler"/> - <property name="result-src-shared" value="${result-path}/src/shared"/> - <property name="result-src-junit" value="${result-path}/src/junit"/> - <property name="result-src-testbench" value="${result-path}/src/testbench"/> - <property name="result-src-theme-compiler" value="${result-path}/src/theme-compiler"/> - <property name="result-src-theme-compiler-junit" value="${result-path}/src/theme-compiler-junit"/> - <property name="result-classes-server" value="${result-path}/classes/server"/> - <property name="result-classes-client" value="${result-path}/classes/client"/> - <property name="result-classes-client-compiler" value="${result-path}/classes/client-compiler"/> - <property name="result-classes-shared" value="${result-path}/classes/shared"/> - <property name="result-classes-junit" value="${result-path}/classes/junit"/> - <property name="result-classes-testbench" value="${result-path}/classes/testbench"/> - <property name="result-classes-theme-compiler" value="${result-path}/classes/theme-compiler"/> - <property name="result-classes-theme-compiler-junit" value="${result-path}/classes/theme-compiler-junit"/> - <property name="result-precompiled-widgetsets" value="${result-path}/classes/widgetsets"/> - <property name="result-classes-gwt" value="${result-path}/classes/gwt" /> - - <!-- Default classpath for building widgetsets, overridden for testing widgetset --> - <path id="compile.classpath.widgetset"> - <path refid="compile.classpath.client" /> - <!-- Needed to resolve classes which @Connect refers to --> - <pathelement location="${result-src-server}" /> - <!-- Needed to resolve imports in connector classes --> - <pathelement location="${result-classes-server}" /> - - <!-- The actual sources we want to compile --> - <pathelement location="${result-src-client}" /> - <pathelement location="${result-src-shared}" /> - <!-- Contains compiled generators --> - <pathelement location="${result-classes-client-compiler}" /> - <!-- Generators depend on shared and client interfaces --> - <pathelement location="${result-classes-shared}" /> - <pathelement location="${result-classes-client}" /> - - <pathelement location="${result-precompiled-widgetsets}" /> - </path> - </target> - <target name="clean-all" depends="clean-result"> - <delete failonerror="false"> - <fileset dir="${com.vaadin.testbench.screenshot.directory}/errors"> - <include name="*.png" /> - </fileset> - </delete> - <delete failonerror="false" dir="WebContent/VAADIN/gwt-unitCache" /> - </target> - - <!-- ================================================================== --> - <!-- Check versions. --> - <!-- ================================================================== --> - - <!-- Java compiler version. --> - <target name="check-java-version"> - <condition property="java.version.matches"> - <or> - <equals arg1="${ant.java.version}" arg2="${required.java.version}"/> - <isset property="ignoreversion"/> - </or> - </condition> - <fail unless="java.version.matches" message="Java version is ${ant.java.version}, but Vaadin must be compiled with genuine Java ${required.java.version} compiler. Use -Dignoreversion=1 for ant to ignore the version check."/> - <echo>Java version is ${ant.java.version} as required.</echo> - </target> - - <!-- ================================================================== --> - <!-- Initialization - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- ================================================================== --> - - <target name="init" depends="init-deps, build.properties, check-java-version"> - <!-- Current timestamp in different formats. --> - <tstamp> - <format property="build.date" pattern="yyyy-MM-dd"/> - </tstamp> - <tstamp> - <format property="build.date.compact" pattern="yyyyMMdd"/> - </tstamp> - - <antcontrib:propertyregex property="version.major" input="${version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\1"/> - <antcontrib:propertyregex property="version.minor" input="${version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\2"/> - <antcontrib:propertyregex property="version.revision" input="${version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\3"/> - - <!-- Default full version name. --> - <!-- Nightly and other TeamCity builds will define their own. --> - <property name="version.full" value="${version}.dev-${build.date.compact}"/> - <echo>Base Version: ${version}</echo> - <echo>Full Version: ${version.full}</echo> - - <!-- Other properties --> - <property file="build/html-style.properties" /> - - <echo>Vaadin package is: ${vaadin-package}</echo> - - <!-- Create result dir unless already exists --> - <mkdir dir="${result-path}" /> - - <echo>We are using gwt version ${gwt-version}.</echo> - - <!-- Destination files --> - <property name="base-name" value="${product-file}-${version.full}" /> - <property name="lib-jar-name" value="${base-name}.jar" /> - <property name="lib-sources-jar-name" value="${base-name}-sources.jar" /> - <property name="lib-javadoc-jar-name" value="${base-name}-javadoc.jar" /> - <property name="test-war-filename" value="${product-file}-tests-${version.full}.war"/> - - <echo message="Prepared to build ${product-file} version ${version.full} packages" /> - - <!-- Output directory --> - <property name="output-dir" value="${result-path}/${base-name}" /> - <mkdir dir="${output-dir}" /> - - <!-- Where widgetsets are written to. --> - <!-- When not building a package, widgetsets should be written to --> - <!-- WebContent/VAADIN/widgetsets, which needs to be set in --> - <!-- init-nonpackage target before calling this main init target. --> - <property name="widgetsets-output-dir" value="${output-dir}/WebContent/VAADIN/widgetsets" /> - - <!-- Build helpers --> - <property name="buildhelpers-src" value="build/buildhelpers" /> - <property name="buildhelpers-classes" value="${result-path}/buildhelpers/classes" /> - - <!-- Sass --> - <property name="theme-compiler-src" value="theme-compiler/src" /> - <property name="theme-compiler-classes" value="${result-classes-theme-compiler}" /> - - <!-- Create Output Directory Hierarchy --> - <mkdir dir="${output-dir}/WebContent" /> - <mkdir dir="${output-dir}/WebContent/demo" /> - <mkdir dir="${output-dir}/WebContent/docs" /> - <mkdir dir="${output-dir}/WebContent/docs/api" /> - <mkdir dir="${output-dir}/WebContent/tests" /> - <mkdir dir="${output-dir}/WebContent/WEB-INF" /> - <mkdir dir="${output-dir}/WebContent/WEB-INF/lib" /> - <mkdir dir="${output-dir}/WebContent/WEB-INF/classes" /> - </target> - - <target name="internal-package-war"> - <echo>Building Test WAR</echo> - - <echo>Adding test class files and resources and launcher configuration.</echo> - <copy todir="${output-dir}/WebContent/WEB-INF/classes"> - <fileset dir="${result-classes-testbench}"> - <include name="${vaadin-package}/tests/**/*" /> - <include name="${vaadin-package}/launcher/**" /> - </fileset> - <fileset dir="${result-classes-shared}" /> - <!-- VaadinClasses and data classes are used by TestBench tests also --> - <fileset dir="${result-classes-junit}" /> - <!-- test resources --> - <fileset dir="uitest/src"> - <include name="${vaadin-package}/tests/**/*" /> - <!-- Pre-processed versions of these copied above --> - <exclude name="**/*.java" /> - <exclude name="**/*.html" /> - <exclude name="**/*.css" /> - <exclude name="**/*.xml" /> - </fileset> - - <!-- Include files required by the DemoLauncher/DevelopmentServerLauncher --> - <fileset dir="uitest/src"> - <include name="${vaadin-package}/launcher/jetty-webdefault.xml" /> - <include name="${vaadin-package}/launcher/keystore" /> - </fileset> - </copy> - - <war warfile="${result-path}/${test-war-filename}"> - <fileset dir="${output-dir}/WebContent"> - <exclude name="VAADIN/gwt-unitCache" /> - <!-- Already in JAR --> - <!-- Not excluded because used from WAR by portal integration tests - <exclude name="VAADIN/themes/base/**/*" /> - <exclude name="VAADIN/themes/chameleon/**/*" /> - <exclude name="VAADIN/themes/liferay/**/*" /> - <exclude name="VAADIN/themes/reindeer/**/*" /> - <exclude name="VAADIN/themes/runo/**/*" /> - <exclude name="VAADIN/widgetsets/com.vaadin.DefaultWidgetSet/**/*" /> - --> - - <!-- Not needed for testing --> - <exclude name="docs/**/*" /> - <exclude name="docs" /> - - <include name="**/*" /> - </fileset> - </war> - </target> - - <target name="internal-package-liferay" depends="internal-package-war"> - <!-- We assume the needed files are put in place by internal-package-war --> - <echo>Building Liferay zip</echo> - - <zip zipfile="${result-path}/${base-name}-liferay.zip"> - <zipfileset prefix="VAADIN/widgetsets/com.vaadin.portal.gwt.PortalDefaultWidgetSet" dir="${output-dir}/WebContent/VAADIN/widgetsets/com.vaadin.portal.gwt.PortalDefaultWidgetSet"> - <patternset> - <include name="**/*" /> - </patternset> - </zipfileset> - <zipfileset prefix="VAADIN/themes" dir="${output-dir}/WebContent/VAADIN/themes"> - <patternset> - <include name="base/**/*" /> - <include name="chameleon/**/*" /> - <include name="liferay/**/*" /> - <include name="runo/**/*" /> - <include name="reindeer/**/*" /> - </patternset> - </zipfileset> - <zipfileset prefix="VAADIN" dir="${output-dir}/WebContent/VAADIN"> - <patternset> - <include name="vaadinBootstrap.js" /> - </patternset> - </zipfileset> - </zip> - - <echo>##teamcity[publishArtifacts '${result-path}/${base-name}-liferay.zip']</echo> - </target> - - <!-- Build server-side, client-side, libraries, and tests. --> - <!-- The client-side needs to be built before vaadin.jar, because the vaadin.jar --> - <!-- require the default widgetset and doing otherwise would build it twice. --> - <!-- However, since compiling the server-side is required by the client-side --> - <!-- compilation, the server-side will actually be built before it. --> - <target name="build" - depends="compile-server-side, compile-tests, compile-client-side, vaadin.jar, vaadin-sources.jar" - description="Build package required files, without packing them."> - </target> - - <target name="compile-server-side" depends="compile-gwt, compile-server, compile-client, webcontent"/> - - <!-- Copy and preprocess sources for packaging - NOTE: Replaces <version></version> tags with build version tag for some "textual" files - --> - <target name="preprocess-src"> - <!-- - Source directories in the project are - * src (Vaadin core) - * theme-compiler/src (SASS compiler) - * uitest/src (TestBench test cases) - * server/tests/src (Server-side JUnit test cases) - * client/tests/src (Client-side JUnit test cases) - - These are copied to - * ${result-path}/src/core - * ${result-path}/src/theme-compiler - * ${result-path}/src/tests - * ${result-path}/src/junit - - And compiled to - * ${result-path}/classes/core - * ${result-path}/classes/theme-compiler - * ${result-path}/classes/tests - * ${result-path}/classes/junit - - Java/HTML/CSS/XML files are filtered so the license is added and the version is set. - Other files are just copied. - --> - - <loadfile property="VaadinApache2LicenseForJavaFiles" srcFile="build/VaadinApache2LicenseForJavaFiles.txt" /> - - <mkdir dir="${result-path}/src" /> - <mkdir dir="${result-src-theme-compiler}/src" /> - <mkdir dir="${result-src-server}" /> - <mkdir dir="${result-src-client}" /> - <mkdir dir="${result-src-client-compiler}" /> - <mkdir dir="${result-src-shared}" /> - <mkdir dir="${result-src-testbench}" /> - <mkdir dir="${result-src-junit}" /> - <mkdir dir="${result-src-theme-compiler-junit}" /> - - <patternset id="preprocessable-files"> - <include name="**/*.java" /> - <include name="**/*.html" /> - <include name="**/*.css" /> - <include name="**/*.xml" /> - </patternset> - <patternset id="non-preprocessable-files"> - <exclude name="**/.svn" /> - <exclude name="**/*.java" /> - <exclude name="**/*.html" /> - <exclude name="**/*.css" /> - <exclude name="**/*.xml" /> - </patternset> - <filterset id="version-and-license"> - <filter token="VaadinApache2LicenseForJavaFiles" value="${VaadinApache2LicenseForJavaFiles}" /> - <filter token="VERSION" value="${version.full}" /> - </filterset> - - <!-- Adds a style class to JavaDoc <pre> tags for style customization. --> - <filterset id="pre-css-style" begintoken=" * <" endtoken=">"> - <filter token="pre" value=" * <pre class='code'>" /> - </filterset> - - <echo>Copying src directory and processing copied files.</echo> - <echo>Replacing <version> tag with build version for java/html/css/xml files.</echo> - <copy todir="${result-src-server}" overwrite="yes"> - <filterset refid="version-and-license"/> - <filterset refid="pre-css-style"/> - <fileset dir="server/src"> - <patternset refid="preprocessable-files" /> - </fileset> - </copy> - <copy todir="${result-src-shared}" overwrite="yes"> - <filterset refid="version-and-license"/> - <filterset refid="pre-css-style"/> - <fileset dir="shared/src"> - <patternset refid="preprocessable-files" /> - </fileset> - </copy> - <copy todir="${result-src-client}" overwrite="yes"> - <filterset refid="version-and-license"/> - <filterset refid="pre-css-style"/> - <fileset dir="client/src"> - <patternset refid="preprocessable-files" /> - </fileset> - </copy> - <copy todir="${result-src-client-compiler}" overwrite="yes"> - <filterset refid="version-and-license"/> - <filterset refid="pre-css-style"/> - <fileset dir="client-compiler/src"> - <patternset refid="preprocessable-files" /> - </fileset> - </copy> - - <copy todir="${result-src-theme-compiler}" overwrite="yes"> - <filterset refid="version-and-license"/> - <filterset refid="pre-css-style"/> - <fileset dir="theme-compiler/src"> - <patternset refid="preprocessable-files" /> - </fileset> - </copy> - - <copy todir="${result-src-testbench}"> - <filterset refid="version-and-license"/> - <fileset dir="uitest/src"> - <patternset refid="preprocessable-files" /> - </fileset> - </copy> - <copy todir="${result-src-junit}"> - <filterset refid="version-and-license"/> - <fileset dir="server/tests/src"> - <patternset refid="preprocessable-files" /> - </fileset> - <fileset dir="client/tests/src"> - <patternset refid="preprocessable-files" /> - </fileset> - </copy> - <copy todir="${result-src-theme-compiler-junit}"> - <filterset refid="version-and-license"/> - <fileset dir="theme-compiler/tests/src"> - <patternset refid="preprocessable-files" /> - </fileset> - </copy> - - <!-- Add other files such as images, these are not filtered or processed by fixcrlf task --> - <echo>Copying non java/html/css/xml files such as images.</echo> - <copy todir="${result-src-server}"> - <fileset dir="server/src"> - <patternset refid="non-preprocessable-files" /> - </fileset> - </copy> - - <copy todir="${result-src-shared}"> - <fileset dir="shared/src"> - <patternset refid="non-preprocessable-files" /> - </fileset> - </copy> - - <copy todir="${result-src-client}"> - <fileset dir="client/src"> - <patternset refid="non-preprocessable-files" /> - </fileset> - </copy> - - <copy todir="${result-src-client-compiler}"> - <fileset dir="client-compiler/src"> - <patternset refid="non-preprocessable-files" /> - </fileset> - </copy> - - <copy todir="${result-src-theme-compiler}"> - <fileset dir="${theme-compiler-src}"> - <patternset refid="non-preprocessable-files" /> - </fileset> - </copy> - <copy todir="${result-src-testbench}"> - <fileset dir="uitest/src"> - <patternset refid="non-preprocessable-files" /> - </fileset> - </copy> - <copy todir="${result-src-junit}"> - <fileset dir="server/tests/src"> - <patternset refid="non-preprocessable-files" /> - </fileset> - <fileset dir="client/tests/src"> - <patternset refid="non-preprocessable-files" /> - </fileset> - </copy> - <copy todir="${result-src-theme-compiler-junit}"> - <fileset dir="theme-compiler/tests/src"> - <patternset refid="non-preprocessable-files" /> - </fileset> - <fileset dir="theme-compiler/tests/resources"> - <!-- test resources (files to compile and compare etc.) --> - </fileset> - </copy> - - </target> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WebContent - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <target name="webcontent" depends="preprocess-src,defaulttheme"> - - <!-- Add WebContent --> - <echo>Adding VAADIN/themes and META-INF</echo> - <copy todir="${output-dir}/WebContent"> - <fileset dir="WebContent"> - <exclude name="**/.svn" /> - <include name="WEB-INF/lib/hsqldb.jar" /> - <include name="VAADIN/themes/**/*" /> - <include name="VAADIN/vaadinBootstrap.js" /> - <include name="META-INF/**/*" /> - <include name="statictestfiles/**" /> - </fileset> - </copy> - - <!-- Add test files to be included in test war --> - <copy todir="${output-dir}/WebContent"> - <fileset dir="WebContent"> - <include name="statictestfiles/**" /> - </fileset> - </copy> - - <!-- Add servlet and portlet configuration files from WebContent --> - <copy todir="${output-dir}/WebContent/WEB-INF"> - <fileset dir="WebContent/WEB-INF"> - <include name="liferay-*.xml" /> - <include name="portlet.xml" /> - <include name="web.xml" /> - </fileset> - </copy> - - <!-- These should go to various JARs --> - <copy todir="${output-dir}/WebContent"> - <filterchain> - <expandproperties /> - <replacetokens begintoken="@" endtoken="@"> - <token key="version" value="${version.full}" /> - </replacetokens> - <replacetokens begintoken="@" endtoken="@"> - <token key="version-minor" value="${version.major}.${version.minor}" /> - </replacetokens> - <replacetokens begintoken="@" endtoken="@"> - <token key="builddate" value="${build.date}" /> - </replacetokens> - <replacetokens begintoken="@" endtoken="@"> - <token key="gwt-version" value="${gwt-version}" /> - </replacetokens> - </filterchain> - <fileset dir="WebContent"> - <exclude name="**/.svn" /> - <include name="release-notes.html" /> - <include name="license.html" /> - <include name="css/**" /> - <include name="img/**" /> - </fileset> - </copy> - </target> - - <target name="compile-server" depends="init, preprocess-src, compile-shared"> - <echo>Compiling server/src</echo> - <!-- Compile core sources first as the other sources depend on these --> - <mkdir dir="${result-classes-server}" /> - <javac destdir="${result-classes-server}" source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server" debug="true" encoding="UTF-8" includeantruntime="false"> - <classpath location="${result-classes-shared}"></classpath> - <src path="${result-src-server}"/> - </javac> - </target> - - <target name="compile-client" depends="init, preprocess-src, compile-server, compile-shared"> - <echo>Compiling client/src</echo> - <!-- Compile core sources first as the other sources depend on these --> - <mkdir dir="${result-classes-client}" /> - <javac destdir="${result-classes-client}" source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.client" debug="true" encoding="UTF-8" includeantruntime="false"> - <classpath location="${result-classes-shared}"></classpath> - <classpath location="${result-classes-server}"></classpath> - <src path="${result-src-client}"/> - </javac> - </target> - - <target name="compile-client-compiler" depends="init, preprocess-src, compile-client, compile-server, compile-shared"> - <echo>Compiling client-compiler/src</echo> - <mkdir dir="${result-classes-client-compiler}" /> - <javac destdir="${result-classes-client-compiler}" source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.client-compiler" debug="true" encoding="UTF-8" includeantruntime="false"> - <src path="${result-src-client-compiler}"/> - <!-- These could be removed by using class names instead of class references in generators --> - <classpath location="${result-classes-shared}"></classpath> - <classpath location="${result-classes-client}"></classpath> - <classpath location="${result-classes-server}"></classpath> - </javac> - </target> - - <target name="compile-shared" depends="init, preprocess-src"> - <echo>Compiling shared/src</echo> - <!-- Compile core sources first as the other sources depend on these --> - <mkdir dir="${result-classes-shared}" /> - <javac destdir="${result-classes-shared}" source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.shared" debug="true" encoding="UTF-8" includeantruntime="false"> - <src path="${result-src-shared}"/> - </javac> - </target> - - <target name="compile-tests" depends="compile-server,compile-client,compile-theme-compiler"> - <echo>Compiling src (Server and client side JUnit tests)</echo> - <!-- Compile server and client side JUnit tests --> - <mkdir dir="${result-classes-junit}" /> - <javac source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server-tests" destdir="${result-classes-junit}" debug="true" encoding="UTF-8" includeantruntime="false"> - <classpath path="${result-classes-shared}"></classpath> - <classpath path="${result-classes-server}"></classpath> - <classpath path="${result-classes-client}"></classpath> - <src path="${result-src-junit}"/> - </javac> - - <echo>Compiling SASS JUnit tests</echo> - <!-- Compile server and client side JUnit tests --> - <mkdir dir="${result-classes-theme-compiler-junit}" /> - <javac source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server-tests" destdir="${result-classes-theme-compiler-junit}" debug="true" encoding="UTF-8" includeantruntime="false"> - <classpath path="${result-classes-theme-compiler}"></classpath> - <src path="${result-src-theme-compiler-junit}"/> - </javac> - - <echo>Compiling src (TestBench tests)</echo> - <!-- Compile TestBench tests --> - <mkdir dir="${result-classes-testbench}" /> - <javac source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server" destdir="${result-classes-testbench}" debug="true" encoding="UTF-8" includeantruntime="false"> - <classpath path="${result-classes-junit}"></classpath> - <classpath path="${result-classes-server}"></classpath> - <classpath path="${result-classes-shared}"></classpath> - <classpath path="${result-classes-client}"></classpath> - <classpath refid="gwt.dev.user.jars"/> - <src path="${result-src-testbench}"/> - </javac> - - </target> - - <target name="compile-helpers" depends="init, compile-theme-compiler"> - <mkdir dir="${buildhelpers-classes}" /> - <javac source="${required.java.version}" target="${required.java.version}" includeantruntime="false" classpathref="compile.classpath.buildhelpers" destdir="${buildhelpers-classes}" debug="true" encoding="UTF-8" > - <!-- SASS --> - <classpath path="${result-classes-theme-compiler}" /> - - <src path="${buildhelpers-src}"/> - </javac> - </target> - - <target name="compile-theme-compiler-parser"> - <javacc target="${parserDir}/Parser.jj" javacchome="${JavaCChome}"> - </javacc> - </target> - - <target name="compile-theme-compiler" depends="init, preprocess-src"> - <!-- TODO also perform javacc compilation of the parser --> - <mkdir dir="${result-classes-theme-compiler}" /> - <javac source="${required.java.version}" target="${required.java.version}" includeantruntime="false" srcdir="${result-src-theme-compiler}" - classpathref="compile.classpath.theme-compiler" destdir="${result-classes-theme-compiler}" debug="true" encoding="UTF-8" /> - </target> - - <target name="defaulttheme" depends="init, compile-theme-compiler, compile-helpers" description="Compile all included themes"> - <echo>Combining default themes css files</echo> - <java classname="com.vaadin.buildhelpers.CompileDefaultTheme" failonerror="yes" fork="yes"> - <arg value="-version" /> - <arg value="${version.full}"/> - <classpath> - <!-- SASS --> - <path path="${result-classes-theme-compiler}" /> - <path location="${buildhelpers-classes}" /> - <path refid="compile.classpath.buildhelpers" /> - </classpath> - <jvmarg value="-Djava.awt.headless=true"/> - </java> - </target> - - <target name="testtarget"> - <echo>TEST TARGET CALLED</echo> - </target> - - <!-- ================================================================== --> - <!-- Widget Set Compilation --> - <!-- ================================================================== --> - <!-- Widget set compilation process: --> - <!-- 1. Preprocess sources --> - <!-- 2. Compile server-side java --> - <!-- 3. Generate widget set definitions and classes --> - <!-- 4. Compile widget sets --> - <!-- --> - <!-- Widget sets can be built for two purposes: --> - <!-- * for building installation packages --> - <!-- * for building single widget sets during development --> - <!-- Targets: widgetset-<name> --> - - <target name="remove-widgetset-gwt-tmp"> - <echo>Removing widgetset temp files</echo> - <delete dir="${widgetsets-output-dir}/.gwt-tmp" includeemptydirs="true"/> - <!-- This is generated by GWT 2.3+ for rpcPolicyManifest and symbolMaps, cannot disable --> - <delete dir="${widgetsets-output-dir}/WEB-INF" includeemptydirs="true" failonerror="false" /> - </target> - - <!-- The widgetset generator is currently compiled along with rest of server-side Java. --> - <target name="compile-widgetset-generator" depends="compile-server,compile-client, compile-client-compiler"/> - - <!-- Compiles the widgetset given as the first parameter --> - <!-- Caller must ensure necessary classes have been compiled --> - <target name="compile-widgetset"> - <fail unless="widgetset" message="No widgetset parameter set"/> - <property name="widgetset-style" value="OBF" /> - <property name="widgetset-localWorkers" value="2" /> - <property name="widgetset-extraParams" value="" /> - <echo>Compiling widgetset ${widgetset}. Output directory: ${widgetsets-output-dir}</echo> - <mkdir dir="${widgetsets-output-dir}"/> - - <!-- Disabled to reduce JAR size: precompile the widgetset to a .gwtar file --> - <!-- - <java classname="com.google.gwt.dev.CompileModule" classpathref="compile.classpath.widgetset" failonerror="yes" fork="yes" maxmemory="512m"> - <arg value="-out" /> - <arg value="${result-precompiled-widgetsets}" /> - <arg value="-strict" /> - <arg value="${widgetset}" /> - - <jvmarg value="-Xss8M"/> - <jvmarg value="-XX:MaxPermSize=256M"/> - <jvmarg value="-Djava.awt.headless=true"/> - </java> - --> - - <!-- compile the widgetset --> - <java classname="com.google.gwt.dev.Compiler" classpathref="compile.classpath.widgetset" failonerror="yes" fork="yes" maxmemory="512m"> - <arg value="-war" /> - <arg value="${widgetsets-output-dir}" /> - <arg value="-style" /> - <arg value="${widgetset-style}" /> - <arg value="-strict" /> - <arg value="-localWorkers" /> - <arg value="${widgetset-localWorkers}" /> - <arg line="${widgetset-extraParams}" /> - <arg value="${widgetset}" /> - - <sysproperty key="vFailIfNotSerializable" value="true" /> - - <jvmarg value="-Xss8M"/> - <jvmarg value="-XX:MaxPermSize=256M"/> - <jvmarg value="-Djava.awt.headless=true"/> - </java> - - <antcall target="remove-widgetset-gwt-tmp"/> - - <echo>Compiled ${widgetset}</echo> - </target> - - <target name="compile-widgetset-default"> - <antcall target="compile-widgetset"> - <reference refid="compile.classpath.widgetset" /> - <param name="widgetset" value="com.vaadin.DefaultWidgetSet"/> - </antcall> - </target> - - <target name="compile-widgetset-testing"> - <!-- Create a path reference containing default widgetset classpath + testbench files --> - <path id="compile.classpath.testingwidgetset"> - <path refid="compile.classpath.widgetset" /> - <pathelement location="${result-classes-testbench}" /> - <pathelement location="${result-src-testbench}" /> - </path> - <antcall target="compile-widgetset"> - <reference refid="compile.classpath.testingwidgetset" torefid="compile.classpath.widgetset" /> - <param name="widgetset" value="com.vaadin.tests.widgetset.TestingWidgetSet"/> - </antcall> - </target> - - <target name="compile-widgetset-portal-default" unless="compile.only.default-widgetset"> - <antcall target="compile-widgetset"> - <reference refid="compile.classpath.widgetset" /> - <param name="widgetset" value="com.vaadin.portal.gwt.PortalDefaultWidgetSet"/> - </antcall> - </target> - - <!-- Compiles all widgetsets. --> - <!-- This is called when building packages and when compiling all --> - <!-- widgetsets, but not when compiling individual widgetsets. --> - <target name="compile-client-side" depends="compile-gwt, compile-server-side, compile-tests, compile-client-compiler"> - <echo>Compiling widget sets in parallel.</echo> - <parallel threadsperprocessor="1"> - <antcall inheritrefs="true" target="compile-widgetset-default"/> - <antcall inheritrefs="true" target="compile-widgetset-testing"/> - <antcall inheritrefs="true" target="compile-widgetset-portal-default"/> - </parallel> - </target> - - <!-- Definitions for building local components, i.e., not for an installation package. --> - <target name="init-nonpackage" depends="build.properties"> - <!-- Definitions for building the client-side. --> - <property name="widgetsets-output-dir" value="WebContent/VAADIN/widgetsets" /> - - <echo>We are using ${gwt.dev.jar}.</echo> - <echo>Widget sets output dir: ${widgetsets-output-dir}</echo> - </target> - - <!-- Builds all widgetsets locally, i.e., not for an installation package. --> - <target name="widgetsets" depends="init-nonpackage, init, compile-widgetset-generator, compile-client-side"/> - - <!-- Build each widgetset locally, i.e., not for an installation package. --> - <target name="widgetset-default" depends="init-nonpackage, init, compile-gwt, compile-widgetset-generator, compile-widgetset-default" description="Compile the DefaultWidgetSet"/> - <target name="widgetset-testing" depends="init-nonpackage, init, compile-gwt, compile-tests, compile-widgetset-generator, compile-widgetset-testing"/> - <target name="widgetset-portal-default" depends="init-nonpackage, init, compile-gwt, compile-widgetset-generator, compile-widgetset-portal-default"/> - - <!-- ================================================================== --> - <!-- Libraries and Tests --> - <!-- ================================================================== --> - - <target name="compile-gwt" depends="init" unless="use.precompiled.gwt"> - <!-- skipped based on a parameter, use pre-compiled JARs from elsewhere --> - <!-- Compile GWT in a directory defined by properties --> - <ant antfile="${gwt.root}/build.xml" target="user" dir="${gwt.root}" inheritall="false" inheritrefs="false"> - <property name="gwt.root" value="${gwt.root}"/> - </ant> - <ant antfile="${gwt.root}/build.xml" target="dev" dir="${gwt.root}" inheritall="false" inheritrefs="false"> - <property name="gwt.root" value="${gwt.root}"/> - </ant> - <ant antfile="${gwt.root}/build.xml" target="codeserver" dir="${gwt.root}" inheritall="false" inheritrefs="false"> - <property name="gwt.root" value="${gwt.root}"/> - </ant> - <ant antfile="${gwt.root}/build.xml" target="elemental" dir="${gwt.root}" inheritall="false" inheritrefs="false"> - <property name="gwt.root" value="${gwt.root}"/> - </ant> - </target> - - <!-- Compile the Vaadin library JAR. --> - <!-- Need only the default widgetset for this, but can't depend --> - <!-- specifically on it, because dependence does not see compiled --> - <!-- individual widgetsets, because antcall does not fulfill --> - <!-- dependencies. --> - <target name="vaadin.jar" depends="compile-server-side, compile-client-side, compile-helpers"> - <echo>Creating JAR (server-side) ${lib-jar-name}</echo> - <!-- Create Vaadin JAR --> - <mkdir dir="${output-dir}/META-INF"/> - <echo file="${output-dir}/META-INF/VERSION">${version.full}</echo> - - <!-- Get Git revision --> - <exec executable="git" outputproperty="git.revision" failifexecutionfails="false" errorproperty=""> - <arg value="describe"/> - <arg value="--tags"/> - <arg value="--always"/> - <arg value="HEAD"/> - </exec> - - <!-- Replace GWT versioning with Vaadin versioning --> - <echo file="${result-classes-gwt}/com/google/gwt/dev/About.properties">gwt.version=${version.full} -gwt.svnrev=${git.revision}</echo> - - <jarjar jarfile="${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name}" - compress="true" manifest="build/package/META-INF/MANIFEST.MF" duplicate="preserve" index="true" > - <metainf dir="${output-dir}/META-INF"/> - <manifest> - <attribute name="Vaadin-Package-Version" value="1" /> - <attribute name="Vaadin-Widgetsets" value="com.vaadin.DefaultWidgetSet" /> - <attribute name="Implementation-Vendor" value="Vaadin Ltd" /> - <attribute name="Implementation-URL" value="http://vaadin.com" /> - <attribute name="Implementation-Version" value="${version.full}" /> - <!-- No separate GWT-Version attribute or file --> - <!-- <attribute name="GWT-Version" value="${gwt-version}" /> --> - <attribute name="GWT-Version-Dependencies" value="${gwt-version-dependencies}" /> - <attribute name="Bundle-Version" value="${version.full}" /> - </manifest> - <fileset dir="${result-classes-server}"/> - <fileset dir="${result-classes-client}"/> - <fileset dir="${result-classes-shared}"/> - <fileset dir="${result-classes-theme-compiler}"/> - <fileset dir="${result-classes-client-compiler}"/> - <!-- add sources --> - <fileset dir="${result-src-server}"/> - <fileset dir="${result-src-client}"/> - <fileset dir="${result-src-shared}"/> - <fileset dir="${result-src-theme-compiler}"/> - <fileset dir="${result-src-client-compiler}"/> - <fileset dir="${result-classes-gwt}"/> - <fileset dir="${output-dir}/WebContent"> - <patternset> - <include name="VAADIN/widgetsets/com.vaadin.DefaultWidgetSet/**/*" /> - <include name="VAADIN/themes/base/**/*" /> - <include name="VAADIN/themes/chameleon/**/*" /> - <include name="VAADIN/themes/liferay/**/*" /> - <include name="VAADIN/themes/runo/**/*" /> - <include name="VAADIN/themes/reindeer/**/*" /> - <include name="VAADIN/vaadinBootstrap.js" /> - - <include name="release-notes.html" /> - <include name="license.html" /> - <include name="css/**" /> - <include name="img/**" /> - </patternset> - </fileset> - - <!-- Precompiled widgetset (.gwtar file) not included to limit JAR size --> - <!-- <fileset dir="${result-precompiled-widgetsets}" includes="com/vaadin/DefaultWidgetSet.gwtar" /> --> - - <!-- TODO GWT related license files etc. should be in subdirectories --> - - <!-- GWT --> - <!-- Precompiled GWT modules (.gwtar file) not included to limit JAR size --> - <zipfileset src="${gwt.user.jar}" excludes="META-INF/**,javax/servlet/**,**/*.gwtar" /> - - <!-- TODO depends on locally compiled gwt-user --> - <!-- - <fileset dir="${gwt.user.dir}/src" excludes="**/package.html" /> - <fileset dir="${gwt.user.dir}/super" excludes="**/package.html" /> - <fileset dir="${gwt.user.bin}" excludes="**/*.gwtar" /> - - <zipfileset src="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" /> - <zipfileset src="${gwt.tools.lib}/w3c/flute/flute-1.3-gg2.jar" /> - <zipfileset src="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar" /> - --> - - <!-- GWT development JAR contents including many external dependencies --> - <zipfileset src="${gwt.dev.jar}" excludes="javax/servlet/**,javax/xml/**" > - <exclude name="com/google/gwt/dev/About.properties"/> - </zipfileset> - - <!-- Alternative approach: GWT compiler and its dependencies only from the dev JAR --> - <!-- - <zipfileset src="${gwt.dev.jar}"> - <include name="com/google/gwt/core/client/**"/> - <include name="com/google/gwt/core/shared/**"/> - - <include name="com/google/gwt/core/ext/**"/> - <include name="com/google/gwt/core/linker/**"/> - <include name="com/google/gwt/dev/About.java"/> - <include name="com/google/gwt/dev/GwtVersion.java"/> - <include name="com/google/gwt/dev/Permutation.java"/> - <include name="com/google/gwt/dev/asm/**"/> - <include name="com/google/gwt/dev/cfg/**"/> - <include name="com/google/gwt/dev/javac/**"/> - <include name="com/google/gwt/dev/jdt/**"/> - <include name="com/google/gwt/dev/jjs/**"/> - <include name="com/google/gwt/dev/js/**"/> - <include name="com/google/gwt/dev/json/**"/> - <include name="com/google/gwt/dev/resource/**"/> - <include name="com/google/gwt/dev/util/**"/> - <include name="com/google/gwt/soyc/**"/> - <include name="com/google/gwt/util/**"/> - <include name="org/eclipse/jdt/**"/> - </zipfileset> - <zipfileset src="${gwt.tools.lib}/apache/ant-1.6.5.jar" /> - <zipfileset src="${gwt.tools.lib}/eclipse/jdt-3.4.2_r894.jar" /> - <zipfileset src="${gwt.tools.lib}/tomcat/commons-collections-3.1.jar" /> - <zipfileset src="${gwt.tools.lib}/guava/guava-10.0.1/guava-10.0.1-rebased.jar" /> - <zipfileset src="${gwt.tools.lib}/jscomp/r1649/compiler-rebased.jar" /> - --> - - <!-- GWT SuperDevMode --> - <zipfileset src="${gwt.codeserver.jar}" /> - - <!-- GWT Elemental --> - <zipfileset src="${gwt.elemental.jar}" /> - - <!-- jarjar rules: rebase packages from gwt-dev.jar but not those from gwt-user --> - - <!-- Don't rebase these --> - <!-- xalan is used via reflection --> - <rule pattern="org.apache.xalan.**" result="@0"/> - <rule pattern="org.apache.xml.**" result="@0"/> - <!-- Cannot rebase - used in APIs etc. --> - <!-- <rule pattern="org.mortbay.**" result="@0"/> --> - <!-- <rule pattern="org.xml.**" result="@0"/> --> - - <!-- Rebase these --> - <rule pattern="com.gargoylesoftware.**" result="com.vaadin.external.@0"/> - <rule pattern="com.ibm.**" result="com.vaadin.external.@0"/> - <rule pattern="com.steadystate.**" result="com.vaadin.external.@0"/> - <rule pattern="mx4j.**" result="com.vaadin.external.@0"/> - <rule pattern="net.sourceforge.htmlunit.**" result="com.vaadin.external.@0"/> - <rule pattern="org.apache.**" result="com.vaadin.external.@0"/> - <rule pattern="org.cyberneko.**" result="com.vaadin.external.@0"/> - <rule pattern="org.eclipse.**" result="com.vaadin.external.@0"/> - <!-- looked up based on class name? --> - <rule pattern="org.hibernate.validator.**" result="com.vaadin.external.@0"/> - <rule pattern="org.jdesktop.swingworker.**" result="com.vaadin.external.@0"/> - <rule pattern="org.kohsuke.args4j.**" result="com.vaadin.external.@0"/> - - </jarjar> - - <!-- Generate the Export-Package attribute in the manifest of the JAR --> - <java classname="com.vaadin.buildhelpers.GeneratePackageExports" failonerror="true" fork="yes"> - <arg value="${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name}"/> - <classpath> - <pathelement location="${buildhelpers-classes}" /> - </classpath> - </java> - - <echo>##teamcity[publishArtifacts '${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name}']</echo> - </target> - - <target name="vaadin-sources.jar" depends="init"> - <jar file="${result-path}/${lib-sources-jar-name}" compress="true"> - <fileset dir="${result-src-server}"> - <patternset> - <include name="**/*.java" /> - </patternset> - </fileset> - <fileset dir="${result-src-shared}"> - <patternset> - <include name="**/*.java" /> - </patternset> - </fileset> - <fileset dir="${result-src-client}"> - <patternset> - <include name="**/*.java" /> - </patternset> - </fileset> - <fileset dir="${result-src-theme-compiler}"> - <patternset> - <include name="**/*.java" /> - </patternset> - </fileset> - <fileset dir="${output-dir}/WebContent"> - <patternset> - <include name="release-notes.html" /> - <include name="license.html" /> - <include name="css/**" /> - <include name="img/**" /> - </patternset> - </fileset> - </jar> - </target> - - <!-- ================================================================== --> - <!-- Documentation --> - <!-- ================================================================== --> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- Documentation: Add Javadoc to doc --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <target name="javadoc" depends="init, preprocess-src"> - <property name="javadoc.destdir" value="${output-dir}/WebContent/docs/api"/> - - <javadoc destdir="${javadoc.destdir}" author="true" version="true" use="true" windowtitle="${product-name}" classpathref="compile.classpath.client"> - <packageset dir="${result-src-server}"/> - <packageset dir="${result-src-client}"/> - <packageset dir="${result-src-shared}"/> - <doctitle>${javadoc.doctitle}</doctitle> - <!-- <header><![CDATA[<script type="text/javascript" src=".html-style/style.js"></script>]]></header> --> - <bottom>${javadoc.bottom}</bottom> - <link offline="true" href="http://docs.oracle.com/javase/6/docs/api/" packagelistLoc="build/javadoc/j2se-1.6.0" /> - <link offline="true" href="http://java.sun.com/j2ee/1.4/docs/api/" packagelistLoc="build/javadoc/j2ee-1.4" /> - </javadoc> - - <!-- Create a javadoc jar, mainly for Maven --> - <jar file="${result-path}/${lib-javadoc-jar-name}" compress="true"> - <fileset dir="${javadoc.destdir}"> - <patternset> - <include name="**" /> - </patternset> - </fileset> - <fileset dir="${output-dir}/WebContent"> - <patternset> - <include name="release-notes.html" /> - <include name="license.html" /> - <include name="css/**" /> - <include name="img/**" /> - </patternset> - </fileset> - </jar> - - <!-- Append local style definitions. --> - <echo>Appending local style definitions</echo> - <concat destfile="${javadoc.destdir}/stylesheet.css" append="yes"> - <filelist dir="build/javadoc" files="stylesheet-local.css"/> - </concat> - </target> - - <!-- ================================================================== --> - <!-- Difference to previous release package. --> - <!-- ================================================================== --> - - <!-- This should be called after the Linux package is ready. --> - <target name="differences" if="build.differences"> - <exec executable="python" searchpath="true" failonerror="true" output="${result-path}/differences.txt"> - <arg value="build/bin/package-diff.py"/> - <arg value="${version.full}"/> - </exec> - - <echo>##teamcity[publishArtifacts '${result-path}/differences.txt']</echo> - </target> - - <!-- ================================================================== --> - <!-- Custom build. --> - <!-- ================================================================== --> - - <!-- Main target for the custom build. --> - <!-- Need to read custom build configuration before calling clean-result --> - <target name="custom-build" depends="custom-build-init, clean-result, nightly-init, init, build"> - </target> - - - <!-- Initialize a custom build. --> - <target name="custom-build-init"> - <echo>Preparing a custom build with properties file: ${build.properties.file}</echo> - - <!-- Custom build support --> - <antcontrib:if> - <isset property="build.properties.file"/> - <then> - <tstamp> - <format property="build.date.compact" pattern="yyyyMMdd"/> - </tstamp> - <property file="${build.properties.file}" /> - <property name="version" value="${vaadin.version}"/> - <property name="version.full" value="${version}-${build.date.compact}"/> - </then> - <!-- Otherwise version is set by the target "init" --> - </antcontrib:if> - </target> - - <target name="custom-build-maven-publish"> - <antcall target="nightly-maven-publish" /> - </target> - - - <!-- ================================================================== --> - <!-- Nightly build. --> - <!-- ================================================================== --> - - <!-- Main target for the nightly build. --> - <target name="nightly" depends="clean-result, nightly-init, init, build, javadoc, differences"> - </target> - - - <!-- Initialize a nightly build. --> - <target name="nightly-init" depends="build.properties"> - - <!-- Mandatory parameters. --> - <fail unless="build.number" message="The build.number property must be defined."/> - <fail unless="nightly.publish" message="The nightly.publish property must be defined."/> - - <!-- Optional parameters. --> - <property name="build.tag" value="dev"/> - - <echo>Base version: ${version}</echo> - <echo>Build number: ${build.number}</echo> - <echo>Build tag: ${build.tag}</echo> - <echo>Publish target: ${nightly.publish}</echo> - <echo>Demo publish target: ${nightly.demo.publish}</echo> - - <!-- Set build number. --> - <tstamp> - <format property="nightly.date" pattern="yyyyMMdd"/> - </tstamp> - <property name="version.full" value="${version}.${build.tag}-${nightly.date}-${build.number}"/> - - <echo>Version will be: ${version.full}</echo> - - <!-- Tell TeamCity the build name. Have to do it this way, because --> - <!-- this script needs to get the plain build number as a parameter. --> - <echo>##teamcity[buildNumber '${version}-c${build.number}']</echo> - </target> - - <target name="nightly-teamcity-publish"> - <!-- Publish as a TeamCity artifact. --> - <echo>##teamcity[publishArtifacts '${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name}']</echo> - </target> - - <!-- Copies the nightly build artifacts to the download server. --> - <target name="nightly-download-publish" if="nightly.publish"> - <!-- Publish to the download server. --> - <echo>Installing ${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name} to ${nightly.publish}</echo> - <echo>Hopefully you have permissions for the copy operation with SSH.</echo> - - <!-- Copy the linux installation package and the JAR. --> - <exec executable="scp" searchpath="true" resultproperty="nightly.install.scp.result"> - <arg value="-B"/> - <arg value="${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name}"/> - <arg value="${nightly.publish}"/> - </exec> - - <echo>Result: ${nightly.install.scp.result}</echo> - </target> - - <!-- Copies the nightly build artifacts to the download server. --> - <target name="nightly-tests-publish" if="nightly.demo.publish" depends="internal-package-war"> - <fail unless="version.major" message="Major version must be defined in version.major"/> - <fail unless="version.minor" message="Major version must be defined in version.minor"/> - - - <!-- Publish to the demo server. --> - <property name="src" value="${result-path}/${test-war-filename}"/> - <property name="target" value="${nightly.demo.publish}/${version.major}.${version.minor}-${build.tag}.war"/> - - <echo>Installing ${src} to ${target}</echo> - - <!-- Copy the linux installation package and the JAR. --> - <exec executable="scp" searchpath="true" resultproperty="nightly.demo.install.scp.result"> - <arg value="-B"/> - <arg value="${src}"/> - <arg value="${target}"/> - </exec> - - <echo>Result: ${nightly.install.scp.result}</echo> - </target> - - <target name="nightly-publish" depends="nightly-teamcity-publish, nightly-download-publish, nightly-tests-publish"> - </target> - - - <target name="nightly-maven-pom.xml"> - <echo>Creating pom.xml for nightly build</echo> - <property name="vaadin.version.maven" value="${version.major}.${version.minor}-SNAPSHOT" /> - <copy tofile="build/maven/pom.xml"> - <filterchain> - <expandproperties /> - <replacetokens begintoken="@" endtoken="@"> - <token key="MAVEN-VERSION" value="${vaadin.version.maven}" /> - </replacetokens> - </filterchain> - <fileset file="build/maven/pom-template.xml"/> - </copy> - </target> - - <target name="nightly-maven-publish" depends="nightly-maven-pom.xml"> - <property file="${gpg.passphrase.file}" /> - - <echo>Publishing ${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name} to Maven repository</echo> - <artifact:mvn failonerror="true"> - <arg value="gpg:sign-and-deploy-file"/> - <!-- .. is a workaround as maven runs in the build directory --> - <sysproperty key="file" value="../${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name}" /> - <sysproperty key="pomFile" value="maven/pom.xml" /> - <sysproperty key="repositoryId" value="vaadin-snapshots" /> - <sysproperty key="url" value="${snapshot.repository.url}" /> - <sysproperty key="gpg.passphrase" value="${gpg.passphrase}" /> - </artifact:mvn> - </target> - - <target name="local-maven-pom.xml"> - <echo>Creating pom.xml for local test build</echo> - <fail unless="version.major" message="Major version must be defined in version.major"/> - <fail unless="version.minor" message="Major version must be defined in version.minor"/> - <property name="vaadin.version.maven" value="${version.major}.${version.minor}" /> - <copy tofile="build/maven/pom.xml"> - <filterchain> - <expandproperties /> - <replacetokens begintoken="@" endtoken="@"> - <token key="MAVEN-VERSION" value="${vaadin.version.maven}" /> - </replacetokens> - </filterchain> - <fileset file="build/maven/pom-template.xml"/> - </copy> - </target> - - <target name="local-maven-publish" depends="local-maven-pom.xml"> - <echo>Publishing ${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name} to the local Maven repository</echo> - <artifact:mvn> - <arg value="install:install-file"/> - <!-- .. is a workaround as maven runs in the build directory --> - <sysproperty key="file" value="../${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name}" /> - <sysproperty key="pomFile" value="maven/pom.xml" /> - </artifact:mvn> - </target> - - <!-- ================================================================== --> - <!-- Automated tests. --> - <!-- ================================================================== --> - - <target name="tests" depends="compile-tests, internal-package-war"> - <!-- Run all different types of tests in parallel to decrease testing time --> - <parallel threadcount="3"> - <sequential> - <!-- Sleep before running integration tests so testbench tests have time to compile and start --> - <sleep minutes="4" /> - <antcall inheritrefs="true" inheritall="true" target="integration-tests"></antcall> - </sequential> - <antcall inheritrefs="true" inheritall="true" target="testbench-tests"></antcall> - <antcall inheritrefs="true" inheritall="true" target="server-side-tests"></antcall> - <antcall inheritrefs="true" inheritall="true" target="theme-compiler-tests"></antcall> - </parallel> - </target> - - <!-- Assumes java classes have been compiled but depends does not work out well as this is run from a <parallel> task--> - <target name="server-side-tests" unless="tests.serverside.skip" depends="compile-tests"> - <junit printsummary="yes"> - <classpath> - <pathelement path="${result-classes-server}" /> - <pathelement path="${result-classes-shared}" /> - <pathelement path="${result-classes-junit}" /> - <path refid="compile.classpath.server-tests"></path> - </classpath> - - <batchtest fork="yes"> - <fileset dir="server/tests/src" includes="**/*.java" excludes="**/Abstract*.java,com/vaadin/tests/data/bean/*.java,com/vaadin/tests/util/*.java,**/VaadinClasses.java" /> - <fileset dir="client/tests/src" includes="**/*.java" excludes="**/Abstract*.java" /> - </batchtest> - </junit> - </target> - - <!-- Assumes java classes have been compiled but depends does not work out well as this is run from a <parallel> task--> - <target name="theme-compiler-tests" unless="tests.serverside.skip" depends="compile-tests"> - <junit printsummary="yes"> - <classpath> - <pathelement path="${result-src-theme-compiler-junit}" /> - <pathelement path="${result-classes-theme-compiler}" /> - <pathelement path="${result-classes-theme-compiler-junit}" /> - <path refid="compile.classpath.server-tests"></path> - </classpath> - - <batchtest fork="yes"> - <fileset dir="${result-src-theme-compiler-junit}" includes="**/*.java" excludes="**/Abstract*.java" /> - </batchtest> - </junit> - </target> - - <!-- Assumes java classes have been compiled but depends does not work out well as this is run from a <parallel> task--> - <target name="testbench-tests" unless="tests.testbench.skip"> - <fail unless="product-file" message="The 'product-file' property must be defined."/> - <fail unless="version" message="The 'version' property must be defined."/> - - <echo>Version: ${version.full}</echo> - - <!-- Parameters for the test.xml script. --> - <fail unless="com.vaadin.testbench.tester.host" message="The 'com.vaadin.testbench.tester.host' property must be defined."/> - <fail unless="com.vaadin.testbench.deployment.url" message="The 'com.vaadin.testbench.deployment.url' property must be defined."/> - <fail unless="com.vaadin.testbench.lib.dir" message="The 'com.vaadin.testbench.lib.dir' property must be defined."/> - - <property name="com.vaadin.testbench.screenshot.block.error" value="0.025"/> - <property name="com.vaadin.testbench.debug" value="false"/> - <property name="package.name" value="${base-name}"/> - - <!-- Only Linux tests allowed. TODO: Generalize this. --> - <property name="package.filename" value="${result-path}/${test-war-filename}"/> - - <!-- Run the separate test script. --> - <ant antfile="uitest/test.xml" target="test-package" inheritall="false" inheritrefs="true"> - <!-- This is provided so that the test script can copy the --> - <!-- "tests" classes after unpacking the package. --> - <property name="output-dir" value="${output-dir}"/> - - <!-- Convert tests to run multiple times if failed. --> - <property name="retries" value="2"/> - - <property name="package.filename" value="${basedir}/${package.filename}"/> - <property name="testing.testarea" value="/tmp/testarea"/> - <property name="package.name" value="${package.name}"/> - <property name="test-output-dir" value="../build/test-output" /> - <property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}"/> - <property name="com.vaadin.testbench.deployment.url" value="${com.vaadin.testbench.deployment.url}"/> - <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}"/> - <property name="com.vaadin.testbench.debug" value="${com.vaadin.testbench.debug}"/> - <property name="com.vaadin.testbench.screenshot.block.error" value="${com.vaadin.testbench.screenshot.block.error}"/> - - <property name="deps.initialized" value="${deps.initialized}"/> - - </ant> - - </target> - - <!-- Assumes java classes have been compiled but depends does not work out well as this is run from a <parallel> task--> - <target name="integration-tests" depends="init-deps" unless="tests.integration.skip"> - <!-- Parameters for the test.xml script. --> - <fail unless="com.vaadin.testbench.tester.host" message="The 'com.vaadin.testbench.tester.host' property must be defined."/> - <fail unless="com.vaadin.testbench.lib.dir" message="The 'com.vaadin.testbench.lib.dir' property must be defined."/> - <fail unless="sshkey.file" message="The 'sshkey.file' property must be defined."/> - - <!-- Empty passphrase if no passphrase defined --> - <property name="passphrase" value="" /> - <property name="tests.war" location="${result-path}/${test-war-filename}" /> - - <!-- Run the separate test script. --> - <ant antfile="uitest/integration_tests.xml" target="integration-test-all" inheritall="false" inheritrefs="true"> - <!-- This is provided so that the test script can copy the --> - <!-- "tests" classes after unpacking the package. --> - <property name="output-dir" value="${output-dir}"/> - - <property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}"/> - <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}"/> - <property name="sshkey.file" value="${sshkey.file}" /> - <property name="passphrase" value="${passphrase}" /> - <property name="demo.war" value="${tests.war}"/> - - <property name="deps.initialized" value="${deps.initialized}"/> - </ant> - </target> - -</project> - -<!-- These are for emacs. --> -<!-- Keep this comment at the end of the file -Local variables: -mode: xml -sgml-omittag:nil -sgml-shorttag:nil -sgml-namecase-general:nil -sgml-general-insert-case:lower -sgml-minimize-attributes:nil -sgml-always-quote-attributes:t -sgml-indent-step:4 -sgml-indent-data:t -sgml-parent-document:nil -sgml-exposed-tags:nil -sgml-local-catalogs:("/etc/sgml/catalog" "/usr/share/xemacs21/xemacs-packages/etc/psgml-dtds/CATALOG") -sgml-local-ecat-files:("ECAT" "~/sgml/ECAT" "/usr/share/sgml/ECAT" "/usr/local/share/sgml/ECAT" "/usr/local/lib/sgml/ECAT") -End: ---> diff --git a/build/cssoptimizer/cssoptimizer b/build/cssoptimizer/cssoptimizer Binary files differdeleted file mode 100644 index ff0e49b4a3..0000000000 --- a/build/cssoptimizer/cssoptimizer +++ /dev/null diff --git a/build/html-style.properties b/build/html-style.properties deleted file mode 100644 index c517b25080..0000000000 --- a/build/html-style.properties +++ /dev/null @@ -1,15 +0,0 @@ -html.body.tag=<body> -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>© Vaadin Ltd. 2000-2011</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>Vaadin</h1> -javadoc.bottom=<i>Copyright © 2000-2011 Vaadin 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>© Vaadin Ltd. 2000-2011</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/ide.xml b/build/ide.xml index 30c78e31c7..f2b3214227 100755 --- a/build/ide.xml +++ b/build/ide.xml @@ -2,11 +2,12 @@ <project xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:artifact="antlib:org.apache.maven.artifact.ant" xmlns:ivy="antlib:org.apache.ivy.ant" name="Build script for IDE users" basedir=".." default="theme-and-default-widgetset"> <!-- FIXME, should use 7.0-SNAPSHOT of client compiler --> - <property name="classes" location="build/classes" /> + <property name="work.dir" location="work" /> <property name="gwt.root" location="${basedir}/../trunk" /> <property name="gwt.lib.dir" location="${gwt.root}/build/lib" /> <property name="gwt.user.jar" location="${gwt.lib.dir}/gwt-user.jar" /> <property name="gwt.dev.jar" location="${gwt.lib.dir}/gwt-dev.jar" /> + <property name="theme-version" location="9.9.9.INTERNAL-DEBUG-BUILD" /> <echo>Using gwt-dev.jar from ${gwt.dev.jar}</echo> <ivy:cachepath pathid="ivy.deps" inline="true" organisation="javax.validation" module="validation-api" revision="1.0.0.GA" conf="default,sources" /> @@ -17,7 +18,8 @@ <pathelement location="${gwt.dev.jar}" /> <path refid="ivy.deps" /> <path refid="ivy.deps2" /> - <path location="${classes}" /> + <path location="bin" /> + <path location="build/classes" /> <path location="server/src" /> <path location="shared/src" /> <path location="client/src" /> @@ -49,6 +51,8 @@ <jvmarg value="-Djava.awt.headless=true" /> <arg value="--theme" /> <arg value="${theme}" /> + <arg value="--theme-version" /> + <arg value="${theme-version}" /> <arg value="--theme-folder" /> <arg value="WebContent/VAADIN/themes" /> </java> @@ -63,7 +67,7 @@ <mkdir dir="${module.output.dir}" /> - <echo>Compiling ${module} to ${module.output.dir}</echo> + <echo>Compiling ${module} to ${module.output.dir} with parameters -logLevel TRACE -style ${style} -localWorkers ${localWorkers} -strict ${extraParams}</echo> <!--<ivy:resolve inline="true" organisation="javax.validation" module="validation-api" revision="1.0.0.GA"/>--> diff --git a/build/ivy/buildhelpers-ivy.xml b/build/ivy/buildhelpers-ivy.xml deleted file mode 100644 index 13e89eb734..0000000000 --- a/build/ivy/buildhelpers-ivy.xml +++ /dev/null @@ -1,19 +0,0 @@ -<ivy-module version="2.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation= "http://ant.apache.org/ivy/schemas/ivy.xsd"> - - <info organisation="com.vaadin" module="buildhelpers"/> - <configurations> - <conf name="compile" visibility="private"/> - </configurations> - <publications /> - <dependencies> - <dependency org="com.carrotsearch" name="smartsprites" rev="0.2.3-itmill" conf="compile->compile(*),master(*)"/> - - <!-- These come with GWT for Vaadin JAR but are needed to compile CompileDefaultTheme --> - <!-- - <dependency org="org.w3c.css" name="sac" rev="1.3" conf="compile->compile(*),master(*)"/> - <dependency org="org.w3c" name="flute" rev="1.2" conf="compile->compile(*),master(*)"/> - --> - </dependencies> -</ivy-module>
\ No newline at end of file diff --git a/build/ivy/ivy.xml b/build/ivy/ivy.xml deleted file mode 100644 index df30458e25..0000000000 --- a/build/ivy/ivy.xml +++ /dev/null @@ -1,52 +0,0 @@ -<ivy-module version="2.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation= "http://ant.apache.org/ivy/schemas/ivy.xsd"> - - <info organisation="com.vaadin" module="vaadin"/> - <configurations> - <conf name="server.extdep" extends="client.extdep" description="Server side compilation dependencies" visibility="private"/> - <conf name="shared.extdep" extends="server.extdep" description="Shared compilation dependencies" visibility="private"/> - <conf name="client.extdep" description="Client side compilation dependencies" visibility="private"/> - <conf name="client-compiler.extdep" description="Client side compilation dependencies" visibility="private"/> - <conf name="server.tests.extdep" extends="server.extdep" description="Test compilation dependencies" visibility="private"/> - <conf name="taskdefs" description="Ant task definitions" visibility="private" /> - </configurations> - <publications /> - <dependencies defaultconf="server.extdep" defaultconfmapping="server.extdep->master"> - - <!--Servlet API version 2.5 --> - <dependency org="javax.servlet" name="servlet-api" rev="2.5" /> - - <!-- Liferay Portal Service --> - <dependency org="com.liferay.portal" name="portal-service" rev="6.0.2" /> - <!--Portlet API version 2.0 (JSR-286) --> - <dependency org="javax.portlet" name="portlet-api" rev="2.0" /> - <!-- Google App Engine --> - <dependency org="com.google.appengine" name="appengine-api-1.0-sdk" rev="1.2.1" /> - - <!-- GWT dependencies (validation-api) --> - <dependency org="javax.validation" name="validation-api" rev="1.0.0.GA" conf="client.extdep->master,sources" /> - - <!-- Test frameworks & related --> - <dependency org="junit" name="junit" rev="4.5" conf="server.tests.extdep -> master"/> - <dependency org="org.easymock" name="easymock" rev="3.0" conf="server.tests.extdep -> master, runtime(*)"/> - <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6" conf="server.tests.extdep -> master, runtime(*)"/> - - <!-- Additional libraries used by tests - also included from GWT --> - <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.26" conf="server.tests.extdep -> master"/> - <dependency org="org.mortbay.jetty" name="jetty-util" rev="6.1.26" conf="server.tests.extdep -> master"/> - <dependency org="commons-lang" name="commons-lang" rev="2.6" conf="server.tests.extdep -> master"/> - <dependency org="commons-io" name="commons-io" rev="2.3" conf="server.tests.extdep -> master"/> - <dependency org="commons-codec" name="commons-codec" rev="1.6" conf="server.tests.extdep -> master"/> - - <!-- Ant tasks --> - <dependency org="ant-contrib" name="ant-contrib" rev="1.0b3" conf="taskdefs ->master"/> - <dependency org="org.apache.maven" name="maven-ant-tasks" rev="2.0.10" conf="taskdefs ->master"/> - <dependency org="com.googlecode.jarjar" name="jarjar" rev="1.3" conf="taskdefs ->master"/> - - <!-- Bean Validation implementation --> - <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" conf="server.tests.extdep -> default"/> - <dependency org="org.hibernate" name="hibernate-validator" rev="4.2.0.Final" conf="server.tests.extdep -> default"/> - </dependencies> - -</ivy-module>
\ No newline at end of file diff --git a/build/ivy/ivysettings.xml b/build/ivy/ivysettings.xml deleted file mode 100644 index 613b8d9ffe..0000000000 --- a/build/ivy/ivysettings.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ivysettings> - <settings defaultResolver="public" /> - <resolvers> - <ibiblio name="public" m2compatible="true"/> - <url name="gwt-redist"> - <artifact pattern="http://google-web-toolkit.googlecode.com/svn/tools/redist/[organisation]/[artifact](-[revision]).[ext]" /> - </url> - <dual name="custom-smartsprites"> - <filesystem name="smartsprites-ivy"> - <ivy pattern="${basedir}/build/ivy/module/[module]-ivy-[revision].xml" /> - </filesystem> - <url name="smartsprites-artifact"> - <artifact pattern="http://dev.vaadin.com/svn/versions/6.8/build/smartsprites/lib/[artifact](-[revision]).[ext]" /> - </url> - </dual> - </resolvers> - <modules> - <!-- GWT patched Emma --> - <module organisation="emma" name="emma" resolver="gwt-redist"/> - <!-- IT Mill patched SmartSprites --> - <module organisation="com.carrotsearch" name="smartsprites" revision="0.2.3-itmill" resolver="custom-smartsprites"/> - </modules> -</ivysettings>
\ No newline at end of file diff --git a/build/ivy/module/smartsprites-ivy-0.2.3-itmill.xml b/build/ivy/module/smartsprites-ivy-0.2.3-itmill.xml deleted file mode 100644 index 495b6d00c9..0000000000 --- a/build/ivy/module/smartsprites-ivy-0.2.3-itmill.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven"> - <info organisation="com.carrotsearch" - module="smartsprites" - revision="0.2.3-itmill" - status="release" - publication="20111130000000"> - <license name="BSD license" url="http://csssprites.org/smartsprites.LICENSE" /> - <description homepage="http://csssprites.org"> - CSS Sprites Generator Done Right. SmartSprites maintains CSS sprites in your designs, - fully automatically. No tedious copying and pasting to your CSS when adding or changing - sprited images. - </description> - </info> - <configurations> - <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf" extends="runtime,master"/> - <conf name="master" visibility="public" description="contains only the artifact published by this module itself, with no transitive dependencies"/> - <conf name="compile" visibility="public" description="this is the default scope, used if none is specified. Compile dependencies are available in all classpaths."/> - <conf name="provided" visibility="public" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/> - <conf name="runtime" visibility="public" description="this scope indicates that the dependency is not required for compilation, but is for execution. It is in the runtime and test classpaths, but not the compile classpath." extends="compile"/> - <conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." extends="runtime"/> - <conf name="system" visibility="public" description="this scope is similar to provided except that you have to provide the JAR which contains it explicitly. The artifact is always available and is not looked up in a repository."/> - <conf name="sources" visibility="public" description="this configuration contains the source artifact of this module, if any."/> - <conf name="javadoc" visibility="public" description="this configuration contains the javadoc artifact of this module, if any."/> - <conf name="optional" visibility="public" description="contains all optional dependencies"/> - </configurations> - <publications> - <artifact name="smartsprites" type="jar" ext="jar" conf="master"/> - </publications> - <dependencies> - <dependency org="com.google.collections" name="google-collections" rev="0.9" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> - <dependency org="args4j" name="args4j" rev="2.0.9" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> - <dependency org="commons-math" name="commons-math" rev="1.1" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> - <dependency org="commons-io" name="commons-io" rev="1.4" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> - <dependency org="commons-lang" name="commons-lang" rev="2.3" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> - <dependency org="junit" name="junit" rev="4.4" force="true" conf="test->runtime(*),master(*)"/> - </dependencies> -</ivy-module> diff --git a/build/javadoc/j2ee-1.4/package-list b/build/javadoc/j2ee-1.4/package-list deleted file mode 100644 index 0ab47a9b19..0000000000 --- a/build/javadoc/j2ee-1.4/package-list +++ /dev/null @@ -1,54 +0,0 @@ -javax.activation -javax.ejb -javax.ejb.spi -javax.enterprise.deploy.model -javax.enterprise.deploy.shared -javax.enterprise.deploy.shared.factories -javax.enterprise.deploy.spi -javax.enterprise.deploy.spi.exceptions -javax.enterprise.deploy.spi.factories -javax.enterprise.deploy.spi.status -javax.jms -javax.mail -javax.mail.event -javax.mail.internet -javax.mail.search -javax.management -javax.management.j2ee -javax.management.j2ee.statistics -javax.management.loading -javax.management.modelmbean -javax.management.monitor -javax.management.openmbean -javax.management.relation -javax.management.timer -javax.resource -javax.resource.cci -javax.resource.spi -javax.resource.spi.endpoint -javax.resource.spi.security -javax.resource.spi.work -javax.security.jacc -javax.servlet -javax.servlet.http -javax.servlet.jsp -javax.servlet.jsp.el -javax.servlet.jsp.tagext -javax.transaction -javax.transaction.xa -javax.xml.namespace -javax.xml.parsers -javax.xml.registry -javax.xml.registry.infomodel -javax.xml.rpc -javax.xml.rpc.encoding -javax.xml.rpc.handler -javax.xml.rpc.handler.soap -javax.xml.rpc.holders -javax.xml.rpc.server -javax.xml.rpc.soap -javax.xml.soap -javax.xml.transform -javax.xml.transform.dom -javax.xml.transform.sax -javax.xml.transform.stream diff --git a/build/javadoc/j2se-1.6.0/package-list b/build/javadoc/j2se-1.6.0/package-list deleted file mode 100644 index 42c9b950ef..0000000000 --- a/build/javadoc/j2se-1.6.0/package-list +++ /dev/null @@ -1,203 +0,0 @@ -java.applet -java.awt -java.awt.color -java.awt.datatransfer -java.awt.dnd -java.awt.event -java.awt.font -java.awt.geom -java.awt.im -java.awt.im.spi -java.awt.image -java.awt.image.renderable -java.awt.print -java.beans -java.beans.beancontext -java.io -java.lang -java.lang.annotation -java.lang.instrument -java.lang.management -java.lang.ref -java.lang.reflect -java.math -java.net -java.nio -java.nio.channels -java.nio.channels.spi -java.nio.charset -java.nio.charset.spi -java.rmi -java.rmi.activation -java.rmi.dgc -java.rmi.registry -java.rmi.server -java.security -java.security.acl -java.security.cert -java.security.interfaces -java.security.spec -java.sql -java.text -java.text.spi -java.util -java.util.concurrent -java.util.concurrent.atomic -java.util.concurrent.locks -java.util.jar -java.util.logging -java.util.prefs -java.util.regex -java.util.spi -java.util.zip -javax.accessibility -javax.activation -javax.activity -javax.annotation -javax.annotation.processing -javax.crypto -javax.crypto.interfaces -javax.crypto.spec -javax.imageio -javax.imageio.event -javax.imageio.metadata -javax.imageio.plugins.bmp -javax.imageio.plugins.jpeg -javax.imageio.spi -javax.imageio.stream -javax.jws -javax.jws.soap -javax.lang.model -javax.lang.model.element -javax.lang.model.type -javax.lang.model.util -javax.management -javax.management.loading -javax.management.modelmbean -javax.management.monitor -javax.management.openmbean -javax.management.relation -javax.management.remote -javax.management.remote.rmi -javax.management.timer -javax.naming -javax.naming.directory -javax.naming.event -javax.naming.ldap -javax.naming.spi -javax.net -javax.net.ssl -javax.print -javax.print.attribute -javax.print.attribute.standard -javax.print.event -javax.rmi -javax.rmi.CORBA -javax.rmi.ssl -javax.script -javax.security.auth -javax.security.auth.callback -javax.security.auth.kerberos -javax.security.auth.login -javax.security.auth.spi -javax.security.auth.x500 -javax.security.cert -javax.security.sasl -javax.sound.midi -javax.sound.midi.spi -javax.sound.sampled -javax.sound.sampled.spi -javax.sql -javax.sql.rowset -javax.sql.rowset.serial -javax.sql.rowset.spi -javax.swing -javax.swing.border -javax.swing.colorchooser -javax.swing.event -javax.swing.filechooser -javax.swing.plaf -javax.swing.plaf.basic -javax.swing.plaf.metal -javax.swing.plaf.multi -javax.swing.plaf.synth -javax.swing.table -javax.swing.text -javax.swing.text.html -javax.swing.text.html.parser -javax.swing.text.rtf -javax.swing.tree -javax.swing.undo -javax.tools -javax.transaction -javax.transaction.xa -javax.xml -javax.xml.bind -javax.xml.bind.annotation -javax.xml.bind.annotation.adapters -javax.xml.bind.attachment -javax.xml.bind.helpers -javax.xml.bind.util -javax.xml.crypto -javax.xml.crypto.dom -javax.xml.crypto.dsig -javax.xml.crypto.dsig.dom -javax.xml.crypto.dsig.keyinfo -javax.xml.crypto.dsig.spec -javax.xml.datatype -javax.xml.namespace -javax.xml.parsers -javax.xml.soap -javax.xml.stream -javax.xml.stream.events -javax.xml.stream.util -javax.xml.transform -javax.xml.transform.dom -javax.xml.transform.sax -javax.xml.transform.stax -javax.xml.transform.stream -javax.xml.validation -javax.xml.ws -javax.xml.ws.handler -javax.xml.ws.handler.soap -javax.xml.ws.http -javax.xml.ws.soap -javax.xml.ws.spi -javax.xml.ws.wsaddressing -javax.xml.xpath -org.ietf.jgss -org.omg.CORBA -org.omg.CORBA.DynAnyPackage -org.omg.CORBA.ORBPackage -org.omg.CORBA.TypeCodePackage -org.omg.CORBA.portable -org.omg.CORBA_2_3 -org.omg.CORBA_2_3.portable -org.omg.CosNaming -org.omg.CosNaming.NamingContextExtPackage -org.omg.CosNaming.NamingContextPackage -org.omg.Dynamic -org.omg.DynamicAny -org.omg.DynamicAny.DynAnyFactoryPackage -org.omg.DynamicAny.DynAnyPackage -org.omg.IOP -org.omg.IOP.CodecFactoryPackage -org.omg.IOP.CodecPackage -org.omg.Messaging -org.omg.PortableInterceptor -org.omg.PortableInterceptor.ORBInitInfoPackage -org.omg.PortableServer -org.omg.PortableServer.CurrentPackage -org.omg.PortableServer.POAManagerPackage -org.omg.PortableServer.POAPackage -org.omg.PortableServer.ServantLocatorPackage -org.omg.PortableServer.portable -org.omg.SendingContext -org.omg.stub.java.rmi -org.w3c.dom -org.w3c.dom.bootstrap -org.w3c.dom.events -org.w3c.dom.ls -org.xml.sax -org.xml.sax.ext -org.xml.sax.helpers
\ No newline at end of file diff --git a/build/javadoc/stylesheet-local.css b/build/javadoc/stylesheet-local.css deleted file mode 100644 index ae1fb5c4c9..0000000000 --- a/build/javadoc/stylesheet-local.css +++ /dev/null @@ -1,14 +0,0 @@ - -/***********************************************************************/ -/* Custom Vaadin API JavaDoc style definitions */ -/* */ -/* This stylesheet is appended to the generated JavaDoc stylesheet.css */ -/***********************************************************************/ - -/* As Eclipse forces a newline before the ending </pre> tag, we need - to compensate for the extra line. This requires that the 'code' - style class is inserted into the source files as JavaDoc does - not add any particular style in the generated files. */ -pre.code { - margin-bottom: -1.5em; -} diff --git a/build/maven/pom-template.xml b/build/maven/pom-template.xml deleted file mode 100644 index 03af6338da..0000000000 --- a/build/maven/pom-template.xml +++ /dev/null @@ -1,63 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>com.vaadin</groupId> - <artifactId>vaadin</artifactId> - <version>@MAVEN-VERSION@</version> - <name>Vaadin</name> - <organization> - <name>Vaadin Ltd</name> - <url>http://vaadin.com</url> - </organization> - <url>http://vaadin.com</url> - <description> - Vaadin is a web application framework for Rich Internet Applications (RIA). - - Vaadin enables easy development and maintenance of fast and secure rich web - applications with a stunning look and feel and a wide browser support. - It features a server-side architecture with the majority of the logic running - on the server. Ajax technology is used at the browser-side to ensure a rich - and interactive user experience. - </description> - <licenses> - <license> - <name>Apache License Version 2.0</name> - <distribution>repo</distribution> - <url>http://www.apache.org/licenses/LICENSE-2.0</url> - </license> - </licenses> - <distributionManagement> - <repository> - <id>vaadin-releases</id> - <name>Vaadin release repository</name> - <url>http://oss.sonatype.org/content/repositories/vaadin-releases/</url> - </repository> - <snapshotRepository> - <id>vaadin-snapshots</id> - <name>Vaadin snapshot repository</name> - <url>http://oss.sonatype.org/content/repositories/vaadin-snapshots/</url> - </snapshotRepository> - </distributionManagement> - <repositories> - <repository> - <id>vaadin-snapshots</id> - <url>http://oss.sonatype.org/content/repositories/vaadin-snapshots/</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - <repository> - <id>vaadin-releases</id> - <url>http://oss.sonatype.org/content/repositories/vaadin-releases/</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> - -</project>
\ No newline at end of file diff --git a/build/package/META-INF/MANIFEST.MF b/build/package/META-INF/MANIFEST.MF deleted file mode 100644 index 5d2e13a4da..0000000000 --- a/build/package/META-INF/MANIFEST.MF +++ /dev/null @@ -1,6 +0,0 @@ -Bundle-ManifestVersion: 2 -Bundle-Name: Vaadin -Bundle-SymbolicName: com.vaadin -Bundle-Vendor: Vaadin Ltd -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: javax.servlet; version="2.3.0",javax.servlet.http; version="2.3.0" diff --git a/build/package/build-widgetset.xml b/build/package/build-widgetset.xml deleted file mode 100644 index f42b58ff0f..0000000000 --- a/build/package/build-widgetset.xml +++ /dev/null @@ -1,206 +0,0 @@ -<?xml version="1.0"?> - -<!-- - -Client-side code is compiled by using GWTCompiler which compiles client-side Java code into -JavaScript. Generated files are located under WebContent/VAADIN/widgetsets/*. - -Client-side compilation is required if you create new or modify existing widgets. -You may use either this script or Vaadin Hosted Mode Browser.launch (in Eclipse) -to compile your client-side java code. - -By default Vaadin first tries to serve widgetset resources from the file system, if that -fails then files are streamed from vaadin-@version@.jar. - -See configure target to adjust this buildfile. - ---> - -<project name="Widgetset compile example" basedir="." default="compile-widgetset"> - - <!-- - Update based on your project structure, by default this buildfile assumes that you - 1. use WebContent under your project's root directory - 2. WebContent/WEB-INF/lib/vaadin-@version@.jar exists - 3. WebContent/WEB-INF/src contains your project source files - 4. gwt directory contains extracted GWT distribution - --> - <target name="configure"> - - <!-- Path from this file to the project root --> - <property name="base" - value="../../../" /> - - <!-- Location of GWT distribution --> - <property name="gwt-location" - value="${base}gwt" /> - - <!-- Location of Vaadin JAR --> - <property name="vaadin-jar-location" - value="${base}WebContent/WEB-INF/lib/vaadin-@version@.jar" /> - - <!-- Location of project source code --> - <property name="src-location" - value="${base}WebContent/WEB-INF/src" /> - - <!-- Target where to compile server-side classes --> - <property name="server-side-destination" - value="${base}WebContent/WEB-INF/classes"/> - - <!-- Target where to compile the widget set --> - <property name="client-side-destination" - value="${base}WebContent/VAADIN/widgetsets" /> - </target> - - <!-- Modify this configuration to compile your own widgetset --> - <target name="configure-widgetset"> - <echo>Modify this example Ant script to compile your own widget sets.</echo> - - <!-- Name of the widget set --> - <property name="widgetset" value="com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet"/> - - <!-- If generated automatically as a combining widget set --> - <!-- from all the widget sets included in the class path. --> - <!-- <property name="widgetset" value="com.vaadin.demo.widgetset.CombiningWidgetSet"/> --> - <!-- <property name="generate.widgetset" value="1"/> --> - - <!-- Path to the generated widget set directory. Must be --> - <!-- relative to $src-location, which must be the first --> - <!-- entry in the class path. --> - <property name="widgetset-path" value="com/vaadin/demo/widgetset"/> - </target> - - <!-- Modify this configuration to package your own widgetset Jar. --> - <target name="configure-jar"> - <!-- The compiled JAR name --> - <property name="jar-destination" value="${base}colorpicker.jar"/> - - <!-- Title of the widget set (for JAR) --> - <property name="widgetset-title" value="ColorPicker"/> - - <!-- Version of the widget set (for JAR) --> - <property name="widgetset-version" value="1.0"/> - - <!-- Vendor of the widget set (for JAR) --> - <property name="widgetset-vendor" value="Vaadin Ltd"/> - </target> - - <!-- ================================================== --> - <!-- Build Targets --> - <!-- ================================================== --> - - <target name="init" depends="configure"> - - <echo>Requirements for classpath:</echo> - <echo> ${gwt-location}/gwt-dev.jar</echo> - <echo> ${gwt-location}/gwt-user.jar</echo> - <echo> ${gwt-location}/validation-api-1.0.0.GA.jar</echo> - <echo> ${gwt-location}/validation-api-1.0.0.GA-sources.jar</echo> - <echo> ${vaadin-jar-location}</echo> - <echo> ${src-location}</echo> - <echo>Output will be written into ${client-side-destination}</echo> - - <!-- Check that files exist --> - <fail message="Some of the required files (listed above) are missing."> - <condition><not><resourcecount count="5"> - <filelist files="${gwt-location}/gwt-dev.jar,${gwt-location}/gwt-user.jar,${gwt-location}/validation-api-1.0.0.GA.jar,${gwt-location}/validation-api-1.0.0.GA-sources.jar,${vaadin-jar-location}"/> - </resourcecount></not></condition> - </fail> - - <!-- Construct and check classpath --> - <!-- Includes paths required for both server and client-side compilation --> - <path id="compile.classpath"> - <!-- The source location must be first, as required by generate-widgetset. --> - <pathelement path="${src-location}" /> - <pathelement path="${server-side-destination}" /> - <pathelement path="${vaadin-jar-location}" /> - <pathelement path="${gwt-location}/gwt-user.jar" /> - <pathelement path="${gwt-location}/gwt-dev.jar" /> - <pathelement path="${gwt-location}/validation-api-1.0.0.GA.jar" /> - <pathelement path="${gwt-location}/validation-api-1.0.0.GA-sources.jar" /> - <fileset dir="${base}WebContent/WEB-INF/lib/"> - <include name="*.jar"/> - </fileset> - </path> - </target> - - <!-- Compiled server-side components are needed for building the client-side --> - <target name="compile-server-side" depends="init"> - <javac srcdir="${src-location}" destdir="${server-side-destination}"> - <classpath> - <path refid="compile.classpath"/> - </classpath> - </javac> - </target> - - <!-- Generates a combined widget set from all widget --> - <!-- sets in the class path, including project sources. --> - <!-- Updates the configuration if it already exists. --> - <target name="generate-widgetset" - depends="compile-server-side, configure-widgetset" - if="generate.widgetset"> - - <!-- Create the directory if it does not already exist. --> - <mkdir dir="${src-location}/${widgetset-path}"/> - - <java classname="com.vaadin.server.widgetsetutils.WidgetSetBuilder" - failonerror="yes" fork="yes" maxmemory="256m"> - <arg value="${widgetset}"/> - <jvmarg value="-Xss1024k"/> - <jvmarg value="-Djava.awt.headless=true"/> - <classpath> - <path refid="compile.classpath"/> - </classpath> - </java> - </target> - - <!-- Build the widget set. --> - <target name="compile-widgetset" - depends="compile-server-side, generate-widgetset"> - <echo>Compiling ${widgetset}...</echo> - - <java classname="com.google.gwt.dev.Compiler" - failonerror="yes" fork="yes" maxmemory="256m"> - <arg value="-war" /> - <arg value="${client-side-destination}" /> - <arg value="${widgetset}" /> - <jvmarg value="-Xss1024k"/> - <jvmarg value="-Djava.awt.headless=true"/> - <classpath> - <path refid="compile.classpath"/> - </classpath> - </java> - </target> - - <!-- Build JAR --> - <target name="package-jar" - depends="init, configure-widgetset, configure-jar"> - <jar jarfile="${jar-destination}" compress="true"> - <manifest> - <attribute name="Vaadin-Package-Version" value="1" /> - <attribute name="Vaadin-Widgetsets" value="${widgetset}" /> - <attribute name="Implementation-Title" value="${widgetset-title}" /> - <attribute name="Implementation-Version" value="${widgetset-version}" /> - <attribute name="Implementation-Vendor" value="${widgetset-vendor}" /> - - <!-- The following are Vaadin-specific. --> - <attribute name="Vaadin-License-Title" value="Apache2" /> - <attribute name="Vaadin-License-File" value="http://www.apache.org/licenses/LICENSE-2.0" /> - </manifest> - - <!-- The built server-side classes are here. --> - <fileset dir="${server-side-destination}"> - <patternset> - <include name="**/*" /> - </patternset> - </fileset> - - <!-- Especially all the widget set source files are required. --> - <fileset dir="${src-location}"> - <patternset> - <include name="**/*" /> - </patternset> - </fileset> - </jar> - </target> -</project> diff --git a/build/package/build.xml b/build/package/build.xml deleted file mode 100644 index f270b3b7c3..0000000000 --- a/build/package/build.xml +++ /dev/null @@ -1,80 +0,0 @@ -<!-- - -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="vaadin-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.vaadin.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 Vaadin application --> - <target name="compile" depends="init"> - <echo message="Compiling Vaadin 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 Vaadin 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 Vaadin 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 Vaadin 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/build/readme.txt b/build/readme.txt deleted file mode 100644 index 64f1d91862..0000000000 --- a/build/readme.txt +++ /dev/null @@ -1,13 +0,0 @@ -How to build Vaadin Framework -============================= - -Building the distribution packages is as easy as running ant without -parameters in this directory. While as official packages will be built -with Java 1.5, you can force build with 1.6 by adding the option --Dignoreversion=1 - -Some of the most common targets to build: -- Distribution JAR-file will be built with target package-jar -- Test WAR will be built with target package-war - -For more detailed info, see build.xml diff --git a/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java b/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java index 51d5ec8187..854efe54d6 100755 --- a/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java +++ b/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java @@ -80,6 +80,8 @@ public class WidgetsetCompiler { System.out.println("Starting GWT compiler"); System.setProperty("gwt.nowarn.legacy.tools", "true"); + System.setProperty("gwt.forceVersionCheckURL", + "http://tools.vaadin.com/version/currentversion.xml"); Class<?> compilerClass = Class .forName("com.google.gwt.dev.GWTCompiler"); Method method = compilerClass.getDeclaredMethod("main", diff --git a/client/src/com/vaadin/client/BrowserInfo.java b/client/src/com/vaadin/client/BrowserInfo.java index f7c8d2f331..e32e9b65f0 100644 --- a/client/src/com/vaadin/client/BrowserInfo.java +++ b/client/src/com/vaadin/client/BrowserInfo.java @@ -360,13 +360,15 @@ public class BrowserInfo { if (!isTouchDevice()) { return false; } + // TODO Should test other Android browsers, especially Chrome if (isAndroid() && isWebkit() && getWebkitVersion() >= 534) { return false; } - // Cannot enable native touch scrolling on iOS 5 until #8792 is resolved - // if (isIOS() && isWebkit() && getWebkitVersion() >= 534) { - // return false; - // } + // iOS 6 Safari supports native scrolling; iOS 5 suffers from #8792 + // TODO Should test other iOS browsers + if (isIOS() && isSafari() && getBrowserMajorVersion() >= 6) { + return false; + } return true; } diff --git a/client/src/com/vaadin/client/ui/datefield/VCalendarPanel.java b/client/src/com/vaadin/client/ui/datefield/VCalendarPanel.java index dc40675e0a..9d519e3179 100644 --- a/client/src/com/vaadin/client/ui/datefield/VCalendarPanel.java +++ b/client/src/com/vaadin/client/ui/datefield/VCalendarPanel.java @@ -135,8 +135,16 @@ public class VCalendarPanel extends FocusableFlexTable implements */ @Override public void onClick(ClickEvent event) { - Day day = (Day) event.getSource(); - focusDay(day.getDate()); + Date newDate = ((Day) event.getSource()).getDate(); + if (newDate.getMonth() != displayedMonth.getMonth() + || newDate.getYear() != displayedMonth.getYear()) { + // If an off-month date was clicked, we must change the + // displayed month and re-render the calendar (#8931) + displayedMonth.setMonth(newDate.getMonth()); + displayedMonth.setYear(newDate.getYear()); + renderCalendar(); + } + focusDay(newDate); selectFocused(); onSubmit(); } @@ -403,8 +411,8 @@ public class VCalendarPanel extends FocusableFlexTable implements } final String monthName = needsMonth ? getDateTimeService().getMonth( - focusedDate.getMonth()) : ""; - final int year = focusedDate.getYear() + 1900; + displayedMonth.getMonth()) : ""; + final int year = displayedMonth.getYear() + 1900; getFlexCellFormatter().setStyleName(0, 2, VDateField.CLASSNAME + "-calendarpanel-month"); setHTML(0, 2, "<span class=\"" + VDateField.CLASSNAME @@ -605,14 +613,17 @@ public class VCalendarPanel extends FocusableFlexTable implements */ private void focusNextDay(int days) { int oldMonth = focusedDate.getMonth(); + int oldYear = focusedDate.getYear(); focusedDate.setDate(focusedDate.getDate() + days); - if (focusedDate.getMonth() == oldMonth) { + if (focusedDate.getMonth() == oldMonth + && focusedDate.getYear() == oldYear) { // Month did not change, only move the selection focusDay(focusedDate); } else { // If the month changed we need to re-render the calendar displayedMonth.setMonth(focusedDate.getMonth()); + displayedMonth.setYear(focusedDate.getYear()); renderCalendar(); } } diff --git a/client/src/com/vaadin/portal/gwt/PortalDefaultWidgetSet.gwt.xml b/client/src/com/vaadin/portal/gwt/PortalDefaultWidgetSet.gwt.xml deleted file mode 100644 index c127d3bb21..0000000000 --- a/client/src/com/vaadin/portal/gwt/PortalDefaultWidgetSet.gwt.xml +++ /dev/null @@ -1,6 +0,0 @@ -<module> - <!-- WS Compiler: manually edited --> - - <!-- Inherit the DefaultWidgetSet --> - <inherits name="com.vaadin.DefaultWidgetSet" /> -</module> diff --git a/client/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml b/client/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml new file mode 100644 index 0000000000..f3cc2bca1c --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml @@ -0,0 +1,9 @@ +<module> + <!-- This GWT module is provided for backwards compatibility only. You + should inherit com.vaadin.DefaultWidgetSet instead. --> + + <!-- Hint for WidgetSetBuilder not to automatically update the file --> + <!-- WS Compiler: manually edited --> + <inherits name="com.vaadin.DefaultWidgetSet" /> + +</module>
\ No newline at end of file diff --git a/common.xml b/common.xml index db56cee10d..2d64fb88e5 100644 --- a/common.xml +++ b/common.xml @@ -11,7 +11,9 @@ <property name="modules.to.publish.to.maven" value="shared,server,client,client-compiler,client-compiled,theme-compiler,themes-compiled" /> <property name="modules.to.publish.to.download" value="${modules.to.publish.to.maven},all" /> - <ivy:resolve file="${vaadin.basedir}/build/ivy/ivy.xml" conf="taskdefs" /> + <ivy:settings file="${vaadin.basedir}/ivysettings.xml" /> + <ivy:settings file="${vaadin.basedir}/ivysettings.xml" id="ivysettings" /> + <ivy:resolve file="${vaadin.basedir}/ivy-taskdefs.xml" conf="taskdefs" /> <ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" /> <taskdef uri="antlib:net.sf.antcontrib" resource="net/sf/antcontrib/antlib.xml" classpathref="taskdefs.classpath" /> <!-- ant contrib for Maven integration --> @@ -21,7 +23,6 @@ <antcontrib:propertyregex property="vaadin.version.major" input="${vaadin.version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\1" /> <antcontrib:propertyregex property="vaadin.version.minor" input="${vaadin.version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\2" /> <antcontrib:propertyregex property="vaadin.version.revision" input="${vaadin.version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\3" /> - <ivy:settings file="${vaadin.basedir}/ivysettings.xml" id="ivysettings" /> <union id="empty.reference" /> diff --git a/ivy-taskdefs.xml b/ivy-taskdefs.xml new file mode 100644 index 0000000000..ccc4d75bcf --- /dev/null +++ b/ivy-taskdefs.xml @@ -0,0 +1,18 @@ + +<ivy-module version="2.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation= "http://ant.apache.org/ivy/schemas/ivy.xsd"> + + <info organisation="com.vaadin" module="vaadin"/> + <configurations> + <conf name="taskdefs" description="Ant task definitions" visibility="private" /> + </configurations> + <publications /> + <dependencies> + <!-- Ant tasks --> + <dependency org="ant-contrib" name="ant-contrib" rev="1.0b3" conf="taskdefs ->master"/> + <dependency org="org.apache.maven" name="maven-ant-tasks" rev="2.0.10" conf="taskdefs ->master"/> + <dependency org="com.googlecode.jarjar" name="jarjar" rev="1.3" conf="taskdefs ->master"/> + </dependencies> + +</ivy-module> diff --git a/ivy.xml b/ivy.xml new file mode 100644 index 0000000000..f2179255d4 --- /dev/null +++ b/ivy.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE ivy-module [ + <!ENTITY server SYSTEM "server/ivy.xml"> + <!ENTITY client SYSTEM "client/ivy.xml"> + <!ENTITY clientCompiler SYSTEM "client-compiler/ivy.xml"> + <!ENTITY shared SYSTEM "shared/ivy.xml"> + <!ENTITY uitest SYSTEM "uitest/ivy.xml"> + <!ENTITY themeCompiler SYSTEM "theme-compiler/ivy.xml"> +]> +<ivy-module version="2.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" + xmlns:m="http://ant.apache.org/ivy/maven"> + + &server; + &client; + &clientCompiler; + &shared; + &uitest; + &themeCompiler; + +</ivy-module>
\ No newline at end of file diff --git a/server/src/com/vaadin/DefaultDeploymentConfiguration.java b/server/src/com/vaadin/DefaultDeploymentConfiguration.java index 6159137cc3..fed558c5b5 100644 --- a/server/src/com/vaadin/DefaultDeploymentConfiguration.java +++ b/server/src/com/vaadin/DefaultDeploymentConfiguration.java @@ -22,6 +22,13 @@ import java.util.logging.Logger; import com.vaadin.server.Constants; import com.vaadin.server.DeploymentConfiguration; +/** + * The default implementation of {@link DeploymentConfiguration} based on a base + * class for resolving system properties and a set of init parameters. + * + * @author Vaadin Ltd + * @since 7.0.0 + */ public class DefaultDeploymentConfiguration implements DeploymentConfiguration { private final Properties initParameters; private boolean productionMode; @@ -31,6 +38,16 @@ public class DefaultDeploymentConfiguration implements DeploymentConfiguration { private boolean idleRootCleanupEnabled; private final Class<?> systemPropertyBaseClass; + /** + * Create a new deployment configuration instance. + * + * @param systemPropertyBaseClass + * the class that should be used as a basis when reading system + * properties + * @param initParameters + * the init parameters that should make up the foundation for + * this configuration + */ public DefaultDeploymentConfiguration(Class<?> systemPropertyBaseClass, Properties initParameters) { this.initParameters = initParameters; diff --git a/server/src/com/vaadin/data/RangeOutOfContainerBoundsException.java b/server/src/com/vaadin/data/RangeOutOfContainerBoundsException.java deleted file mode 100644 index 43058e45d8..0000000000 --- a/server/src/com/vaadin/data/RangeOutOfContainerBoundsException.java +++ /dev/null @@ -1,169 +0,0 @@ -package com.vaadin.data; - -/** - * A exception that indicates that the container is unable to return all of the - * consecutive item ids requested by the caller. This can happen if the - * container size has changed since the input parameters for - * {@link Container.Indexed#getItemIds(int, int)} were computed or if the - * requested range exceeds the containers size due to some other factor.<br> - * <br> - * - * The exception can contain additional parameters for easier debugging. The - * additional parameters are the <code>startIndex</code> and - * <code>numberOfIds</code> which were given to - * {@link Container.Indexed#getItemIds(int, int)} as well as the size of the - * container when the fetch was executed. The container size can be retrieved - * with {@link #getContainerCurrentSize()}. <br> - * <br> - * - * The additional parameters are optional but the party that received the - * exception can check whether or not these were set by calling - * {@link #isAdditionalParametersSet()}. - * - * @since 7.0 - */ -public class RangeOutOfContainerBoundsException extends RuntimeException { - - private final int startIndex; - private final int numberOfIds; - private final int containerCurrentSize; - private final boolean additionalParametersSet; - - // Discourage users to create exceptions without at least some kind of - // message... - private RangeOutOfContainerBoundsException() { - super(); - startIndex = -1; - numberOfIds = -1; - containerCurrentSize = -1; - additionalParametersSet = false; - } - - public RangeOutOfContainerBoundsException(String message) { - super(message); - startIndex = -1; - numberOfIds = -1; - containerCurrentSize = -1; - additionalParametersSet = false; - } - - public RangeOutOfContainerBoundsException(String message, - Throwable throwable) { - super(message, throwable); - startIndex = -1; - numberOfIds = -1; - containerCurrentSize = -1; - additionalParametersSet = false; - } - - public RangeOutOfContainerBoundsException(Throwable throwable) { - super(throwable); - startIndex = -1; - numberOfIds = -1; - containerCurrentSize = -1; - additionalParametersSet = false; - } - - /** - * Create a new {@link RangeOutOfContainerBoundsException} with the - * additional parameters: - * <ul> - * <li>startIndex - start index for the query</li> - * <li>numberOfIds - the number of consecutive item ids to get</li> - * <li>containerCurrentSize - the size of the container during the execution - * of the query</li> - * </ul> - * given. - * - * @param message - * @param startIndex - * the given startIndex for the query - * @param numberOfIds - * the number of item ids requested - * @param containerCurrentSize - * the current size of the container - */ - public RangeOutOfContainerBoundsException(String message, int startIndex, - int numberOfIds, int containerCurrentSize) { - super(message); - - this.startIndex = startIndex; - this.numberOfIds = numberOfIds; - this.containerCurrentSize = containerCurrentSize; - additionalParametersSet = true; - } - - /** - * Create a new {@link RangeOutOfContainerBoundsException} with the given - * query parameters set in the exception along with the containers current - * size and a @link {@link Throwable}. - * - * @param message - * @param startIndex - * the given startIndex for the query - * @param numberOfIds - * the number of item ids queried for - * @param containerCurrentSize - * the current size of the container - * @param throwable - */ - public RangeOutOfContainerBoundsException(String message, int startIndex, - int numberOfIds, int containerCurrentSize, Throwable throwable) { - super(message, throwable); - - this.startIndex = startIndex; - this.numberOfIds = numberOfIds; - this.containerCurrentSize = containerCurrentSize; - additionalParametersSet = true; - } - - /** - * Get the given startIndex for the query. Remember to check if this - * parameter is set by calling {@link #isAdditionalParametersSet()} - * - * @return the startIndex given to the container - */ - public int getStartIndex() { - return startIndex; - } - - /** - * Get the number of item ids requested. Remember to check if this parameter - * is set with {@link #isAdditionalParametersSet()} - * - * @return the number of item ids the container was ordered to fetch - */ - public int getNumberOfIds() { - return numberOfIds; - } - - /** - * Get the container size when the query was actually executed. Remember to - * check if this parameter is set with {@link #isAdditionalParametersSet()} - */ - public int getContainerCurrentSize() { - return containerCurrentSize; - } - - /** - * Check whether or not the additional parameters for the exception were set - * during creation or not. - * - * The additional parameters can be retrieved with: <br> - * <ul> - * <li> {@link #getStartIndex()}</li> - * <li> {@link #getNumberOfIds()}</li> - * <li> {@link #getContainerCurrentSize()}</li> - * </ul> - * - * @return true if parameters are set, false otherwise. - * - * @see #RangeOutOfContainerBoundsException(String, int, int, int) - * RangeOutOfContainerBoundsException(String, int, int, int) for more - * details on the additional parameters - */ - public boolean isAdditionalParametersSet() { - return additionalParametersSet; - } - -} diff --git a/server/src/com/vaadin/server/AbstractVaadinService.java b/server/src/com/vaadin/server/AbstractVaadinService.java index 6e14c1984b..7150fdf0da 100644 --- a/server/src/com/vaadin/server/AbstractVaadinService.java +++ b/server/src/com/vaadin/server/AbstractVaadinService.java @@ -20,11 +20,24 @@ import java.lang.reflect.Constructor; import java.util.Iterator; import java.util.ServiceLoader; +/** + * Abstract implementation of VaadinService that takes care of those parts that + * are common to both servlets and portlets. + * + * @author Vaadin Ltd + * @since 7.0.0 + */ public abstract class AbstractVaadinService implements VaadinService { private AddonContext addonContext; private final DeploymentConfiguration deploymentConfiguration; + /** + * Creates a new vaadin service based on a deployment configuration + * + * @param deploymentConfiguration + * the deployment configuration for the service + */ public AbstractVaadinService(DeploymentConfiguration deploymentConfiguration) { this.deploymentConfiguration = deploymentConfiguration; } diff --git a/server/src/com/vaadin/server/AddonContext.java b/server/src/com/vaadin/server/AddonContext.java index 606d3c3568..ddb8394468 100644 --- a/server/src/com/vaadin/server/AddonContext.java +++ b/server/src/com/vaadin/server/AddonContext.java @@ -16,6 +16,7 @@ package com.vaadin.server; +import java.io.Serializable; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Iterator; @@ -41,7 +42,7 @@ import com.vaadin.util.ReflectTools; * @author Vaadin Ltd * @since 7.0.0 */ -public class AddonContext { +public class AddonContext implements Serializable { private static final Method APPLICATION_STARTED_METHOD = ReflectTools .findMethod(ApplicationStartedListener.class, "applicationStarted", ApplicationStartedEvent.class); diff --git a/server/src/com/vaadin/server/Page.java b/server/src/com/vaadin/server/Page.java index 9a0948edc8..ccc400341e 100644 --- a/server/src/com/vaadin/server/Page.java +++ b/server/src/com/vaadin/server/Page.java @@ -29,8 +29,10 @@ import com.vaadin.shared.ui.BorderStyle; import com.vaadin.shared.ui.ui.PageClientRpc; import com.vaadin.shared.ui.ui.UIConstants; import com.vaadin.ui.JavaScript; +import com.vaadin.ui.Link; import com.vaadin.ui.Notification; import com.vaadin.ui.UI; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.util.ReflectTools; public class Page implements Serializable { @@ -132,6 +134,25 @@ public class Page implements Serializable { /** * Creates a new open resource. * + * @param url + * The URL to open + * @param name + * The name of the target window + * @param width + * The width of the target window + * @param height + * The height of the target window + * @param border + * The border style of the target window + */ + private OpenResource(String url, String name, int width, int height, + BorderStyle border) { + this(new ExternalResource(url), name, width, height, border); + } + + /** + * Creates a new open resource. + * * @param resource * The resource to open * @param name @@ -550,19 +571,19 @@ public class Page implements Serializable { } /** - * Opens the given resource in this uI. The contents of this UI is replaced - * by the {@code Resource}. + * Navigates this page to the given URL. The contents of this page in the + * browser is replaced with whatever is returned for the given URL. * - * @param resource - * the resource to show in this uI + * @param url + * the URL to show */ - public void open(Resource resource) { - openList.add(new OpenResource(resource, null, -1, -1, BORDER_DEFAULT)); + public void setLocation(String url) { + openList.add(new OpenResource(url, null, -1, -1, BORDER_DEFAULT)); uI.markAsDirty(); } /** - * Opens the given resource in a window with the given name. + * Opens the given URL in a window with the given name. * <p> * The supplied {@code windowName} is used as the target name in a * window.open call in the client. This means that special values such as @@ -570,47 +591,63 @@ public class Page implements Serializable { * <code>null</code> window name is also a special case. * </p> * <p> - * "", null and "_self" as {@code windowName} all causes the resource to be + * "", null and "_self" as {@code windowName} all causes the URL to be * opened in the current window, replacing any old contents. For * downloadable content you should avoid "_self" as "_self" causes the * client to skip rendering of any other changes as it considers them - * irrelevant (the page will be replaced by the resource). This can speed up - * the opening of a resource, but it might also put the client side into an - * inconsistent state if the window content is not completely replaced e.g., - * if the resource is downloaded instead of displayed in the browser. + * irrelevant (the page will be replaced by the response from the URL). This + * can speed up the opening of a URL, but it might also put the client side + * into an inconsistent state if the window content is not completely + * replaced e.g., if the URL is downloaded instead of displayed in the + * browser. * </p> * <p> - * "_blank" as {@code windowName} causes the resource to always be opened in - * a new window or tab (depends on the browser and browser settings). + * "_blank" as {@code windowName} causes the URL to always be opened in a + * new window or tab (depends on the browser and browser settings). * </p> * <p> * "_top" and "_parent" as {@code windowName} works as specified by the HTML * standard. * </p> * <p> - * Any other {@code windowName} will open the resource in a window with that + * Any other {@code windowName} will open the URL in a window with that * name, either by opening a new window/tab in the browser or by replacing * the contents of an existing window with that name. * </p> + * <p> + * Please note that opening a popup window in this way may be blocked by the + * browser's popup-blocker because the new browser window is opened when + * processing a response from the server. To avoid this, you should instead + * use {@link Link} for opening the window because browsers are more + * forgiving then the window is opened directly from a client-side click + * event. + * </p> * - * @param resource - * the resource. + * @param url + * the URL to open. * @param windowName * the name of the window. */ - public void open(Resource resource, String windowName) { - openList.add(new OpenResource(resource, windowName, -1, -1, - BORDER_DEFAULT)); + public void open(String url, String windowName) { + openList.add(new OpenResource(url, windowName, -1, -1, BORDER_DEFAULT)); uI.markAsDirty(); } /** - * Opens the given resource in a window with the given size, border and - * name. For more information on the meaning of {@code windowName}, see - * {@link #open(Resource, String)}. + * Opens the given URL in a window with the given size, border and name. For + * more information on the meaning of {@code windowName}, see + * {@link #open(String, String)}. + * <p> + * Please note that opening a popup window in this way may be blocked by the + * browser's popup-blocker because the new browser window is opened when + * processing a response from the server. To avoid this, you should instead + * use {@link Link} for opening the window because browsers are more + * forgiving then the window is opened directly from a client-side click + * event. + * </p> * - * @param resource - * the resource. + * @param url + * the URL to open. * @param windowName * the name of the window. * @param width @@ -620,6 +657,19 @@ public class Page implements Serializable { * @param border * the border style of the window. */ + public void open(String url, String windowName, int width, int height, + BorderStyle border) { + openList.add(new OpenResource(url, windowName, width, height, border)); + uI.markAsDirty(); + } + + /** + * @deprecated only retained to maintain compatibility with + * LegacyWindow.open methods. See documentation for + * {@link LegacyWindow#open(Resource, String, int, int, BorderStyle)} + * for discussion about replacing API. + */ + @Deprecated public void open(Resource resource, String windowName, int width, int height, BorderStyle border) { openList.add(new OpenResource(resource, windowName, width, height, diff --git a/server/src/com/vaadin/server/VaadinPortletSession.java b/server/src/com/vaadin/server/VaadinPortletSession.java index 5bd94c623d..bb37bbbcf3 100644 --- a/server/src/com/vaadin/server/VaadinPortletSession.java +++ b/server/src/com/vaadin/server/VaadinPortletSession.java @@ -216,7 +216,7 @@ public class VaadinPortletSession extends VaadinSession { if (actionUrl != null) { eventActionDestinationMap.put(actionKey, name); eventActionValueMap.put(actionKey, value); - uI.getPage().open(new ExternalResource(actionUrl.toString())); + uI.getPage().setLocation(actionUrl.toString()); } else { // this should never happen as we already know the response is a // MimeResponse @@ -263,7 +263,7 @@ public class VaadinPortletSession extends VaadinSession { if (actionUrl != null) { sharedParameterActionNameMap.put(actionKey, name); sharedParameterActionValueMap.put(actionKey, value); - uI.getPage().open(new ExternalResource(actionUrl.toString())); + uI.getPage().setLocation(actionUrl.toString()); } else { // this should never happen as we already know the response is a // MimeResponse diff --git a/server/src/com/vaadin/server/VaadinSession.java b/server/src/com/vaadin/server/VaadinSession.java index c6b2d91f29..a91c011ddf 100644 --- a/server/src/com/vaadin/server/VaadinSession.java +++ b/server/src/com/vaadin/server/VaadinSession.java @@ -204,6 +204,8 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable { private transient WrappedSession session; + private final Map<String, Object> attributes = new HashMap<String, Object>(); + /** * @see javax.servlet.http.HttpSessionBindingListener#valueBound(HttpSessionBindingEvent) */ @@ -1306,4 +1308,111 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable { return lock; } + /** + * Stores a value in this vaadin session. This can be used to associate data + * with the current user so that it can be retrieved at a later point from + * some other part of the application. Setting the value to + * <code>null</code> clears the stored value. + * + * @see #getAttribute(String) + * + * @param name + * the name to associate the value with, can not be + * <code>null</code> + * @param value + * the value to associate with the name, or <code>null</code> to + * remove a previous association. + */ + public void setAttribute(String name, Object value) { + if (name == null) { + throw new IllegalArgumentException("name can not be null"); + } + if (value != null) { + attributes.put(name, value); + } else { + attributes.remove(name); + } + } + + /** + * Stores a value in this vaadin session. This can be used to associate data + * with the current user so that it can be retrieved at a later point from + * some other part of the application. Setting the value to + * <code>null</code> clears the stored value. + * <p> + * The fully qualified name of the type is used as the name when storing the + * value. The outcome of calling this method is thus the same as if calling<br /> + * <br /> + * <code>setAttribute(type.getName(), value);</code> + * + * @see #getAttribute(Class) + * @see #setAttribute(String, Object) + * + * @param type + * the type that the stored value represents, can not be null + * @param value + * the value to associate with the type, or <code>null</code> to + * remove a previous association. + */ + public <T> void setAttribute(Class<T> type, T value) { + if (type == null) { + throw new IllegalArgumentException("type can not be null"); + } + if (value != null && !type.isInstance(value)) { + throw new IllegalArgumentException("value of type " + + type.getName() + " expected but got " + + value.getClass().getName()); + } + setAttribute(type.getName(), value); + } + + /** + * Gets a stored attribute value. If a value has been stored for the + * session, that value is returned. If no value is stored for the name, + * <code>null</code> is returned. + * + * @see #setAttribute(String, Object) + * + * @param name + * the name of the value to get, can not be <code>null</code>. + * @return the value, or <code>null</code> if no value has been stored or if + * it has been set to null. + */ + public Object getAttribute(String name) { + if (name == null) { + throw new IllegalArgumentException("name can not be null"); + } + return attributes.get(name); + } + + /** + * Gets a stored attribute value. If a value has been stored for the + * session, that value is returned. If no value is stored for the name, + * <code>null</code> is returned. + * <p> + * The fully qualified name of the type is used as the name when getting the + * value. The outcome of calling this method is thus the same as if calling<br /> + * <br /> + * <code>getAttribute(type.getName());</code> + * + * @see #setAttribute(Class, Object) + * @see #getAttribute(String) + * + * @param type + * the type of the value to get, can not be <code>null</code>. + * @return the value, or <code>null</code> if no value has been stored or if + * it has been set to null. + */ + public <T> T getAttribute(Class<T> type) { + if (type == null) { + throw new IllegalArgumentException("type can not be null"); + } + Object value = getAttribute(type.getName()); + if (value == null) { + return null; + } else { + return type.cast(value); + } + } + } diff --git a/server/src/com/vaadin/server/WebBrowser.java b/server/src/com/vaadin/server/WebBrowser.java index 9e29e957d9..6a377a3de9 100644 --- a/server/src/com/vaadin/server/WebBrowser.java +++ b/server/src/com/vaadin/server/WebBrowser.java @@ -16,6 +16,7 @@ package com.vaadin.server; +import java.io.Serializable; import java.util.Date; import java.util.Locale; import java.util.TimeZone; @@ -29,7 +30,7 @@ import com.vaadin.shared.VBrowserDetails; * * @author Vaadin Ltd. */ -public class WebBrowser { +public class WebBrowser implements Serializable { private int screenHeight = 0; private int screenWidth = 0; diff --git a/server/src/com/vaadin/ui/AbstractField.java b/server/src/com/vaadin/ui/AbstractField.java index f673babc26..e7d6d9a4ec 100644 --- a/server/src/com/vaadin/ui/AbstractField.java +++ b/server/src/com/vaadin/ui/AbstractField.java @@ -282,43 +282,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements */ @Override public void discard() throws Buffered.SourceException { - if (dataSource != null) { - - // Gets the correct value from datasource - T newFieldValue; - try { - - // Discards buffer by overwriting from datasource - newFieldValue = convertFromDataSource(getDataSourceValue()); - - // If successful, remove set the buffering state to be ok - if (getCurrentBufferedSourceException() != null) { - setCurrentBufferedSourceException(null); - } - } catch (final Throwable e) { - // FIXME: What should really be done here if conversion fails? - - // Sets the buffering state - currentBufferedSourceException = new Buffered.SourceException( - this, e); - markAsDirty(); - - // Throws the source exception - throw currentBufferedSourceException; - } - - final boolean wasModified = isModified(); - setModified(false); - - // If the new value differs from the previous one - if (!equals(newFieldValue, getInternalValue())) { - setInternalValue(newFieldValue); - fireValueChange(false); - } else if (wasModified) { - // If the value did not change, but the modification status did - markAsDirty(); - } - } + updateValueFromDataSource(); } /** @@ -417,7 +381,8 @@ public abstract class AbstractField<T> extends AbstractComponent implements public String toString() { logger.warning("You are using AbstractField.toString() to get the value for a " + getClass().getSimpleName() - + ". This is not recommended and will not be supported in future versions."); + + ". This will not be supported starting from Vaadin 7.1 " + + "(your debugger might call toString() and cause this message to appear)."); final Object value = getFieldValue(); if (value == null) { return null; @@ -1323,7 +1288,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements addPropertyListeners(); if (!isModified() && !isBuffered()) { // Update value from data source - discard(); + updateValueFromDataSource(); } } } @@ -1540,6 +1505,46 @@ public abstract class AbstractField<T> extends AbstractComponent implements } } + private void updateValueFromDataSource() { + if (dataSource != null) { + + // Gets the correct value from datasource + T newFieldValue; + try { + + // Discards buffer by overwriting from datasource + newFieldValue = convertFromDataSource(getDataSourceValue()); + + // If successful, remove set the buffering state to be ok + if (getCurrentBufferedSourceException() != null) { + setCurrentBufferedSourceException(null); + } + } catch (final Throwable e) { + // FIXME: What should really be done here if conversion fails? + + // Sets the buffering state + currentBufferedSourceException = new Buffered.SourceException( + this, e); + markAsDirty(); + + // Throws the source exception + throw currentBufferedSourceException; + } + + final boolean wasModified = isModified(); + setModified(false); + + // If the new value differs from the previous one + if (!equals(newFieldValue, getInternalValue())) { + setInternalValue(newFieldValue); + fireValueChange(false); + } else if (wasModified) { + // If the value did not change, but the modification status did + markAsDirty(); + } + } + } + /** * Gets the converter used to convert the property data source value to the * field value. diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java index ef77142312..adb2a63c2e 100644 --- a/server/src/com/vaadin/ui/UI.java +++ b/server/src/com/vaadin/ui/UI.java @@ -222,11 +222,11 @@ public abstract class UI extends AbstractComponentContainer implements * @param resource * the resource to show in this UI * - * @deprecated As of 7.0, use getPage().open instead + * @deprecated As of 7.0, use getPage().setLocation instead */ @Deprecated public void open(Resource resource) { - getPage().open(resource); + open(resource, null); } /* ********************************************************************* */ @@ -264,6 +264,13 @@ public abstract class UI extends AbstractComponentContainer implements * that name, either by opening a new window/tab in the browser or by * replacing the contents of an existing window with that name. * </p> + * <p> + * As of Vaadin 7.0.0, the functionality for opening a Resource in a + * Page has been replaced with similar methods based on a String URL. + * This is because the usage of Resource is problematic with memory + * management and with security features in some browsers. Is is + * recommended to instead use {@link Link} for starting downloads. + * </p> * * @param resource * the resource. @@ -273,13 +280,20 @@ public abstract class UI extends AbstractComponentContainer implements */ @Deprecated public void open(Resource resource, String windowName) { - getPage().open(resource, windowName); + open(resource, windowName, -1, -1, Page.BORDER_DEFAULT); } /** * Opens the given resource in a window with the given size, border and * name. For more information on the meaning of {@code windowName}, see * {@link #open(Resource, String)}. + * <p> + * As of Vaadin 7.0.0, the functionality for opening a Resource in a + * Page has been replaced with similar methods based on a String URL. + * This is because the usage of Resource is problematic with memory + * management and with security features in some browsers. Is is + * recommended to instead use {@link Link} for starting downloads. + * </p> * * @param resource * the resource. diff --git a/theme-compiler/ivy.xml b/theme-compiler/ivy.xml index 2a0e814c07..7e5a639398 100644 --- a/theme-compiler/ivy.xml +++ b/theme-compiler/ivy.xml @@ -32,8 +32,6 @@ rev="2.5" /> <dependency org="com.carrotsearch" name="smartsprites" rev="0.2.3-itmill" /> - <dependency org="com.vaadin" name="vaadin-buildhelpers" - rev="${vaadin.version}" conf="build"></dependency> <dependency org="junit" name="junit" rev="4.5" conf="tests -> default" /> <dependency org="net.sourceforge.cssparser" name="cssparser" diff --git a/theme-compiler/src/com/vaadin/buildhelpers/CompileTheme.java b/theme-compiler/src/com/vaadin/buildhelpers/CompileTheme.java index c0bfb9aa7f..d2c64602ab 100644 --- a/theme-compiler/src/com/vaadin/buildhelpers/CompileTheme.java +++ b/theme-compiler/src/com/vaadin/buildhelpers/CompileTheme.java @@ -14,7 +14,6 @@ import org.apache.commons.cli.ParseException; import org.apache.commons.cli.PosixParser; import com.vaadin.sass.ScssStylesheet; -import com.vaadin.shared.Version; /** * Helper to combine css divided into separate per component dirs into one to @@ -30,6 +29,8 @@ public class CompileTheme { public static void main(String[] args) throws IOException, ParseException { Options options = new Options(); options.addOption("t", "theme", true, "the theme to compile"); + options.addOption("v", "theme-version", true, + "the version to add to the compiled theme"); options.addOption("f", "theme-folder", true, "the folder containing the theme"); options.addOption("s", "sprites", true, "use smartsprites"); @@ -43,11 +44,11 @@ public class CompileTheme { } String themeName = params.getOptionValue("theme"); String themeFolder = params.getOptionValue("theme-folder"); + String themeVersion = params.getOptionValue("theme-version"); boolean useSprites = params.hasOption("sprites"); - String version = Version.getFullVersion(); try { - processSassTheme(themeFolder, themeName, useSprites, version); + processSassTheme(themeFolder, themeName, useSprites, themeVersion); System.out.println("Compiling theme " + themeName + " successful"); } catch (Exception e) { System.err.println("Compiling theme " + themeName + " failed"); diff --git a/themes-compiled/build.xml b/themes-compiled/build.xml index a3adbd654f..b5e27c882f 100644 --- a/themes-compiled/build.xml +++ b/themes-compiled/build.xml @@ -78,6 +78,8 @@ <arg value="${theme}" /> <arg value="--theme-folder" /> <arg value="${theme.result.dir}" /> + <arg value="--theme-version" /> + <arg value="${vaadin.version}" /> <jvmarg value="-Xss8M" /> <jvmarg value="-XX:MaxPermSize=256M" /> <jvmarg value="-Djava.awt.headless=true" /> diff --git a/uitest/src/com/vaadin/tests/TestForWindowOpen.java b/uitest/src/com/vaadin/tests/TestForWindowOpen.java index 253fd3aeea..c3827e47ee 100644 --- a/uitest/src/com/vaadin/tests/TestForWindowOpen.java +++ b/uitest/src/com/vaadin/tests/TestForWindowOpen.java @@ -16,7 +16,6 @@ package com.vaadin.tests; -import com.vaadin.server.ExternalResource; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CustomComponent; @@ -35,9 +34,8 @@ public class TestForWindowOpen extends CustomComponent { @Override public void buttonClick(ClickEvent event) { - final ExternalResource r = new ExternalResource( - "http://www.google.com"); - UI.getCurrent().getPage().open(r); + UI.getCurrent().getPage() + .setLocation("http://www.google.com"); } @@ -48,9 +46,8 @@ public class TestForWindowOpen extends CustomComponent { @Override public void buttonClick(ClickEvent event) { - final ExternalResource r = new ExternalResource( - "http://www.google.com"); - UI.getCurrent().getPage().open(r, "mytarget"); + UI.getCurrent().getPage() + .open("http://www.google.com", "mytarget"); } @@ -61,9 +58,8 @@ public class TestForWindowOpen extends CustomComponent { @Override public void buttonClick(ClickEvent event) { - final ExternalResource r = new ExternalResource( - "http://www.google.com"); - UI.getCurrent().getPage().open(r, "secondtarget"); + UI.getCurrent().getPage() + .open("http://www.google.com", "secondtarget"); } diff --git a/uitest/src/com/vaadin/tests/application/VaadinSessionAttribute.html b/uitest/src/com/vaadin/tests/application/VaadinSessionAttribute.html new file mode 100644 index 0000000000..e03027f308 --- /dev/null +++ b/uitest/src/com/vaadin/tests/application/VaadinSessionAttribute.html @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>New Test</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">New Test</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.application.VaadinSessionAttribute?restartApplication&attachMainFirst</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestsapplicationVaadinSessionAttribute::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>//body/div[2]</td> + <td>42 & 84</td> +</tr> +</tbody></table> +</body> +</html> diff --git a/uitest/src/com/vaadin/tests/application/VaadinSessionAttribute.java b/uitest/src/com/vaadin/tests/application/VaadinSessionAttribute.java new file mode 100644 index 0000000000..ad48ef05ad --- /dev/null +++ b/uitest/src/com/vaadin/tests/application/VaadinSessionAttribute.java @@ -0,0 +1,55 @@ +/* + * Copyright 2011 Vaadin 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 + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package com.vaadin.tests.application; + +import com.vaadin.server.WrappedRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Notification; + +public class VaadinSessionAttribute extends AbstractTestUI { + + private static final String ATTR_NAME = "myAttribute"; + + @Override + protected void setup(WrappedRequest request) { + getSession().setAttribute(ATTR_NAME, Integer.valueOf(42)); + getSession().setAttribute(Integer.class, Integer.valueOf(42 * 2)); + + addComponent(new Button("Show attribute values", + new Button.ClickListener() { + @Override + public void buttonClick(ClickEvent event) { + Notification.show(getSession().getAttribute(ATTR_NAME) + + " & " + + getSession().getAttribute(Integer.class)); + } + })); + } + + @Override + protected String getTestDescription() { + return "Test to verify that session attributes are saved between requests."; + } + + @Override + protected Integer getTicketNumber() { + return Integer.valueOf(9514); + } + +} diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldExtendedRange.html b/uitest/src/com/vaadin/tests/components/datefield/DateFieldExtendedRange.html new file mode 100644 index 0000000000..aa6c536af3 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldExtendedRange.html @@ -0,0 +1,382 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>DateFieldExtendedRange</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">DateFieldExtendedRange</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/DateFieldExtendedRange?restartApplication</td> + <td></td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[0]/VPopupCalendar[0]#popupButton</td> + <td>8,16</td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>2011-01-01</td> +</tr> +<tr> + <td>assertText</td> + <td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[2]/td/table/tbody/tr[2]/td[2]/span</td> + <td>27</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runDateFieldExtendedRange::Root/VOverlay[0]/VCalendarPanel[0]#day37</td> + <td>6</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[0]/VPopupCalendar[0]#popupButton</td> + <td>11,11</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[2]/VPopupCalendar[0]#popupButton</td> + <td>10,12</td> +</tr> +<tr> + <td>assertText</td> + <td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[2]/td/table/tbody/tr[2]/td[2]/span</td> + <td>26</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runDateFieldExtendedRange::Root/VOverlay[0]/VCalendarPanel[0]#day36</td> + <td>5</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[2]/VPopupCalendar[0]#popupButton</td> + <td>15,20</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[4]/VPopupCalendar[0]#popupButton</td> + <td>11,8</td> +</tr> +<tr> + <td>assertText</td> + <td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[2]/td/table/tbody/tr[2]/td[2]/span</td> + <td>27</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runDateFieldExtendedRange::Root/VOverlay[0]/VCalendarPanel[0]#day37</td> + <td>6</td> +</tr> +<tr> + <td>assertText</td> + <td>//div[@id='runDateFieldExtendedRange-312092003']/div/div[2]/div/div[2]/div/div/div/div[1]/div/div/div/div/div[2]/div[2]/div/table/tbody/tr[2]/td/table/tbody/tr[2]/td[2]/span</td> + <td>27</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[1]/VDateFieldCalendar[0]/VCalendarPanel[0]#day37</td> + <td>6</td> +</tr> +<tr> + <td>assertText</td> + <td>//div[@id='runDateFieldExtendedRange-312092003']/div/div[2]/div/div[2]/div/div/div/div[1]/div/div/div/div/div[4]/div[2]/div/table/tbody/tr[2]/td/table/tbody/tr[2]/td[2]/span</td> + <td>26</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[3]/VDateFieldCalendar[0]/VCalendarPanel[0]#day36</td> + <td>5</td> +</tr> +<tr> + <td>assertText</td> + <td>//div[@id='runDateFieldExtendedRange-312092003']/div/div[2]/div/div[2]/div/div/div/div[1]/div/div/div/div/div[6]/div[2]/div/table/tbody/tr[2]/td/table/tbody/tr[2]/td[2]/span</td> + <td>27</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[5]/VDateFieldCalendar[0]/VCalendarPanel[0]#day37</td> + <td>6</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[0]/VPopupCalendar[0]#popupButton</td> + <td>11,9</td> +</tr> +<tr> + <td>mouseClick</td> + <td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[2]/td/table/tbody/tr[2]/td[2]/span</td> + <td>12,9</td> +</tr> +<tr> + <td>assertValue</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[0]/VPopupCalendar[0]#field</td> + <td>27.12.2010</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[2]/VPopupCalendar[0]#popupButton</td> + <td>10,15</td> +</tr> +<tr> + <td>mouseClick</td> + <td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[2]/td/table/tbody/tr[2]/td[2]/span</td> + <td>14,7</td> +</tr> +<tr> + <td>assertValue</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[2]/VPopupCalendar[0]#field</td> + <td>12/26/10</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[4]/VPopupCalendar[0]#popupButton</td> + <td>15,10</td> +</tr> +<tr> + <td>mouseClick</td> + <td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[2]/td/table/tbody/tr[2]/td[2]/span</td> + <td>6,11</td> +</tr> +<tr> + <td>assertValue</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[4]/VPopupCalendar[0]#field</td> + <td>27.12.2010</td> +</tr> +<tr> + <td>mouseClick</td> + <td>//div[@id='runDateFieldExtendedRange-312092003']/div/div[2]/div/div[2]/div/div/div/div[1]/div/div/div/div/div[2]/div[2]/div/table/tbody/tr[2]/td/table/tbody/tr[2]/td[2]/span</td> + <td>11,7</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[1]/VDateFieldCalendar[0]/VCalendarPanel[0]#header</td> + <td>joulukuu 2010</td> +</tr> +<tr> + <td>mouseClick</td> + <td>//div[@id='runDateFieldExtendedRange-312092003']/div/div[2]/div/div[2]/div/div/div/div[1]/div/div/div/div/div[4]/div[2]/div/table/tbody/tr[2]/td/table/tbody/tr[2]/td[2]/span</td> + <td>13,4</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[3]/VDateFieldCalendar[0]/VCalendarPanel[0]#header</td> + <td>December 2010</td> +</tr> +<tr> + <td>mouseClick</td> + <td>//div[@id='runDateFieldExtendedRange-312092003']/div/div[2]/div/div[2]/div/div/div/div[1]/div/div/div/div/div[6]/div[2]/div/table/tbody/tr[2]/td/table/tbody/tr[2]/td[2]/span</td> + <td>11,8</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[5]/VDateFieldCalendar[0]/VCalendarPanel[0]#header</td> + <td>joulukuu 2010</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[1]/VDateFieldCalendar[0]/VCalendarPanel[0]#day27</td> + <td>13,13</td> +</tr> +<tr> + <td>pressSpecialKey</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[1]/VDateFieldCalendar[0]/VCalendarPanel[0]</td> + <td>down</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[1]/VDateFieldCalendar[0]/VCalendarPanel[0]#header</td> + <td>tammikuu 2011</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[3]/VDateFieldCalendar[0]/VCalendarPanel[0]#day26</td> + <td>12,7</td> +</tr> +<tr> + <td>pressSpecialKey</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[3]/VDateFieldCalendar[0]/VCalendarPanel[0]</td> + <td>down</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[3]/VDateFieldCalendar[0]/VCalendarPanel[0]#header</td> + <td>January 2011</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[5]/VDateFieldCalendar[0]/VCalendarPanel[0]#day27</td> + <td>14,12</td> +</tr> +<tr> + <td>pressSpecialKey</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[5]/VDateFieldCalendar[0]/VCalendarPanel[0]</td> + <td>down</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[5]/VDateFieldCalendar[0]/VCalendarPanel[0]#header</td> + <td>tammikuu 2011</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[0]/VPopupCalendar[0]#popupButton</td> + <td>14,17</td> +</tr> +<tr> + <td>pressSpecialKey</td> + <td>vaadin=runDateFieldExtendedRange::Root/VOverlay[0]/VCalendarPanel[0]</td> + <td>down</td> +</tr> +<tr> + <td>pressSpecialKey</td> + <td>vaadin=runDateFieldExtendedRange::Root/VOverlay[0]/VCalendarPanel[0]</td> + <td>enter</td> +</tr> +<tr> + <td>assertValue</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[0]/VPopupCalendar[0]#field</td> + <td>3.1.2011</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[2]/VPopupCalendar[0]#popupButton</td> + <td>9,12</td> +</tr> +<tr> + <td>pressSpecialKey</td> + <td>vaadin=runDateFieldExtendedRange::Root/VOverlay[0]/VCalendarPanel[0]</td> + <td>down</td> +</tr> +<tr> + <td>pressSpecialKey</td> + <td>vaadin=runDateFieldExtendedRange::Root/VOverlay[0]/VCalendarPanel[0]</td> + <td>enter</td> +</tr> +<tr> + <td>assertValue</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[2]/VPopupCalendar[0]#field</td> + <td>1/2/11</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[4]/VPopupCalendar[0]#popupButton</td> + <td>15,15</td> +</tr> +<tr> + <td>pressSpecialKey</td> + <td>vaadin=runDateFieldExtendedRange::Root/VOverlay[0]/VCalendarPanel[0]</td> + <td>down</td> +</tr> +<tr> + <td>pressSpecialKey</td> + <td>vaadin=runDateFieldExtendedRange::Root/VOverlay[0]/VCalendarPanel[0]</td> + <td>enter</td> +</tr> +<tr> + <td>assertValue</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[4]/VPopupCalendar[0]#field</td> + <td>3.1.2011</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[0]/VPopupCalendar[0]#popupButton</td> + <td>10,15</td> +</tr> +<tr> + <td>mouseClick</td> + <td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[2]/td/table/tbody/tr[2]/td[2]/span</td> + <td>12,8</td> +</tr> +<tr> + <td>assertValue</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[0]/VPopupCalendar[0]#field</td> + <td>27.12.2010</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[2]/VPopupCalendar[0]#popupButton</td> + <td>12,15</td> +</tr> +<tr> + <td>mouseClick</td> + <td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[2]/td/table/tbody/tr[2]/td[2]/span</td> + <td>14,9</td> +</tr> +<tr> + <td>assertValue</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[2]/VPopupCalendar[0]#field</td> + <td>12/26/10</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[4]/VPopupCalendar[0]#popupButton</td> + <td>15,15</td> +</tr> +<tr> + <td>mouseClick</td> + <td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[2]/td/table/tbody/tr[2]/td[2]/span</td> + <td>8,12</td> +</tr> +<tr> + <td>assertValue</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[4]/VPopupCalendar[0]#field</td> + <td>27.12.2010</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[1]/VDateFieldCalendar[0]/VCalendarPanel[0]#day37</td> + <td>18,10</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[1]/VDateFieldCalendar[0]/VCalendarPanel[0]#header</td> + <td>helmikuu 2011</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[3]/VDateFieldCalendar[0]/VCalendarPanel[0]#day36</td> + <td>15,11</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[3]/VDateFieldCalendar[0]/VCalendarPanel[0]#header</td> + <td>February 2011</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[5]/VDateFieldCalendar[0]/VCalendarPanel[0]#day37</td> + <td>19,13</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[5]/VDateFieldCalendar[0]/VCalendarPanel[0]#header</td> + <td>helmikuu 2011</td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runDateFieldExtendedRange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[0]/VPopupCalendar[0]#popupButton</td> + <td>10,13</td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>2010-02-16</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java new file mode 100644 index 0000000000..e420278148 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java @@ -0,0 +1,79 @@ +package com.vaadin.tests.components.datefield; + +import java.util.Calendar; +import java.util.Locale; + +import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.DateField; +import com.vaadin.ui.GridLayout; +import com.vaadin.ui.InlineDateField; +import com.vaadin.ui.PopupDateField; + +@SuppressWarnings("serial") +public class DateFieldExtendedRange extends TestBase { + + private Calendar date = Calendar.getInstance(); + + @Override + protected void setup() { + date.set(2011, 0, 1); + + GridLayout layout = new GridLayout(2, 3); + layout.setWidth("600px"); + layout.setSpacing(true); + + final DateField[] fields = new DateField[6]; + + Locale fi = new Locale("fi", "FI"); + Locale us = new Locale("en", "US"); + + fields[0] = makeDateField(true, fi, "Finnish locale"); + fields[1] = makeDateField(false, fi, "Finnish locale"); + + fields[2] = makeDateField(true, us, "US English locale"); + fields[3] = makeDateField(false, us, "US English locale"); + + fields[4] = makeDateField(true, fi, "Finnish locale with week numbers"); + fields[4].setShowISOWeekNumbers(true); + fields[5] = makeDateField(false, fi, "Finnish locale with week numbers"); + fields[5].setShowISOWeekNumbers(true); + + for (DateField f : fields) { + layout.addComponent(f); + } + + addComponent(layout); + + addComponent(new Button("Change date", new ClickListener() { + public void buttonClick(ClickEvent event) { + date.set(2010, 1, 16); + for (DateField f : fields) { + f.setValue(date.getTime()); + } + } + })); + } + + @Override + protected String getDescription() { + return "Show a few days of the preceding and following months in the datefield popup"; + } + + @Override + protected Integer getTicketNumber() { + return 6718; + } + + private DateField makeDateField(boolean isPopup, Locale locale, + String caption) { + DateField df = isPopup ? new PopupDateField() : new InlineDateField(); + df.setResolution(DateField.RESOLUTION_DAY); + df.setValue(date.getTime()); + df.setLocale(locale); + df.setCaption(caption); + return df; + } +} diff --git a/uitest/src/com/vaadin/tests/components/table/TableReduceContainerSize.html b/uitest/src/com/vaadin/tests/components/table/TableReduceContainerSize.html new file mode 100644 index 0000000000..9bd0149bdb --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/table/TableReduceContainerSize.html @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>TableReduceContainerSize</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">TableReduceContainerSize</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/TableReduceContainerSize?restartApplication</td> + <td></td> +</tr> +<tr> + <td>scroll</td> + <td>vaadin=runTableReduceContainerSize::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]</td> + <td>19700</td> +</tr> +<tr> + <td>pause</td> + <td>300</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runTableReduceContainerSize::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runTableReduceContainerSize::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VLabel[0]</td> + <td>Index: *</td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runTableReduceContainerSize::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>scroll</td> + <td>vaadin=runTableReduceContainerSize::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]</td> + <td>19700</td> +</tr> +<tr> + <td>pause</td> + <td>300</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runTableReduceContainerSize::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runTableReduceContainerSize::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VLabel[0]</td> + <td>Index: *</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/uitest/src/com/vaadin/tests/components/table/TableReduceContainerSize.java b/uitest/src/com/vaadin/tests/components/table/TableReduceContainerSize.java new file mode 100644 index 0000000000..bc729ef042 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/table/TableReduceContainerSize.java @@ -0,0 +1,147 @@ +package com.vaadin.tests.components.table; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import com.vaadin.data.Container.Filter; +import com.vaadin.data.Item; +import com.vaadin.data.util.BeanItemContainer; +import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Label; +import com.vaadin.ui.Table; + +/** + * Test for #8291 and #7666: NegativeArraySizeException when Table scrolled to + * the end and its size reduced. + */ +public class TableReduceContainerSize extends TestBase { + + @Override + protected void setup() { + addComponent(new TestView()); + } + + private static class DecimateFilter implements Filter { + public boolean passesFilter(Object itemId, Item item) + throws UnsupportedOperationException { + return ((((TestObject) itemId).property3 % 10) == 0); + } + + public boolean appliesToProperty(Object propertyId) { + return true; + } + } + + private static class TestView extends HorizontalLayout { + + private Filter filter = null; + + private boolean reduceData; + + private TestView() { + final Table table = new Table(); + List<TestObject> data = createData(1000); + final BeanItemContainer<TestObject> container = new BeanItemContainer<TestObject>( + TestObject.class, data) { + + @Override + public int size() { + if (reduceData) { + return 100; + } else { + return super.size(); + } + } + }; + table.setContainerDataSource(container); + addComponent(table); + final Label label = new Label(); + addComponent(label); + Button button = new Button("Click"); + button.addListener(new Button.ClickListener() { + public void buttonClick(ClickEvent event) { + try { + reduceData = !reduceData; + table.refreshRowCache(); + label.setValue("Index: " + + table.getCurrentPageFirstItemIndex()); + } catch (Exception e) { + label.setValue("Exception: " + + e.getClass().getSimpleName()); + } + } + }); + addComponent(button); + Button button2 = new Button("Filter"); + button2.addListener(new Button.ClickListener() { + public void buttonClick(ClickEvent event) { + try { + if (filter != null) { + container.removeAllContainerFilters(); + filter = null; + } else { + filter = new DecimateFilter(); + container.addContainerFilter(filter); + } + table.refreshRowCache(); + label.setValue("Index: " + + table.getCurrentPageFirstItemIndex()); + } catch (Exception e) { + label.setValue("Exception: " + + e.getClass().getSimpleName()); + } + } + }); + addComponent(button2); + } + } + + private static List<TestObject> createData(int count) { + ArrayList<TestObject> data = new ArrayList<TestObject>(count); + for (int i = 0; i < count; i++) { + data.add(new TestObject("string-" + i, new Date(), i)); + } + return data; + } + + public static class TestObject { + + private String property1; + private Date property2; + private Integer property3; + + public TestObject(String property1, Date property2, Integer property3) { + this.property1 = property1; + this.property2 = property2; + this.property3 = property3; + } + + public String getProperty1() { + return property1; + } + + public Date getProperty2() { + return property2; + } + + public Integer getProperty3() { + return property3; + } + + } + + @Override + protected String getDescription() { + return "Table throws NegativeArraySizeException if container size is reduced to less than current scroll position"; + } + + @Override + protected Integer getTicketNumber() { + return 8291; + } + +} |