Skip to content

Commit

Permalink
Compiled against GWT 2.6.0 and updated GAE framework to 1.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
[email protected] committed Mar 11, 2014
1 parent 10913c4 commit 061a686
Show file tree
Hide file tree
Showing 24 changed files with 783 additions and 69 deletions.
2 changes: 1 addition & 1 deletion SPAAppTest/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER/GWT 2.5.1"/>
<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
4 changes: 2 additions & 2 deletions SPAAppTest/tests/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<classpathentry combineaccessrules="false" kind="src" path="/SPAAppTest"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry including="**/CoreJavaTest.java|**/CoreJavaTestService*|**/CustomFieldSerializerTestService*|**/CustomFieldSerializerTestSet*.java|**/EnumsTestService*|**/ExceptionsTestService*|**/InheritanceTestService*|**/InheritanceTestSet*.java|**/LogFilterServletContext.java|**/ManuallySerialized*.java|**/MixedSerializable.java|**/MixedSerializableEchoService*|**/ObjectGraphTestService*|**/RecursiveClassTestService*|**/RemoteServiceServletTestService*|**/RpcTestBase.java|**/SerializableGenericWrapperType.java|**/Type*_*CustomFieldSerializer.java|**/TypeChecked*Class.java|**/TypeCheckedObjectsTestService*|**/TypeCheckedObjectsTestSet*.java|**/TypeUncheckedGenericClass.java|**/UnicodeEscapingService*|**/ValidationClientGwtTestCase.java|**/ValueTypesTestService*|**/XsrfTestService*|**/constraints/PatternValidatorGwtTest.java|**/junit/client/GwtTestCase.java|**/rpc/TestSet*.java|**/user/**/Collections*.java|**/user/client/AsyncProxy*.java|**/user/client/rpc/AnnotatedRpcTokenTest*.java|**/user/client/rpc/MockXsrfTokenService*.java|**/user/client/rpc/RpcTokenTestService*.java|**/user/server/rpc/MockXsrfTokenServiceImpl.java" kind="src" path="GWT_USER_TESTS"/>
<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER/GWT 2.5.1"/>
<classpathentry excluding="com/google/gwt/user/server/rpc/LogFilterServletContext.java" including="**/CoreJavaTest.java|**/CoreJavaTestService*|**/CustomFieldSerializerTestService*|**/CustomFieldSerializerTestSet*.java|**/EnumsTestService*|**/ExceptionsTestService*|**/InheritanceTestService*|**/InheritanceTestSet*.java|**/LogFilterServletContext.java|**/ManuallySerialized*.java|**/MixedSerializable.java|**/MixedSerializableEchoService*|**/ObjectGraphTestService*|**/RecursiveClassTestService*|**/RemoteServiceServletTestService*|**/RpcTestBase.java|**/SerializableGenericWrapperType.java|**/Type*_*CustomFieldSerializer.java|**/TypeChecked*Class.java|**/TypeCheckedObjectsTestService*|**/TypeCheckedObjectsTestSet*.java|**/TypeUncheckedGenericClass.java|**/UnicodeEscapingService*|**/ValidationClientGwtTestCase.java|**/ValueTypesTestService*|**/XsrfTestService*|**/constraints/PatternValidatorGwtTest.java|**/junit/client/GwtTestCase.java|**/rpc/TestSet*.java|**/user/**/Collections*.java|**/user/client/AsyncProxy*.java|**/user/client/rpc/AnnotatedRpcTokenTest*.java|**/user/client/rpc/MockXsrfTokenService*.java|**/user/client/rpc/RpcTokenTestService*.java|**/user/server/rpc/MockXsrfTokenServiceImpl.java" kind="src" path="GWT_USER_TESTS"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
2 changes: 1 addition & 1 deletion SPAAppTest/tests/.settings/SPATests.launch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<stringAttribute key="com.android.ide.eclipse.adt.instrumentation" value="android.test.InstrumentationTestRunner"/>
<booleanAttribute key="com.android.ide.eclipse.adt.nobootanim" value="false"/>
<intAttribute key="com.android.ide.eclipse.adt.speed" value="0"/>
<stringAttribute key="com.android.ide.eclipse.adt.target" value="MANUAL"/>
<stringAttribute key="com.android.ide.eclipse.adt.target" value="ALL_DEVICES_AND_EMULATORS"/>
<stringAttribute key="com.android.ide.eclipse.adt.testSize" value="All Tests"/>
<booleanAttribute key="com.android.ide.eclipse.adt.wipedata" value="false"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,261 @@
package com.google.gwt.user.server.rpc;
/*
* Copyright 2008 Google Inc.
*
* 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.
*
* Modified March 2014 for SPALibrary to remove support for JEE 6 Servlet requirements since GAE servlet-api doesn't have that yet
*/


import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Enumeration;
import java.util.EventListener;
import java.util.Map;
import java.util.Set;

import javax.servlet.Filter;
import javax.servlet.FilterRegistration;
import javax.servlet.FilterRegistration.Dynamic;
import javax.servlet.RequestDispatcher;
import javax.servlet.Servlet;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRegistration;
import javax.servlet.SessionCookieConfig;
import javax.servlet.SessionTrackingMode;
import javax.servlet.descriptor.JspConfigDescriptor;

@SuppressWarnings(value = {"deprecation", "unchecked"})
abstract class LogFilterServletContext implements ServletContext {
private final ServletContext realContext;

public LogFilterServletContext(ServletContext realContext) {
this.realContext = realContext;
}

public Object getAttribute(String name) {
return realContext.getAttribute(name);
}

public Enumeration getAttributeNames() {
return realContext.getAttributeNames();
}

public ServletContext getContext(String uripath) {
return realContext.getContext(uripath);
}

public String getContextPath() {
return realContext.getContextPath();
}

public String getInitParameter(String name) {
return realContext.getInitParameter(name);
}

public Enumeration getInitParameterNames() {
return realContext.getInitParameterNames();
}

public int getMajorVersion() {
return realContext.getMajorVersion();
}

public String getMimeType(String file) {
return realContext.getMimeType(file);
}

public int getMinorVersion() {
return realContext.getMinorVersion();
}

public RequestDispatcher getNamedDispatcher(String name) {
return realContext.getNamedDispatcher(name);
}

public String getRealPath(String path) {
return realContext.getRealPath(path);
}

public RequestDispatcher getRequestDispatcher(String path) {
return realContext.getRequestDispatcher(path);
}

public URL getResource(String path) throws MalformedURLException {
return realContext.getResource(path);
}

public InputStream getResourceAsStream(String path) {
return realContext.getResourceAsStream(path);
}

public Set getResourcePaths(String path) {
return realContext.getResourcePaths(path);
}

public String getServerInfo() {
return realContext.getServerInfo();
}

public Servlet getServlet(String name) throws ServletException {
return realContext.getServlet(name);
}

public String getServletContextName() {
return realContext.getServletContextName();
}

public Enumeration getServletNames() {
return realContext.getServletNames();
}

public Enumeration getServlets() {
return realContext.getServlets();
}

public void log(Exception exception, String msg) {
if (shouldLog(exception, msg)) {
realContext.log(exception, msg);
}
}

public void log(String msg) {
if (shouldLog(null, msg)) {
realContext.log(msg);
}
}

public void log(String msg, Throwable throwable) {
if (shouldLog(throwable, msg)) {
realContext.log(msg, throwable);
}
}

public void removeAttribute(String name) {
realContext.removeAttribute(name);
}

public void setAttribute(String name, Object object) {
realContext.setAttribute(name, object);
}
/*
public Dynamic addFilter(String arg0, Class<? extends Filter> arg1) {
return realContext.addFilter(arg0, arg1);
}
public Dynamic addFilter(String arg0, Filter arg1) {
return realContext.addFilter(arg0, arg1);
}
public Dynamic addFilter(String arg0, String arg1) {
return realContext.addFilter(arg0, arg1);
}
public void addListener(Class<? extends EventListener> arg0) {
realContext.addListener(arg0);
}
public void addListener(String arg0) {
realContext.addListener(arg0);
}
public <T extends EventListener> void addListener(T arg0) {
realContext.addListener(arg0);
}
public javax.servlet.ServletRegistration.Dynamic addServlet(
String arg0, Class<? extends Servlet> arg1) {
return realContext.addServlet(arg0, arg1);
}
public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0, Servlet arg1) {
return realContext.addServlet(arg0, arg1);
}
public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0, String arg1) {
return realContext.addServlet(arg0, arg1);
}
public <T extends Filter> T createFilter(Class<T> arg0) throws ServletException {
return realContext.createFilter(arg0);
}
public <T extends EventListener> T createListener(Class<T> arg0) throws ServletException {
return realContext.createListener(arg0);
}
public <T extends Servlet> T createServlet(Class<T> arg0) throws ServletException {
return realContext.createServlet(arg0);
}
public void declareRoles(String... arg0) {
realContext.declareRoles(arg0);
}
public ClassLoader getClassLoader() {
return realContext.getClassLoader();
}
public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
return realContext.getDefaultSessionTrackingModes();
}
public int getEffectiveMajorVersion() {
return realContext.getEffectiveMajorVersion();
}
public int getEffectiveMinorVersion() {
return realContext.getEffectiveMinorVersion();
}
public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
return realContext.getEffectiveSessionTrackingModes();
}
public FilterRegistration getFilterRegistration(String arg0) {
return realContext.getFilterRegistration(arg0);
}
public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
return realContext.getFilterRegistrations();
}
public JspConfigDescriptor getJspConfigDescriptor() {
return realContext.getJspConfigDescriptor();
}
public ServletRegistration getServletRegistration(String arg0) {
return realContext.getServletRegistration(arg0);
}
public Map<String, ? extends ServletRegistration> getServletRegistrations() {
return realContext.getServletRegistrations();
}
public SessionCookieConfig getSessionCookieConfig() {
return realContext.getSessionCookieConfig();
}
public boolean setInitParameter(String arg0, String arg1) {
return realContext.setInitParameter(arg0, arg1);
}
public void setSessionTrackingModes(Set<SessionTrackingMode> arg0) {
realContext.setSessionTrackingModes(arg0);
}
*/
protected abstract boolean shouldLog(Throwable t, String msg);
}
2 changes: 1 addition & 1 deletion SPALibrary/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry excluding="**/package-info.java" including="**/core/client/Duration.java|**/core/client/GWT.java|**/core/client/JavaScriptObject.java|**/core/client/RunAsyncCallback.java|**/core/client/impl/SerializableThrowable.java|**/core/shared/GWT.java|**/gwt/event/shared/UmbrellaException.java|**/http/client/Header.java|**/http/client/Request.java|**/http/client/RequestBuilder.java|**/http/client/RequestCallback.java|**/http/client/RequestException.java|**/http/client/RequestPermissionException.java|**/http/client/RequestTimeoutException.java|**/http/client/Response.java|**/http/client/ResponseImpl.java|**/http/client/StringValidator.java|**/typedarrays/shared/ArrayBuffer.java|**/user/client/rpc/AsyncCallback.java|**/user/client/rpc/CustomFieldSerializer.java|**/user/client/rpc/GwtTransient.java|**/user/client/rpc/HasRpcToken.java|**/user/client/rpc/IncompatibleRemoteServiceException.java|**/user/client/rpc/InvocationException.java|**/user/client/rpc/IsSerializable.java|**/user/client/rpc/RemoteService.java|**/user/client/rpc/RemoteServiceRelativePath.java|**/user/client/rpc/RpcRequestBuilder.java|**/user/client/rpc/RpcToken.java|**/user/client/rpc/RpcTokenException.java|**/user/client/rpc/RpcTokenExceptionHandler.java|**/user/client/rpc/SerializationException.java|**/user/client/rpc/SerializationStreamFactory.java|**/user/client/rpc/SerializationStreamReader.java|**/user/client/rpc/SerializationStreamWriter.java|**/user/client/rpc/SerializedTypeViolationException.java|**/user/client/rpc/ServiceDefTarget.java|**/user/client/rpc/StatusCodeException.java|**/user/client/rpc/impl/AbstractSerializationStream.java|**/user/client/rpc/impl/AbstractSerializationStreamReader.java|**/user/client/rpc/impl/AbstractSerializationStreamWriter.java|**/user/client/rpc/impl/RpcStatsContext.java|**/user/client/rpc/impl/Serializer.java|**/user/server/Base64Utils.java|**/user/server/rpc/AbstractRemoteServiceServlet.java|**/user/server/rpc/RPC.java|**/user/server/rpc/RPCRequest.java|**/user/server/rpc/RPCServletUtils.java|**/user/server/rpc/SerializationPolicy.java|**/user/server/rpc/SerializationPolicyProvider.java|**/user/server/rpc/ServerCustomFieldSerializer.java|**/user/server/rpc/UnexpectedException.java|**/user/server/rpc/impl/CharVector.java|**/user/server/rpc/impl/DequeMap.java|**/user/server/rpc/impl/LegacySerializationPolicy.java|**/user/server/rpc/impl/SerializabilityUtil.java|**/user/server/rpc/impl/SerializedInstanceReference.java|**/user/server/rpc/impl/ServerSerializationStreamReader.java|**/user/server/rpc/impl/ServerSerializationStreamWriter.java|**/user/server/rpc/impl/StandardSerializationPolicy.java|**/user/server/rpc/impl/TypeNameObfuscator.java|**/web/bindery/event/shared/UmbrellaException.java|**/xhr/client/*.java|com/google/gwt/user/client/rpc/core/java/**" kind="src" path="GWT_USER"/>
<classpathentry excluding="**/package-info.java|com/google/gwt/core/client/GWT.java|com/google/gwt/core/client/impl/Impl.java|com/google/gwt/core/client/impl/StackTraceCreator.java|com/google/gwt/user/client/rpc/core/java/util/EnumMap_CustomFieldSerializer.java" including="**/core/client/Duration.java|**/core/client/GWT.java|**/core/client/JavaScriptObject.java|**/core/client/RunAsyncCallback.java|**/core/client/impl/Disposable.java|**/core/client/impl/Impl.java|**/core/client/impl/SerializableThrowable.java|**/core/client/impl/StackTraceCreator.java|**/core/client/impl/UnloadSupport.java|**/core/shared/GWT.java|**/core/shared/SerializableThrowable.java|**/core/shared/impl/JsLogger.java|**/core/shared/impl/ThrowableTypeResolver.java|**/gwt/event/shared/UmbrellaException.java|**/http/client/Header.java|**/http/client/Request.java|**/http/client/RequestBuilder.java|**/http/client/RequestCallback.java|**/http/client/RequestException.java|**/http/client/RequestPermissionException.java|**/http/client/RequestTimeoutException.java|**/http/client/Response.java|**/http/client/ResponseImpl.java|**/http/client/StringValidator.java|**/typedarrays/shared/ArrayBuffer.java|**/user/client/rpc/AsyncCallback.java|**/user/client/rpc/CustomFieldSerializer.java|**/user/client/rpc/GwtTransient.java|**/user/client/rpc/HasRpcToken.java|**/user/client/rpc/IncompatibleRemoteServiceException.java|**/user/client/rpc/InvocationException.java|**/user/client/rpc/IsSerializable.java|**/user/client/rpc/RemoteService.java|**/user/client/rpc/RemoteServiceRelativePath.java|**/user/client/rpc/RpcRequestBuilder.java|**/user/client/rpc/RpcToken.java|**/user/client/rpc/RpcTokenException.java|**/user/client/rpc/RpcTokenExceptionHandler.java|**/user/client/rpc/SerializationException.java|**/user/client/rpc/SerializationStreamFactory.java|**/user/client/rpc/SerializationStreamReader.java|**/user/client/rpc/SerializationStreamWriter.java|**/user/client/rpc/SerializedTypeViolationException.java|**/user/client/rpc/ServiceDefTarget.java|**/user/client/rpc/StatusCodeException.java|**/user/client/rpc/impl/AbstractSerializationStream.java|**/user/client/rpc/impl/AbstractSerializationStreamReader.java|**/user/client/rpc/impl/AbstractSerializationStreamWriter.java|**/user/client/rpc/impl/RpcStatsContext.java|**/user/client/rpc/impl/Serializer.java|**/user/server/Base64Utils.java|**/user/server/rpc/AbstractRemoteServiceServlet.java|**/user/server/rpc/RPC.java|**/user/server/rpc/RPCRequest.java|**/user/server/rpc/RPCServletUtils.java|**/user/server/rpc/SerializationPolicy.java|**/user/server/rpc/SerializationPolicyProvider.java|**/user/server/rpc/ServerCustomFieldSerializer.java|**/user/server/rpc/UnexpectedException.java|**/user/server/rpc/impl/CharVector.java|**/user/server/rpc/impl/DequeMap.java|**/user/server/rpc/impl/LegacySerializationPolicy.java|**/user/server/rpc/impl/SerializabilityUtil.java|**/user/server/rpc/impl/SerializedInstanceReference.java|**/user/server/rpc/impl/ServerSerializationStreamReader.java|**/user/server/rpc/impl/ServerSerializationStreamWriter.java|**/user/server/rpc/impl/StandardSerializationPolicy.java|**/user/server/rpc/impl/TypeNameObfuscator.java|**/web/bindery/event/shared/UmbrellaException.java|**/xhr/client/*.java|com/google/gwt/user/client/rpc/core/java/**" kind="src" path="GWT_USER"/>
<classpathentry excluding="**/LoginUtils.java|**/test/**" including="**/syncrpc/*" kind="src" path="G-SP"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
Expand Down
6 changes: 3 additions & 3 deletions SPALibrary/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gdevelop.gwt.syncrpc"
android:versionCode="1"
android:versionName="0.4" android:installLocation="internalOnly">
android:versionCode="2"
android:versionName="0.4.2" android:installLocation="internalOnly">

<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="17" />
android:targetSdkVersion="19" />

<application
android:allowBackup="true"
Expand Down
Loading

0 comments on commit 061a686

Please sign in to comment.