Artur Signell
e2db3e777a
Merge changes from origin/7.1
...
e77e73c
Update copyright year to 2014
Conflicts:
client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
client/src/com/vaadin/client/ApplicationConnection.java
server/src/com/vaadin/data/util/converter/StringToNumberConverter.java
shared/src/com/vaadin/shared/ui/ui/PageState.java
shared/src/com/vaadin/shared/ui/window/WindowState.java
theme-compiler/src/com/vaadin/sass/SassCompiler.java
theme-compiler/src/com/vaadin/sass/internal/ScssStylesheet.java
theme-compiler/src/com/vaadin/sass/internal/expression/ArithmeticExpressionEvaluator.java
theme-compiler/src/com/vaadin/sass/internal/expression/BinaryExpression.java
theme-compiler/src/com/vaadin/sass/internal/expression/BinaryOperator.java
theme-compiler/src/com/vaadin/sass/internal/expression/exception/ArithmeticException.java
theme-compiler/src/com/vaadin/sass/internal/expression/exception/IncompatibleUnitsException.java
theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandler.java
theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java
theme-compiler/src/com/vaadin/sass/internal/handler/SCSSErrorHandler.java
theme-compiler/src/com/vaadin/sass/internal/parser/CharStream.java
theme-compiler/src/com/vaadin/sass/internal/parser/Generic_CharStream.java
theme-compiler/src/com/vaadin/sass/internal/parser/LexicalUnitImpl.java
theme-compiler/src/com/vaadin/sass/internal/parser/LocatorImpl.java
theme-compiler/src/com/vaadin/sass/internal/parser/MediaListImpl.java
theme-compiler/src/com/vaadin/sass/internal/parser/ParseException.java
theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
theme-compiler/src/com/vaadin/sass/internal/parser/ParserConstants.java
theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java
theme-compiler/src/com/vaadin/sass/internal/parser/SCSSLexicalUnit.java
theme-compiler/src/com/vaadin/sass/internal/parser/SCSSParseException.java
theme-compiler/src/com/vaadin/sass/internal/parser/SelectorListImpl.java
theme-compiler/src/com/vaadin/sass/internal/parser/Selectors.java
theme-compiler/src/com/vaadin/sass/internal/parser/ThrowedParseException.java
theme-compiler/src/com/vaadin/sass/internal/parser/Token.java
theme-compiler/src/com/vaadin/sass/internal/parser/TokenMgrError.java
theme-compiler/src/com/vaadin/sass/internal/resolver/ClassloaderResolver.java
theme-compiler/src/com/vaadin/sass/internal/resolver/FilesystemResolver.java
theme-compiler/src/com/vaadin/sass/internal/resolver/ScssStylesheetResolver.java
theme-compiler/src/com/vaadin/sass/internal/resolver/VaadinResolver.java
theme-compiler/src/com/vaadin/sass/internal/selector/SelectorUtil.java
theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/ExtendNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/ForNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/FunctionNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/ImportNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/KeyframesNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/ListContainsNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/ListModifyNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/ListRemoveNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/MediaNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/MicrosoftRuleNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/MixinDefNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/MixinNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/NestPropertiesNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/Node.java
theme-compiler/src/com/vaadin/sass/internal/tree/RuleNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/SimpleNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/VariableNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/EachDefNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/IfElseDefNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/IfNode.java
theme-compiler/src/com/vaadin/sass/internal/util/ColorUtil.java
theme-compiler/src/com/vaadin/sass/internal/util/DeepCopy.java
theme-compiler/src/com/vaadin/sass/internal/util/FastByteArrayInputStream.java
theme-compiler/src/com/vaadin/sass/internal/util/FastByteArrayOutputStream.java
theme-compiler/src/com/vaadin/sass/internal/util/StringUtil.java
theme-compiler/src/com/vaadin/sass/internal/visitor/BlockNodeHandler.java
theme-compiler/src/com/vaadin/sass/internal/visitor/EachNodeHandler.java
theme-compiler/src/com/vaadin/sass/internal/visitor/ExtendNodeHandler.java
theme-compiler/src/com/vaadin/sass/internal/visitor/IfElseNodeHandler.java
theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java
theme-compiler/src/com/vaadin/sass/internal/visitor/MixinNodeHandler.java
theme-compiler/src/com/vaadin/sass/internal/visitor/NestedNodeHandler.java
theme-compiler/src/com/vaadin/sass/internal/visitor/VariableNodeHandler.java
theme-compiler/tests/src/com/vaadin/sass/AbstractTestBase.java
theme-compiler/tests/src/com/vaadin/sass/internal/expression/ArithmeticExpressionEvaluatorTest.java
theme-compiler/tests/src/com/vaadin/sass/parser/ParserTest.java
theme-compiler/tests/src/com/vaadin/sass/resolvers/VaadinResolverTest.java
theme-compiler/tests/src/com/vaadin/sass/testcases/css/Interpolation.java
theme-compiler/tests/src/com/vaadin/sass/testcases/css/Selectors.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/AbstractDirectoryScanningSassTests.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/AutomaticSassTests.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Comments.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ControlDirectives.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Extends.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Functions.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Imports.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Mixins.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/NestedProperties.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Nesting.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentImports.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentSelector.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/SassLangTests.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/SassLangTestsBroken.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/SassTestRunner.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Variables.java
theme-compiler/tests/src/com/vaadin/sass/tree/ImportNodeTest.java
uitest/src/com/vaadin/tests/push/BasicPushTest.java
uitest/src/com/vaadin/tests/push/PushConfigurationTest.java
uitest/src/com/vaadin/tests/push/PushReconnectTest.java
Change-Id: Ic08c4f9aecd4c684ce74408de4e0b0d0ff617273
2014-04-23 20:52:07 +03:00
Artur Signell
e77e73cf64
Update copyright year to 2014
...
Change-Id: Ic77338304dc7e58e49f27dcdaf0bab2e00f5bba6
2014-04-16 11:17:52 +00:00
Jonatan Kronqvist
563b0ca0d8
Update commons-io to the same version in all modules ( #13531 )
...
Adds a commons-io.version property to the build.properties file
Change-Id: I57a72f8841846d77ba73d567bd9bc3c8415b243c
2014-04-03 10:28:02 +03:00
Jonatan Kronqvist
353a1a1c30
Remove theme-compiler and replace with external vaadin-sass-compiler
...
* Moves CompileTheme from the theme-compiler to buildhelpers
* Refactors CompileTheme to get the Vaadin version on the command line
instead of using the Version class found in vaadin-shared
* Refactors build scripts to pass the version number on the command line
when running CompileTheme
* Removes the theme-compiler module/project/whatchamacallit
* Replaces the theme-compiler dependency with vaadin-sass-compiler 0.9.0
from maven
Change-Id: I4f98d15b60e18a826bf264eb55d12b3e736e8e54
2014-03-31 13:37:27 +00:00
Johannes Dahlström
8e2085c346
Remove dead code
...
Change-Id: I1ac813afa47e38fb508e676d25d103a29bfada6a
2014-01-17 11:33:54 +00:00
Artur Signell
bc90a58b6e
Unified xml files to end with new line
...
Change-Id: Ifb1393e7e5c5c1002b924223957767b3e584d5ab
2013-09-04 21:03:12 +03:00
Artur Signell
37bc9e41db
Reformatted using Ant editor ( #12040 )
...
Change-Id: If8afd65d5905302c64f12ef7f76ee7e63073c474
2013-06-10 20:21:56 +03:00
Artur Signell
e6e752d4ad
Correctly decode summaries containing quotes ( #11769 )
...
Change-Id: I98031bab90d3aa3f37e7dc71a9104f7b7a956590
2013-06-05 07:46:02 +00:00
Artur Signell
9a3dc4e99c
Formatted XML files using defined rules ( #11956 )
...
Change-Id: Iecd621321fdde29d2d89d910ba46e9dadee58995
2013-05-30 15:08:00 +00:00
Artur Signell
8fec88fe77
Updated commons-io dependency to 2.2 ( #11643 )
...
Change-Id: Ia134929a67328e2a759028b2ee5b64206dc78883
2013-04-23 06:46:22 +00:00
Artur Signell
e6d506494c
Renamed "tests" target to "test" and added "test-all" ( #9998 )
...
The "test" target runs all tests which do not require additional servers or setup. Can be run immediately after cloning the project.
The "test-all" target runs also integration tests and UI tests which require access to servers or additional setup.
Change-Id: I2f5371dc5be805ba12766c8187a2b58fbc7f7db4
2013-03-01 15:54:57 +02:00
Artur Signell
7b68e8e521
Added missing license header
...
Change-Id: I39b55229b63ff377d12956112a4f08c7cbec00ad
2013-02-28 10:03:25 +00:00
Artur Signell
f09c12fd97
Imported and updated release notes builder ( #10918 )
...
Change-Id: Ie21d448f89d0fab6b7732a0137c80172e9da8e69
Ticket: 10918
2013-02-19 15:07:44 +00:00
Artur Signell
0ece55d000
Include GWT sources in sources jar ( #9102 )
...
Change-Id: I99928a614cf220b79f107e45eb02dc3de8333db1
2013-01-21 20:13:13 +02:00
Pekka Hyvönen
1042592911
Checkstyle for Vaadin #9065
...
* Validates that all java files contains a license file and fails the build if a license is missing
* For now runs a lot of checks with a severity less than error to avoid failing the build
* Outputs test results to TeamCity for reporting
Change-Id: I24ca9cd0646a4bc530ef3a183eef1bc4addc555d
2013-01-04 18:59:39 +02:00
Artur Signell
fb68bd5303
Updated copyright notices and added missing license headers
...
Change-Id: I419ce4581d1a8b84d4236a85a1333d23f3423b2e
2013-01-04 12:26:29 +02:00
Artur Signell
b5e242213d
Allow specifying version per java package ( #10322 )
...
Change-Id: Ib7cba6c4229c3a213efb57f096800268c5dd3512
2012-12-02 11:16:17 +02:00
Johannes Dahlström
4043a690b5
Explicitly specify symbolic names for each bundle to prevent names like "com.vaadin.vaadin-shared" ( #9793 )
...
Change-Id: I329e4d6b8334864be5023ef51225a6e340e74aa6
2012-10-09 16:33:39 +00:00
Artur Signell
45e2be6ab3
Allow specifying prefixes also for resource directories ( #9793 )
...
* Export VAADIN/widgetsets/* in client-compiled
* Export VAADIN/themes/* in themes
* Export VAADIN in server (vaadinBootstrap.js)
Change-Id: I15b0f7352779479bf73585017f0b95492692f73b
2012-10-09 18:54:37 +03:00
Artur Signell
59edcbc490
Add version to exported packages ( #7222 )
...
Change-Id: I8c22329258cbd8d4dc2f892ae5ba6fa0b9b37a10
2012-10-09 11:58:52 +03:00
Artur Signell
f296b46c8d
Cleaned up GeneratePackageExports ( #9793 )
...
No longer deletes existing Export-Packages or generate empty Export-Package attributes
Change-Id: I17df2f74b42a50a3b2c63bc4fb79a92721aabd72
2012-10-08 15:52:03 +03:00
Artur Signell
21308eedc6
Removed hard coded package names from export metadata generator ( #9612 )
...
Change-Id: I860d9241e270a2a96796b4800f0bbbc808e2e710
2012-10-02 18:06:08 +03:00
Artur Signell
6da3cd640d
Build javadoc and sources jars ( #9299 )
2012-09-09 11:23:24 +03:00
Artur Signell
93ed08119c
Generate pom artifacts and automatically publish to local Maven ( #9299 )
2012-09-09 11:23:22 +03:00
Artur Signell
1d6f0611a8
Added themes-compiled module ( #9299 )
2012-09-09 11:23:08 +03:00
Artur Signell
4156f77898
Steps towards publishing sources and javadoc jars ( #9299 )
2012-09-09 11:23:06 +03:00
Artur Signell
d8a5f96b36
Support running JUnit tests ( #9299 )
2012-09-09 11:23:04 +03:00
Artur Signell
58df14a189
Added build-provided to make build work again
2012-09-09 11:23:01 +03:00
Artur Signell
0a77dae8b5
Created separate build.xml files for each module ( #9299 )
2012-09-09 11:22:53 +03:00