From: Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com>
Date: Tue, 13 Dec 2016 07:31:49 +0000 (+0200)
Subject: Remove vaadin-widgets module (#7960)
X-Git-Tag: 8.0.0.alpha10~37
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2a52bce41799dd1b766a17acc1aaacd45ea9bfdd;p=vaadin-framework.git

Remove vaadin-widgets module (#7960)
---

diff --git a/all/all-assembly-descriptor.xml b/all/all-assembly-descriptor.xml
index 2a7cf09a82..157f6215b9 100644
--- a/all/all-assembly-descriptor.xml
+++ b/all/all-assembly-descriptor.xml
@@ -33,7 +33,6 @@
 				<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-widgets</exclude>
 			</excludes>
 		</dependencySet>
 	</dependencySets>
diff --git a/all/pom.xml b/all/pom.xml
index b3db0fd7d2..66b548bdb6 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -92,12 +92,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>vaadin-widgets</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <!-- Needed because referenced from javadocs -->
         <dependency>
             <groupId>javax.portlet</groupId>
diff --git a/bom/pom.xml b/bom/pom.xml
index d6fda8103b..ebf2eb7d10 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -30,11 +30,6 @@
                 <artifactId>vaadin-push</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.vaadin</groupId>
-                <artifactId>vaadin-widgets</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.vaadin</groupId>
                 <artifactId>vaadin-client</artifactId>
diff --git a/pom.xml b/pom.xml
index bf0532a883..fbce507012 100644
--- a/pom.xml
+++ b/pom.xml
@@ -556,7 +556,6 @@
                 <module>client-compiler</module>
                 <module>client-compiled</module>
                 <module>themes</module>
-                <module>widgets</module>
                 <module>uitest-common</module>
                 <module>uitest</module>
                 <module>liferay</module>
diff --git a/widgets/pom.xml b/widgets/pom.xml
deleted file mode 100644
index 4f8c2a8eca..0000000000
--- a/widgets/pom.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-<?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.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>vaadin-widgets</artifactId>
-    <name>vaadin-widgets</name>
-    <packaging>jar</packaging>
-
-    <url>https://vaadin.com/</url>
-    <description>Vaadin widgets</description>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>vaadin-client</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>vaadin-shared</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-themes</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>
-
-
-    </dependencies>
-
-    <build>
-        <plugins>
-
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
-                        <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment>
-                        <!-- Export package is handled in exec plugin -->
-                        <Export-Package></Export-Package>
-                        <Import-Package></Import-Package>
-                    </instructions>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>unpack-dependencies</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>com.vaadin</groupId>
-                                    <artifactId>vaadin-client</artifactId>
-                                    <includes>
-                                        com/vaadin/*.gwt.xml,
-                                        com/vaadin/client/BrowserInfo*,
-                                        com/vaadin/client/AnimationUtil*,
-                                        com/vaadin/client/ComputedStyle*,
-                                        com/vaadin/client/DeferredWorker*,
-                                        com/vaadin/client/Profiler*,
-                                        com/vaadin/client/StyleConstants*,
-                                        com/vaadin/client/WidgetUtil*,
-                                        com/vaadin/client/ui/FocusUtil*,
-                                        com/vaadin/client/data/**,
-                                        com/vaadin/client/widget/**,
-                                        com/vaadin/client/Focusable*,
-                                        com/vaadin/client/widgets/**,
-                                        com/vaadin/client/renderers/**,
-                                        com/vaadin/client/ui/SubPartAware*,
-                                        com/vaadin/client/ui/VProgressBar*,
-                                        com/vaadin/client/ui/dd/DragAndDropHandler*,
-                                        com/vaadin/client/ui/dd/DragHandle*,
-                                        com/vaadin/client/VSchedulerImpl*
-                                    </includes>
-                                </artifactItem>
-
-                                <artifactItem>
-                                    <groupId>com.vaadin</groupId>
-                                    <artifactId>vaadin-shared</artifactId>
-                                    <includes>
-                                        com/vaadin/shared/ui/grid/*.*,
-                                        com/vaadin/shared/ui/grid/**/*.*,
-                                        com/vaadin/shared/util/SharedUtil*,
-                                        com/vaadin/shared/Registration*,
-                                        com/vaadin/shared/VBrowserDetails*,
-                                        com/vaadin/shared/data/sort/SortDirection*
-                                    </includes>
-                                    <excludes>
-                                        com/vaadin/shared/**/*Rpc.*,
-                                        com/vaadin/shared/**/*Rpc$*.*,
-                                        com/vaadin/shared/**/*State.*,
-                                        com/vaadin/shared/**/*State$*.*
-                                    </excludes>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>com.vaadin</groupId>
-                                    <artifactId>vaadin-client-compiler</artifactId>
-                                    <includes>
-                                        com/vaadin/sass/linker/*.*
-                                    </includes>
-                                </artifactItem>
-
-                                <artifactItem>
-                                    <groupId>com.vaadin</groupId>
-                                    <artifactId>vaadin-themes</artifactId>
-                                    <includes>
-                                        /VAADIN/themes/valo/**,
-                                        /VAADIN/themes/base/**
-                                    </includes>
-                                    <outputDirectory>${project.build.directory}/themes</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <!-- Copy .java files to package -->
-                    <execution>
-                        <id>copy-sources</id>
-                        <!-- here the phase you need -->
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.outputDirectory}</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/java</directory>
-                                    <filtering>false</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-themes</id>
-                        <!-- here the phase you need -->
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.outputDirectory}/com/vaadin/themes/public</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${project.build.directory}/themes/VAADIN/themes</directory>
-                                    <filtering>false</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>checkstyle</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-export-package</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <classpathScope>compile</classpathScope>
-                            <executable>${java.home}/bin/java</executable>
-                            <arguments>
-                                <argument>-Dvaadin.version=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</argument>
-                                <argument>-DincludeNumberPackages=1</argument>
-
-                                <argument>-classpath</argument>
-                                <classpath />
-
-                                <argument>com.vaadin.buildhelpers.GeneratePackageExports</argument>
-
-                                <argument>${project.build.directory}/${project.build.finalName}.${project.packaging}
-                                </argument>
-                                <argument>com/vaadin</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.6</version>
-                <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>
diff --git a/widgets/src/main/java/com/vaadin/themes/valoutil/BodyStyleName.java b/widgets/src/main/java/com/vaadin/themes/valoutil/BodyStyleName.java
deleted file mode 100644
index a60573cf26..0000000000
--- a/widgets/src/main/java/com/vaadin/themes/valoutil/BodyStyleName.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2000-2016 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.themes.valoutil;
-
-import com.google.gwt.core.client.EntryPoint;
-import com.google.gwt.dom.client.Document;
-
-public class BodyStyleName implements EntryPoint {
-
-    @Override
-    public void onModuleLoad() {
-        Document.get().getBody().addClassName("valo");
-    }
-
-}
diff --git a/widgets/src/main/resources/com/vaadin/themes/Valo.gwt.xml b/widgets/src/main/resources/com/vaadin/themes/Valo.gwt.xml
deleted file mode 100644
index d9e0f6ab73..0000000000
--- a/widgets/src/main/resources/com/vaadin/themes/Valo.gwt.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN"
-  "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
-<module>
-    <entry-point class='com.vaadin.themes.valoutil.BodyStyleName' />
-    <source path='valoutil' />
-    <public path="public" />
-    <stylesheet src="valo/styles.css" />
-</module>