Browse Source

Replace tab with spaces in .xml files (#10064)

tags/8.2.0.alpha2
Ahmed Ashour 6 years ago
parent
commit
b07fc07ce9

+ 46
- 46
all/all-assembly-descriptor.xml View File

@@ -1,48 +1,48 @@
<assembly
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">
<id>bin</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
<outputDirectory />
<useProjectArtifact>false</useProjectArtifact>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
<dependencySet>
<scope>compile</scope>
<outputDirectory>lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<unpack>false</unpack>
<useTransitiveDependencies>true</useTransitiveDependencies>
<excludes>
<exclude>${project.groupId}:vaadin-shared</exclude>
<exclude>${project.groupId}:vaadin-push</exclude>
<exclude>${project.groupId}:vaadin-server</exclude>
<exclude>${project.groupId}:vaadin-themes</exclude>
<exclude>${project.groupId}:vaadin-client</exclude>
<exclude>${project.groupId}:vaadin-client-compiler</exclude>
<exclude>${project.groupId}:vaadin-client-compiled</exclude>
<exclude>${project.groupId}:vaadin-compatibility-shared</exclude>
<exclude>${project.groupId}:vaadin-compatibility-server</exclude>
<exclude>${project.groupId}:vaadin-compatibility-themes</exclude>
<exclude>${project.groupId}:vaadin-compatibility-client</exclude>
<exclude>${project.groupId}:vaadin-compatibility-client-compiled</exclude>
<exclude>${project.groupId}:vaadin-compatibility-server-gae</exclude>
<exclude>${project.groupId}:vaadin-osgi-integration</exclude>
<exclude>${project.groupId}:vaadin-liferay-integration</exclude>
</excludes>
</dependencySet>
</dependencySets>
<fileSets>
<fileSet>
<outputDirectory />
<directory>${webcontent.dir}</directory>
</fileSet>
</fileSets>
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">
<id>bin</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
<outputDirectory />
<useProjectArtifact>false</useProjectArtifact>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
<dependencySet>
<scope>compile</scope>
<outputDirectory>lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<unpack>false</unpack>
<useTransitiveDependencies>true</useTransitiveDependencies>
<excludes>
<exclude>${project.groupId}:vaadin-shared</exclude>
<exclude>${project.groupId}:vaadin-push</exclude>
<exclude>${project.groupId}:vaadin-server</exclude>
<exclude>${project.groupId}:vaadin-themes</exclude>
<exclude>${project.groupId}:vaadin-client</exclude>
<exclude>${project.groupId}:vaadin-client-compiler</exclude>
<exclude>${project.groupId}:vaadin-client-compiled</exclude>
<exclude>${project.groupId}:vaadin-compatibility-shared</exclude>
<exclude>${project.groupId}:vaadin-compatibility-server</exclude>
<exclude>${project.groupId}:vaadin-compatibility-themes</exclude>
<exclude>${project.groupId}:vaadin-compatibility-client</exclude>
<exclude>${project.groupId}:vaadin-compatibility-client-compiled</exclude>
<exclude>${project.groupId}:vaadin-compatibility-server-gae</exclude>
<exclude>${project.groupId}:vaadin-osgi-integration</exclude>
<exclude>${project.groupId}:vaadin-liferay-integration</exclude>
</excludes>
</dependencySet>
</dependencySets>
<fileSets>
<fileSet>
<outputDirectory />
<directory>${webcontent.dir}</directory>
</fileSet>
</fileSets>
</assembly>

+ 39
- 39
checkstyle/vaadin-checkstyle.xml View File

@@ -4,45 +4,45 @@
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">

<!-- Checkstyle configuration for Vaadin that is based on the the sun coding
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 ) -->
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 ) -->

<module name="Checker">
<!-- If you set the basedir property below, then all reported file names

+ 82
- 82
client-compiled/pom.xml View File

@@ -1,34 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-root</artifactId>
<version>8.2-SNAPSHOT</version>
</parent>
<!-- Needed by a plugin in release build -->
<groupId>com.vaadin</groupId>
<artifactId>vaadin-client-compiled</artifactId>
<name>vaadin-client-compiled</name>
<packaging>jar</packaging>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-root</artifactId>
<version>8.2-SNAPSHOT</version>
</parent>
<!-- Needed by a plugin in release build -->
<groupId>com.vaadin</groupId>
<artifactId>vaadin-client-compiled</artifactId>
<name>vaadin-client-compiled</name>
<packaging>jar</packaging>

<properties>
<widgetset.name>com.vaadin.DefaultWidgetSet</widgetset.name>
<widgetset.style>OBF</widgetset.style>
<widgetset.local.workers>6</widgetset.local.workers>
</properties>
<properties>
<widgetset.name>com.vaadin.DefaultWidgetSet</widgetset.name>
<widgetset.style>OBF</widgetset.style>
<widgetset.local.workers>6</widgetset.local.workers>
</properties>

<url>https://vaadin.com/</url>
<description>Vaadin client compiled</description>
<url>https://vaadin.com/</url>
<description>Vaadin client compiled</description>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>vaadin-server</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>vaadin-server</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
@@ -37,26 +37,26 @@
<scope>provided</scope>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>vaadin-client</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>vaadin-client</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>vaadin-client-compiler</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>vaadin-client-compiler</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>vaadin-buildhelpers</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>vaadin-buildhelpers</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.osgi</groupId>
@@ -66,48 +66,48 @@
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
</dependency>
</dependencies>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-maven-plugin</artifactId>
<configuration>
<modules>
<module>${widgetset.name}</module>
</modules>
<webappDirectory>${project.build.outputDirectory}/VAADIN/widgetsets</webappDirectory>
<persistentunitcachedir>${project.build.directory}/gwt-unitCache</persistentunitcachedir>
<style>${widgetset.style}</style>
<extraJvmArgs>-Xmx1G</extraJvmArgs>
</configuration>
<executions>
<execution>
<goals>
<goal>compile</goal>
</goals>
</execution>
</executions>
</plugin>
<build>
<plugins>
<plugin>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-maven-plugin</artifactId>
<configuration>
<modules>
<module>${widgetset.name}</module>
</modules>
<webappDirectory>${project.build.outputDirectory}/VAADIN/widgetsets</webappDirectory>
<persistentunitcachedir>${project.build.directory}/gwt-unitCache</persistentunitcachedir>
<style>${widgetset.style}</style>
<extraJvmArgs>-Xmx1G</extraJvmArgs>
</configuration>
<executions>
<execution>
<goals>
<goal>compile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<index>false</index>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
</archive>
</configuration>
</plugin>
</plugins>
</build>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<index>false</index>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
</archive>
</configuration>
</plugin>
</plugins>
</build>

</project>

+ 28
- 28
client/src/main/resources/com/vaadin/DefaultWidgetSet.gwt.xml View File

@@ -1,43 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.1//EN" "http://gwtproject.org/doctype/2.8.1/gwt-module.dtd">
<module>
<!-- This GWT module defines the Vaadin DefaultWidgetSet. This is the module
you want to extend when creating an extended widget set, or when creating
a specialized widget set with a subset of the components. -->
<!-- This GWT module defines the Vaadin DefaultWidgetSet. This is the module
you want to extend when creating an extended widget set, or when creating
a specialized widget set with a subset of the components. -->

<!-- Hint for WidgetSetBuilder not to automatically update the file -->
<!-- WS Compiler: manually edited -->
<!-- Hint for WidgetSetBuilder not to automatically update the file -->
<!-- WS Compiler: manually edited -->

<inherits name="com.vaadin.Vaadin" />
<inherits name="com.vaadin.Vaadin" />

<inherits name="elemental.Elemental" />
<inherits name="elemental.Elemental" />

<inherits name="com.google.gwt.precompress.Precompress" />
<inherits name="com.google.gwt.precompress.Precompress" />

<entry-point class="com.vaadin.client.ApplicationConfiguration" />
<entry-point class="com.vaadin.client.ApplicationConfiguration" />

<generate-with
class="com.vaadin.server.widgetsetutils.AcceptCriteriaFactoryGenerator">
<when-type-is class="com.vaadin.client.ui.dd.VAcceptCriterionFactory" />
</generate-with>
<generate-with
class="com.vaadin.server.widgetsetutils.AcceptCriteriaFactoryGenerator">
<when-type-is class="com.vaadin.client.ui.dd.VAcceptCriterionFactory" />
</generate-with>

<generate-with
class="com.vaadin.server.widgetsetutils.ConnectorBundleLoaderFactory">
<when-type-assignable
class="com.vaadin.client.metadata.ConnectorBundleLoader" />
</generate-with>
<generate-with
class="com.vaadin.server.widgetsetutils.ConnectorBundleLoaderFactory">
<when-type-assignable
class="com.vaadin.client.metadata.ConnectorBundleLoader" />
</generate-with>

<replace-with class="com.vaadin.client.communication.DefaultReconnectDialog">
<when-type-is class="com.vaadin.client.communication.ReconnectDialog" />
</replace-with>
<replace-with class="com.vaadin.client.communication.DefaultReconnectDialog">
<when-type-is class="com.vaadin.client.communication.ReconnectDialog" />
</replace-with>

<replace-with class="com.vaadin.client.ui.VOverlay">
<when-type-is class="com.vaadin.client.widgets.Overlay" />
</replace-with>
<replace-with class="com.vaadin.client.ui.VOverlay">
<when-type-is class="com.vaadin.client.widgets.Overlay" />
</replace-with>

<!-- Since 7.2. Compile all permutations (browser support) into one Javascript
file. Speeds up compilation and does not make the Javascript significantly
larger. -->
<collapse-all-properties />
<!-- Since 7.2. Compile all permutations (browser support) into one Javascript
file. Speeds up compilation and does not make the Javascript significantly
larger. -->
<collapse-all-properties />

</module>

+ 3
- 3
compatibility-client/src/main/resources/com/vaadin/v7/Vaadin7WidgetSet.gwt.xml View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.1//EN" "http://gwtproject.org/doctype/2.8.1/gwt-module.dtd">
<module>
<!-- Hint for WidgetSetBuilder not to automatically update the file -->
<!-- WS Compiler: manually edited -->
<!-- Hint for WidgetSetBuilder not to automatically update the file -->
<!-- WS Compiler: manually edited -->

<inherits name="com.vaadin.DefaultWidgetSet" />
<inherits name="com.vaadin.DefaultWidgetSet" />

<source path="shared" />
<source path="client" />

+ 2
- 2
test/servlet-containers/generic/integration_tests.xml View File

@@ -59,8 +59,8 @@
<fail unless="server-name" message="Server name must be defined in server-name" />
<fail unless="deployment.url" message="Deplyoment url must be defined in deployment.url" />
<fail unless="com.vaadin.testbench.screenshot.directory" message="Screenshot directory must be defined in com.vaadin.testbench.screenshot.directory" />
<property name="server.report.dir" location="${report.dir}/integration-test-tb3/${server-name}" />
<!-- The junit task does not create the report dir... -->
<property name="server.report.dir" location="${report.dir}/integration-test-tb3/${server-name}" />
<!-- The junit task does not create the report dir... -->
<mkdir dir="${server.report.dir}" />

<junit showoutput="no" printsummary="no" fork="yes">

Loading…
Cancel
Save