From b07fc07ce90c12a191e0d425ae7a90f2ba690d3e Mon Sep 17 00:00:00 2001 From: Ahmed Ashour Date: Fri, 22 Sep 2017 09:27:29 +0200 Subject: Replace tab with spaces in .xml files (#10064) --- all/all-assembly-descriptor.xml | 92 ++++++------ checkstyle/vaadin-checkstyle.xml | 78 +++++----- client-compiled/pom.xml | 164 ++++++++++----------- .../resources/com/vaadin/DefaultWidgetSet.gwt.xml | 56 +++---- .../com/vaadin/v7/Vaadin7WidgetSet.gwt.xml | 6 +- .../generic/integration_tests.xml | 4 +- 6 files changed, 200 insertions(+), 200 deletions(-) diff --git a/all/all-assembly-descriptor.xml b/all/all-assembly-descriptor.xml index 22c15ebf73..354aa3b388 100644 --- a/all/all-assembly-descriptor.xml +++ b/all/all-assembly-descriptor.xml @@ -1,48 +1,48 @@ - bin - - zip - - false - - - - false - false - false - - - compile - lib - false - false - true - - ${project.groupId}:vaadin-shared - ${project.groupId}:vaadin-push - ${project.groupId}:vaadin-server - ${project.groupId}:vaadin-themes - ${project.groupId}:vaadin-client - ${project.groupId}:vaadin-client-compiler - ${project.groupId}:vaadin-client-compiled - ${project.groupId}:vaadin-compatibility-shared - ${project.groupId}:vaadin-compatibility-server - ${project.groupId}:vaadin-compatibility-themes - ${project.groupId}:vaadin-compatibility-client - ${project.groupId}:vaadin-compatibility-client-compiled - ${project.groupId}:vaadin-compatibility-server-gae - ${project.groupId}:vaadin-osgi-integration - ${project.groupId}:vaadin-liferay-integration - - - - - - - ${webcontent.dir} - - + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd"> + bin + + zip + + false + + + + false + false + false + + + compile + lib + false + false + true + + ${project.groupId}:vaadin-shared + ${project.groupId}:vaadin-push + ${project.groupId}:vaadin-server + ${project.groupId}:vaadin-themes + ${project.groupId}:vaadin-client + ${project.groupId}:vaadin-client-compiler + ${project.groupId}:vaadin-client-compiled + ${project.groupId}:vaadin-compatibility-shared + ${project.groupId}:vaadin-compatibility-server + ${project.groupId}:vaadin-compatibility-themes + ${project.groupId}:vaadin-compatibility-client + ${project.groupId}:vaadin-compatibility-client-compiled + ${project.groupId}:vaadin-compatibility-server-gae + ${project.groupId}:vaadin-osgi-integration + ${project.groupId}:vaadin-liferay-integration + + + + + + + ${webcontent.dir} + + diff --git a/checkstyle/vaadin-checkstyle.xml b/checkstyle/vaadin-checkstyle.xml index 4e086fe06c..a6c92201a1 100644 --- a/checkstyle/vaadin-checkstyle.xml +++ b/checkstyle/vaadin-checkstyle.xml @@ -4,45 +4,45 @@ "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> + conventions from: + - the Java Language Specification at http://java.sun.com/docs/books/jls/second_edition/html/index.html + - the Sun Code Conventions at http://java.sun.com/docs/codeconv/ + - the Javadoc guidelines at http://java.sun.com/j2se/javadoc/writingdoccomments/index.html + - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html + - some best practices Vaadin specific changes: + - Removed DoubleCheckedLocking because it doesn't work in CheckStyle 5.6 + -> http://www.smartics.eu/bugzilla/show_bug.cgi?id=593 + - Modified HiddenField Check to allow field shadowing on Constructor, Setter + and Abstract Method parameters. + - Modified StaticVariableName Check format for PUBLIC variables from ^[a-z][a-zA-Z0-9]*$ + to ^[A-Z_]*$ . Others (protected, package and private) still have ^[a-z][a-zA-Z0-9]*$ + - Modified the severity of the following Checks from error to info: + • JavadocPackage (checks for package-info.java) + - Modified the severity of the following Checks from error to warning and the scope from private to protected: + • JavadocType (class and interface declarations) + • JavadocMethod (method declarations) + • JavadocVariable (variable declarations) + • JavadocStyle (Javadocs are "well formed") + - Modified the severity of the following Checks from error to warning because not so critical: + • LineLenght (the default value is 80 which is also used in formatter, but + i.e. member declarations are not wrapped onto next line) + • RedundantModifier (i.e. using public in interface method declarations) + • RedundantThrows (causes unnecessary fails when can't get class information) + • MethodLength (default maxLength is 150) + • ParameterNumber (default maxLength is 7) + • EmptyBlock (if-else statements have some blocks if x -> no action) + • UpperEll (should use L instead of l with long) + • TodoComment (not serious) + • WhitespaceAroundCheck (expects whitespace around some operators) + NOTE other checks are also warning but should be error. + - Modified the severity of the following Checks from error to ignore: + • FinalParameters (method parameters can be modified) + • VisibilityModifier (i.e. in state classes public members are allowed) + • DesignForExtension (this design is not used) + • FileLength (bad design to have files with over 2000 lines? see VScrollTable) + • MagicNumber (MagicNumbers like error codes are used, but could just ignore + this in some classes) + • AvoidInlineConditionals ( you like these ? ignore : error ) --> - com.vaadin - vaadin-client-compiled - vaadin-client-compiled - jar + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.vaadin + vaadin-root + 8.2-SNAPSHOT + + + com.vaadin + vaadin-client-compiled + vaadin-client-compiled + jar - - com.vaadin.DefaultWidgetSet - OBF - 6 - + + com.vaadin.DefaultWidgetSet + OBF + 6 + - https://vaadin.com/ - Vaadin client compiled + https://vaadin.com/ + Vaadin client compiled - - - ${project.groupId} - vaadin-server - ${project.version} - provided - + + + ${project.groupId} + vaadin-server + ${project.version} + provided + ${project.groupId} @@ -37,26 +37,26 @@ provided - - ${project.groupId} - vaadin-client - ${project.version} - provided - + + ${project.groupId} + vaadin-client + ${project.version} + provided + - - ${project.groupId} - vaadin-client-compiler - ${project.version} - provided - + + ${project.groupId} + vaadin-client-compiler + ${project.version} + provided + - - ${project.groupId} - vaadin-buildhelpers - ${project.version} - provided - + + ${project.groupId} + vaadin-buildhelpers + ${project.version} + provided + org.osgi @@ -66,48 +66,48 @@ org.osgi osgi.cmpn - + - - - - com.vaadin - vaadin-maven-plugin - - - ${widgetset.name} - - ${project.build.outputDirectory}/VAADIN/widgetsets - ${project.build.directory}/gwt-unitCache - - -Xmx1G - - - - - compile - - - - + + + + com.vaadin + vaadin-maven-plugin + + + ${widgetset.name} + + ${project.build.outputDirectory}/VAADIN/widgetsets + ${project.build.directory}/gwt-unitCache + + -Xmx1G + + + + + compile + + + + biz.aQute.bnd bnd-maven-plugin - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - false - - true - - - - - - + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + false + + true + + + + + + diff --git a/client/src/main/resources/com/vaadin/DefaultWidgetSet.gwt.xml b/client/src/main/resources/com/vaadin/DefaultWidgetSet.gwt.xml index 34b0689789..a8777319c3 100755 --- a/client/src/main/resources/com/vaadin/DefaultWidgetSet.gwt.xml +++ b/client/src/main/resources/com/vaadin/DefaultWidgetSet.gwt.xml @@ -1,43 +1,43 @@ - + - - + + - + - + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - + + diff --git a/compatibility-client/src/main/resources/com/vaadin/v7/Vaadin7WidgetSet.gwt.xml b/compatibility-client/src/main/resources/com/vaadin/v7/Vaadin7WidgetSet.gwt.xml index f121892f35..548fd27c53 100755 --- a/compatibility-client/src/main/resources/com/vaadin/v7/Vaadin7WidgetSet.gwt.xml +++ b/compatibility-client/src/main/resources/com/vaadin/v7/Vaadin7WidgetSet.gwt.xml @@ -1,10 +1,10 @@ - - + + - + diff --git a/test/servlet-containers/generic/integration_tests.xml b/test/servlet-containers/generic/integration_tests.xml index 3543cf24de..d8a5bba18b 100644 --- a/test/servlet-containers/generic/integration_tests.xml +++ b/test/servlet-containers/generic/integration_tests.xml @@ -59,8 +59,8 @@ - - + + -- cgit v1.2.3