From e1b923f90623d7dcdbe355225a4049323dabacf7 Mon Sep 17 00:00:00 2001
From: Mirjan Merruko <mirjan@vaadin.com>
Date: Tue, 28 Mar 2017 21:25:21 +0300
Subject: [PATCH] Move GAEVaadinServlet to its own module

---
 compatibility-server-gae/pom.xml              | 60 +++++++++++++++++++
 .../com/vaadin/server/GAEVaadinServlet.java   |  0
 compatibility-server/bnd.bnd                  |  1 -
 compatibility-server/pom.xml                  |  7 ---
 pom.xml                                       |  5 ++
 scripts/GenerateBuildTestAndStagingReport.py  |  3 +-
 6 files changed, 67 insertions(+), 9 deletions(-)
 create mode 100644 compatibility-server-gae/pom.xml
 rename {compatibility-server => compatibility-server-gae}/src/main/java/com/vaadin/server/GAEVaadinServlet.java (100%)

diff --git a/compatibility-server-gae/pom.xml b/compatibility-server-gae/pom.xml
new file mode 100644
index 0000000000..55b64d1013
--- /dev/null
+++ b/compatibility-server-gae/pom.xml
@@ -0,0 +1,60 @@
+<?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-compatibility-server-gae</artifactId>
+    <name>vaadin-compatibility-server-gae</name>
+    <packaging>jar</packaging>
+
+    <url>https://vaadin.com/</url>
+    <description>Vaadin 7 GAE Servlet</description>
+
+    <properties>
+        <sonar.skip>true</sonar.skip>
+    </properties>
+    <dependencies>
+        <!-- Project modules -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>vaadin-server</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- Google App Engine -->
+        <dependency>
+            <groupId>com.google.appengine</groupId>
+            <artifactId>appengine-api-1.0-sdk</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <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.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/compatibility-server/src/main/java/com/vaadin/server/GAEVaadinServlet.java b/compatibility-server-gae/src/main/java/com/vaadin/server/GAEVaadinServlet.java
similarity index 100%
rename from compatibility-server/src/main/java/com/vaadin/server/GAEVaadinServlet.java
rename to compatibility-server-gae/src/main/java/com/vaadin/server/GAEVaadinServlet.java
diff --git a/compatibility-server/bnd.bnd b/compatibility-server/bnd.bnd
index 11ea914dcc..98aae5e56f 100644
--- a/compatibility-server/bnd.bnd
+++ b/compatibility-server/bnd.bnd
@@ -1,7 +1,6 @@
 Bundle-SymbolicName: ${project.groupId}.compatibility.server
 Bundle-Name: Vaadin Compatibility Server
 Import-Package: com.vaadin*;version="[${osgi.bundle.version},${osgi.bundle.version}]",\
-    !com.google*,\
     org.osgi*,\
     javax.validation*;resolution:=optional;version='${javax.validation.version}',\
     *
diff --git a/compatibility-server/pom.xml b/compatibility-server/pom.xml
index ed3468a9a2..ab5ae30d80 100644
--- a/compatibility-server/pom.xml
+++ b/compatibility-server/pom.xml
@@ -59,13 +59,6 @@
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
-
-        <!-- Google App Engine -->
-        <dependency>
-            <groupId>com.google.appengine</groupId>
-            <artifactId>appengine-api-1.0-sdk</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/pom.xml b/pom.xml
index a26d7b0801..79577d2539 100644
--- a/pom.xml
+++ b/pom.xml
@@ -620,6 +620,7 @@
                 <module>liferay</module>
                 <module>all</module>
                 <module>compatibility-server</module>
+                <module>compatibility-server-gae</module>
                 <module>compatibility-client</module>
                 <module>compatibility-client-compiled</module>
                 <module>compatibility-shared</module>
@@ -662,6 +663,7 @@
                 <module>client-compiled</module>
                 <module>themes</module>
                 <module>compatibility-server</module>
+                <module>compatibility-server-gae</module>
                 <module>compatibility-client</module>
                 <module>compatibility-client-compiled</module>
                 <module>compatibility-shared</module>
@@ -726,6 +728,7 @@
                 <module>client-compiled</module>
                 <module>themes</module>
                 <module>compatibility-server</module>
+                <module>compatibility-server-gae</module>
                 <module>compatibility-client</module>
                 <module>compatibility-client-compiled</module>
                 <module>compatibility-shared</module>
@@ -790,6 +793,7 @@
                 <module>client-compiled</module>
                 <module>themes</module>
                 <module>compatibility-server</module>
+                <module>compatibility-server-gae</module>
                 <module>compatibility-client</module>
                 <module>compatibility-client-compiled</module>
                 <module>compatibility-shared</module>
@@ -848,6 +852,7 @@
                 <module>push</module>
                 <module>client</module>
                 <module>compatibility-server</module>
+                <module>compatibility-server-gae</module>
                 <module>compatibility-client</module>
                 <module>client-compiler</module>
                 <module>shared</module>
diff --git a/scripts/GenerateBuildTestAndStagingReport.py b/scripts/GenerateBuildTestAndStagingReport.py
index 94e5edc3a7..5aeb7f3f98 100644
--- a/scripts/GenerateBuildTestAndStagingReport.py
+++ b/scripts/GenerateBuildTestAndStagingReport.py
@@ -71,6 +71,7 @@ def getApiDiffHtml():
         "client", "client-compiler",
         "compatibility-client",
         "compatibility-server",
+        "compatibility-server-gae",
         "compatibility-shared",
         "server", "shared"
     ]
@@ -121,7 +122,7 @@ def completeArtifactNames(artifactIds, version):
     return list(map(lambda x: completeArtifactName(x, version), artifactIds))
 
 
-allowedArtifacts = completeArtifactNames([ 'vaadin-maven-plugin', 'vaadin-archetypes', 'vaadin-archetype-application', 'vaadin-archetype-application-multimodule', 'vaadin-archetype-application-example', 'vaadin-archetype-widget', 'vaadin-archetype-liferay-portlet', 'vaadin-root', 'vaadin-shared', 'vaadin-server', 'vaadin-client', 'vaadin-client-compiler', 'vaadin-client-compiled', 'vaadin-push', 'vaadin-themes', 'vaadin-compatibility-shared', 'vaadin-compatibility-server', 'vaadin-compatibility-client', 'vaadin-compatibility-client-compiled', 'vaadin-compatibility-themes', 'vaadin-testbench-api', 'vaadin-bom' ], args.version)
+allowedArtifacts = completeArtifactNames([ 'vaadin-maven-plugin', 'vaadin-archetypes', 'vaadin-archetype-application', 'vaadin-archetype-application-multimodule', 'vaadin-archetype-application-example', 'vaadin-archetype-widget', 'vaadin-archetype-liferay-portlet', 'vaadin-root', 'vaadin-shared', 'vaadin-server', 'vaadin-client', 'vaadin-client-compiler', 'vaadin-client-compiled', 'vaadin-push', 'vaadin-themes', 'vaadin-compatibility-shared', 'vaadin-compatibility-server', "vaadin-compatibility-server-gae", 'vaadin-compatibility-client', 'vaadin-compatibility-client-compiled', 'vaadin-compatibility-themes', 'vaadin-testbench-api', 'vaadin-bom' ], args.version)
 
 content = "<html><head></head><body><table>"
 traffic_light = "<svg width=\"20px\" height=\"20px\" style=\"padding-right:5px\"><circle cx=\"10\" cy=\"10\" r=\"10\" fill=\"{color}\"/></svg>"
-- 
2.39.5