Skip to content

Commit

Permalink
Remove Google App Engine support, tests and documentation (#8034)
Browse files Browse the repository at this point in the history
* Remove Google App Engine support and tests

Fixes #8033
  • Loading branch information
pleku committed Dec 20, 2016
1 parent 912c868 commit 1407b8d
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 188 deletions.
7 changes: 7 additions & 0 deletions compatibility-server/pom.xml
Expand Up @@ -55,6 +55,13 @@
<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>
Expand Down
Expand Up @@ -102,7 +102,10 @@
* <li/>The application remains locked while uploading - no progressbar is
* possible.
* </ul>
*
* @deprecated No longer supported with Vaadin 8.0
*/
@Deprecated
public class GAEVaadinServlet extends VaadinServlet {

// memcache mutex is MUTEX_BASE + sessio id
Expand Down Expand Up @@ -257,7 +260,7 @@ protected void service(HttpServletRequest unwrappedRequest,

String id = AC_BASE + session.getId();
Date expire = new Date(
started + (getMaxInactiveIntervalSeconds(session) * 1000));
started + getMaxInactiveIntervalSeconds(session) * 1000);
Expiration expires = Expiration.onDate(expire);

memcache.put(id, bytes, expires);
Expand Down
Expand Up @@ -26,8 +26,8 @@
import java.util.logging.Logger;

import com.vaadin.shared.util.SharedUtil;
import com.vaadin.util.SerializerHelper;
import com.vaadin.v7.data.Property;
import com.vaadin.v7.util.SerializerHelper;

/**
* <p>
Expand Down
Expand Up @@ -21,8 +21,8 @@
import java.util.logging.Logger;

import com.vaadin.util.ReflectTools;
import com.vaadin.util.SerializerHelper;
import com.vaadin.v7.data.Property;
import com.vaadin.v7.util.SerializerHelper;

/**
* Property descriptor that is able to create simple {@link MethodProperty}
Expand Down
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package com.vaadin.util;
package com.vaadin.v7.util;

import java.io.IOException;
import java.io.ObjectInputStream;
Expand All @@ -25,7 +25,9 @@
* should not be used by application developers. Subject to change at any time.
*
* @since 6.0
* @deprecated Only used for compatibility-server
*/
@Deprecated
public class SerializerHelper {

/**
Expand Down Expand Up @@ -105,9 +107,9 @@ public static Class<?>[] readClassArray(ObjectInputStream in)
* List of primitive classes. Google App Engine has problems
* serializing/deserializing these (#3064).
*/
private static final Class<?>[] primitiveClasses = new Class<?>[] { byte.class,
short.class, int.class, long.class, float.class, double.class,
boolean.class, char.class };
private static final Class<?>[] primitiveClasses = new Class<?>[] {
byte.class, short.class, int.class, long.class, float.class,
double.class, boolean.class, char.class };

/**
* Resolves the class given by {@code className}.
Expand Down
7 changes: 0 additions & 7 deletions server/pom.xml
Expand Up @@ -39,13 +39,6 @@
<scope>provided</scope>
</dependency>

<!-- Google App Engine -->
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<scope>provided</scope>
</dependency>

<!-- Bean Validation API -->
<dependency>
<groupId>javax.validation</groupId>
Expand Down
17 changes: 8 additions & 9 deletions server/src/main/java/com/vaadin/server/VaadinServlet.java
Expand Up @@ -298,9 +298,9 @@ protected void servletInitialized() throws ServletException {
* Gets the currently used Vaadin servlet. The current servlet is
* automatically defined when initializing the servlet and when processing
* requests to the server (see {@link ThreadLocal}) and in
* {@link VaadinSession#access(Runnable)} and {@link UI#access(Runnable)}. In
* other cases, (e.g. from background threads), the current servlet is not
* automatically defined.
* {@link VaadinSession#access(Runnable)} and {@link UI#access(Runnable)}.
* In other cases, (e.g. from background threads), the current servlet is
* not automatically defined.
* <p>
* The current servlet is derived from the current service using
* {@link VaadinService#getCurrent()}
Expand Down Expand Up @@ -553,7 +553,7 @@ private boolean ensureCookiesEnabled(VaadinServletRequest request,
* if the writing failed due to input/output error.
*
* @deprecated As of 7.0. This method is retained only for backwards
* compatibility and for {@link GAEVaadinServlet}.
* compatibility and for GAEVaadinServlet.
*/
@Deprecated
protected void criticalNotification(VaadinServletRequest request,
Expand Down Expand Up @@ -778,7 +778,7 @@ private void serveStaticResourcesInVAADIN(String filename,
}
response.setHeader("Cache-Control", cacheControl);
response.setDateHeader("Expires",
System.currentTimeMillis() + (resourceCacheTime * 1000));
System.currentTimeMillis() + resourceCacheTime * 1000);

// Find the modification timestamp
long lastModifiedTime = 0;
Expand Down Expand Up @@ -1339,10 +1339,9 @@ protected URL getApplicationUrl(HttpServletRequest request)
throws MalformedURLException {
final URL reqURL = new URL((request.isSecure() ? "https://" : "http://")
+ request.getServerName()
+ ((request.isSecure() && request.getServerPort() == 443)
|| (!request.isSecure()
&& request.getServerPort() == 80) ? ""
: ":" + request.getServerPort())
+ (request.isSecure() && request.getServerPort() == 443
|| !request.isSecure() && request.getServerPort() == 80
? "" : ":" + request.getServerPort())
+ request.getRequestURI());
String servletPath = "";
if (request
Expand Down
3 changes: 0 additions & 3 deletions uitest/ivy.xml
Expand Up @@ -24,9 +24,6 @@
rev="1.0.0.GA" conf="build -> default,sources" />
<dependency org="org.hibernate" name="hibernate-validator"
rev="4.2.0.Final" conf="build -> default" />
<!-- Google App Engine -->
<dependency org="com.google.appengine" name="appengine-api-1.0-sdk"
rev="1.7.7" conf="build-provided -> default" />

<!-- LIBRARY DEPENDENCIES (compile time) -->
<!-- Project modules -->
Expand Down
6 changes: 0 additions & 6 deletions uitest/pom.xml
Expand Up @@ -42,12 +42,6 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
<!-- Google App Engine -->
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<scope>provided</scope>
</dependency>

<!-- jetty-servlets needed by ProxyTest, but not by jetty-runner -->
<!-- Jetty before vaadin-* on the classpath to make Eclipse use the
Expand Down
156 changes: 0 additions & 156 deletions uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java

This file was deleted.

0 comments on commit 1407b8d

Please sign in to comment.