Commit Graph

432 Commitit

Tekijä SHA1 Viesti Päivämäärä
Artur Signell
0a83d7fd69 Include all server side test classes in the test WAR 2012-01-31 10:00:05 +02:00
Artur Signell
09b65b2261 Fixed widgetset compilation problem 2012-01-27 18:10:58 +02:00
Artur Signell
ae53f25207 Fixed compilation classpath for tests and renamed classpath variables to
be consistent
2012-01-27 17:56:33 +02:00
Artur Signell
2373c668d7 Corrected classpath related problems introduced during merge from 6.8 2012-01-27 17:26:40 +02:00
Artur Signell
8cc1ee0aa0 Merge remote-tracking branch 'origin/6.8'
Conflicts:
	WebContent/VAADIN/themes/base/table/table.css
	WebContent/release-notes.html
	build/build.xml
	src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
	src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java
	src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
	src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
	src/com/vaadin/terminal/gwt/client/ui/VSlider.java
	src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java
	src/com/vaadin/terminal/gwt/client/ui/VWindow.java
	src/com/vaadin/ui/Table.java
	tests/integration_tests.xml
	tests/test.xml
	tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
2012-01-27 14:17:08 +02:00
Johannes Dahlström
326ccadd49 Merged #8105 Compile core files and test files to separate folders
svn changeset:22636/svn branch:6.8
2012-01-16 07:01:28 +00:00
Artur Signell
a6c8dc7133 Include vaadinBootstrap.js in Liferay zip 2011-12-23 09:37:02 +02:00
Artur Signell
66795610c2 Do not treat util classes as junit tests 2011-12-16 10:14:52 +02:00
Artur Signell
67ec90d757 Removed copying of non-existing zip file in nightly publish 2011-12-16 10:02:27 +02:00
Henri Sara
a5d80b6722 Fix exclusion pattern for test data bean classes. 2011-12-13 10:34:41 +02:00
Henri Sara
b78f0ff26e Exclude test data beans from JUnit test execution. 2011-12-13 10:20:40 +02:00
Leif Åstrand
0e08e671f9 Merge remote branch 'origin/6.8'
Conflicts:
	src/com/vaadin/Application.java
	src/com/vaadin/data/Property.java
	src/com/vaadin/data/util/PropertyFormatter.java
	src/com/vaadin/terminal/ParameterHandler.java
	src/com/vaadin/terminal/URIHandler.java
	src/com/vaadin/terminal/gwt/client/HistoryImplIEVaadin.java
	src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java
	src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java
	src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java
	src/com/vaadin/ui/Field.java
	src/com/vaadin/ui/LoginForm.java
	src/com/vaadin/ui/UriFragmentUtility.java
2011-12-09 09:40:51 +02:00
Artur Signell
1a1cd72a58 Fixed typo in project.root 2011-12-08 18:06:54 +02:00
Artur Signell
a044f2fb78 Made test running from Eclipse work with Ivy 2011-12-08 18:00:59 +02:00
Leif Åstrand
d4be34e7bf Merge remote branch 'origin/master' into windowing 2011-12-08 16:26:32 +02:00
Artur Signell
3b0da56451 #7354 IT Mill -> Vaadin find and replace
svn changeset:22317/svn branch:6.7
2011-12-08 12:31:15 +00:00
Leif Åstrand
8343130d2b #8050 Enable custom parameters to widgetset compiler
svn changeset:22228/svn branch:6.7
2011-12-05 12:12:11 +00:00
Mikael Vappula
0d5878f640 Pass deps.initialized to called test targets in different build files. 2011-12-05 13:33:50 +02:00
Mikael Vappula
c1ac1f6b1f Cleaned up Ivy configuration
Targets related to Ivy configuration are now in separate common.xml file
which is imported to main build files.
2011-12-02 15:05:24 +02:00
Mikael Vappula
46309c47b6 Ivy configuration and TestBench test build script updates.
Included first version of Ant based replacement of old vaadin-server.py
demo server launch script.
2011-12-01 16:48:44 +02:00
Mikael Vappula
b41b0a91f6 #7997 Ivyfied custom SmartSprites library
Patched SmartSprites jar is now fetched using Ivy tooling.
Custom dependency resolver is used to retrieve module description
from local filesystem (in project hierarchy) and the master artifact
from Vaadin (6.x) SVN repository.

This is a temporary solution until required patches get contributed and
committed back to SmartSprite upstream and artifacts are available in
Maven central.
2011-12-01 15:06:30 +02:00
Leif Åstrand
2ed18c43db Include vaadinBootstrap.jar in the build results 2011-11-29 14:08:05 +02:00
Artur Signell
ad47ed7b53 #8009 Made war include resources required by the demo launcher
svn changeset:22151/svn branch:6.7
2011-11-28 12:43:27 +00:00
Artur Signell
2ae16a4393 #8009 Made war include resources required by the demo launcher
svn changeset:22145/svn branch:6.7
2011-11-28 11:03:57 +00:00
Artur Signell
113d195dc3 #8009 Cleaned build.xml
svn changeset:22144/svn branch:6.7
2011-11-28 09:32:01 +00:00
Mikael Vappula
a74248f0f3 Added compile time dependencies to server-side test runtime 2011-11-25 18:13:10 +02:00
Mikael Vappula
f03183f0ea Removed duplicate target dependency 2011-11-25 16:55:54 +02:00
Mikael Vappula
00bb974280 Fixed ivy configuration errors caused by parallel ant tasks 2011-11-25 16:41:03 +02:00
Henri Sara
471bc8fe2d Removed duplicate reference to a build target.
svn changeset:22134/svn branch:6.7
2011-11-25 14:14:15 +00:00
Mikael Vappula
424e3a25ac Missing mkdir caused warning while compiling widgetset 2011-11-25 14:45:15 +02:00
Mikael Vappula
54452425e2 Introduced Ivy based dependency management 2011-11-24 19:44:25 +02:00
Leif Åstrand
9238924733 Include tests on the classpath again now that they can be compiled 2011-11-18 10:58:27 +02:00
Leif Åstrand
3159f00229 Merge branch 'master' into windowing 2011-11-08 17:36:53 +02:00
Leif Åstrand
2eff8c02ab Merge remote-tracking branch 'origin/6.8' into master 2011-11-08 17:28:27 +02:00
Leif Åstrand
1965278f51 Include c.v.terminal.gwt.server in the test coverage data
svn changeset:21885/svn branch:6.7
2011-11-03 13:37:20 +00:00
Leif Åstrand
f2123f0def Don't compile the tests as they are not yet updated to use the new Root 2011-11-03 10:51:30 +02:00
Artur Signell
822aa7c87c Removed extra c from build number 2011-11-01 14:25:51 +02:00
Henri Sara
77fcbc1bc7 Do not exclude GWT JARs from classpath as it should contain servlet API
2.4
2011-10-31 15:00:49 +02:00
Artur Signell
c0465fd043 Removed Servlet 2.3 API check. No Servlet 2.5 API jar is included in the project so we should be fine without this check. 2011-10-31 12:41:54 +02:00
Artur Signell
3ac16b4495 Removed Java 5 check 2011-10-31 12:39:34 +02:00
Leif Åstrand
a1b2f28eec #7810 Server side test coverage reporting
svn changeset:21753/svn branch:6.7
2011-10-19 13:57:32 +00:00
Leif Åstrand
7c06bfa160 Moved the integration test sleep so that it isn't in effect if only running the integration tests
svn changeset:21718/svn branch:6.7
2011-10-17 13:01:58 +00:00
Henri Sara
146322a6de Manually merged [21485]: do not exclude static resources from WAR as needed by portal integration tests
svn changeset:21486/svn branch:6.7
2011-10-03 06:39:35 +00:00
Henri Sara
4794b6bf53 Merged changes from 6.6 (#7692)
svn changeset:21470/svn branch:6.7
2011-09-30 12:10:45 +00:00
Jonatan Kronqvist
c4b62e478a Restructure test source directories and packages #7385
svn changeset:21440/svn branch:6.7
2011-09-29 12:44:21 +00:00
Artur Signell
88874f95e7 #7485 Build script doesn't include resources for release-notes.html
svn changeset:21260/svn branch:6.7
2011-09-23 08:21:50 +00:00
Henri Sara
928ccdeade Correct initialization order to enable 6.7 custom build publishing to internal snapshot repository
svn changeset:20640/svn branch:6.7
2011-08-25 09:44:53 +00:00
Artur Signell
4eafa67d46 #7424 Replace gwt-version and version-minor automatically in release-notes.html
svn changeset:20592/svn branch:6.7
2011-08-23 15:34:08 +00:00
Artur Signell
6a17eea381 #7435 Include license file in all JARs
svn changeset:20589/svn branch:6.7
2011-08-23 14:59:38 +00:00
Artur Signell
cff130c825 #7435 Updated build script to include license file from correct location
svn changeset:20569/svn branch:6.7
2011-08-23 12:22:37 +00:00