Updated SPWebTest to AppEngine 1.9.6

Compiled Android Library against GWT 2.6.1 with appropriate changes to classpath inclusions
jcricket · Jun 23, 2014 · 1fb76ec · 1fb76ec
1 parent 061a686
commit 1fb76ec
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 8 deletions.
diff --git a/SPALibrary/SyncProxyAndroid-jardesc.jardesc b/SPALibrary/SyncProxyAndroid-jardesc.jardesc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="WINDOWS-1252" standalone="no"?>
 <jardesc>
-    <jar path="SyncProxyAndroid-0.4.2.jar"/>
+    <jar path="SyncProxyAndroid-0.4.3.jar"/>
     <options buildIfNeeded="true" compress="true" descriptionLocation="/SPALibrary/SyncProxyAndroid-jardesc.jardesc" exportErrors="false" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>
@@ -24,8 +24,8 @@
         <javaElement handleIdentifier="=SPALibrary/G-SP&lt;com.gdevelop.gwt.syncrpc{Utils.java"/>
         <javaElement handleIdentifier="=SPALibrary/GWT_USER&lt;com.google.gwt.core.client.impl{SerializableThrowable.java"/>
         <javaElement handleIdentifier="=SPALibrary/GWT_USER&lt;com.google.gwt.user.client.rpc.core.java.sql"/>
-        <javaElement handleIdentifier="=SPALibrary/GWT_USER&lt;com.google.gwt.user.client.rpc{RpcTokenExceptionHandler.java"/>
         <javaElement handleIdentifier="=SPALibrary/GWT_USER&lt;com.google.gwt.user.client.rpc{AsyncCallback.java"/>
+        <javaElement handleIdentifier="=SPALibrary/GWT_USER&lt;com.google.gwt.user.client.rpc{RpcTokenExceptionHandler.java"/>
         <javaElement handleIdentifier="=SPALibrary/GWT_USER&lt;com.google.gwt.user.server.rpc.impl"/>
         <javaElement handleIdentifier="=SPALibrary/GWT_USER&lt;com.google.gwt.typedarrays.shared{ArrayBuffer.java"/>
         <javaElement handleIdentifier="=SPALibrary/GWT_USER&lt;com.google.gwt.core.shared"/>

diff --git a/SPWebTest/.classpath b/SPWebTest/.classpath
@@ -6,7 +6,7 @@
 	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/AppEngineTesting"/>
-	<classpathentry excluding="**/CoreJavaTest.java" including="**/CoreJavaTest.java|**/CoreJavaTestService*|**/CustomFieldSerializerTestService*|**/CustomFieldSerializerTestSet*.java|**/CustomPluralsTest.java|**/EnumsTestService*|**/ExceptionsTestService*|**/InheritanceTestService*|**/InheritanceTestSet*.java|**/LogFilterServletContext.java|**/ManuallySerialized*.java|**/MixedSerializable.java|**/MixedSerializableEchoService*|**/ObjectGraphTestService*|**/RecursiveClassTestService*|**/RemoteServiceServletTestService*|**/RpcTestBase.java|**/SerializableGenericWrapperType.java|**/TypeChecked*Class.java|**/TypeCheckedObjectsTestService*|**/TypeCheckedObjectsTestSet*.java|**/TypeUncheckedGenericClass.java|**/UnicodeEscapingService*|**/ValidationClientGwtTestCase.java|**/ValueTypesTestService*|**/XsrfProtectionTest.java|**/XsrfTestService*|**/constraints/PatternValidatorGwtTest.java|**/junit/client/GwtTestCase.java|**/resources/client/CSSResourceTest.java|**/resources/client/NestedBundleTest.java|**/rpc/TestSet*.java|**/rpc/Type*FieldSerializer.java|**/server/JUnitHostImpl.java|**/server/rpc/AnnotatedRpcTokenTestServiceImpl.java|**/server/rpc/RpcTokenServiceImpl.java|**/user/**/Collections*.java|**/user/client/AsyncProxy*.java|**/user/client/rpc/AnnotatedRpcTokenTest*.java|**/user/client/rpc/MockXsrfTokenService*.java|**/user/client/rpc/RpcTokenTest*.java|**/user/server/rpc/MockXsrfTokenServiceImpl.java|**/user/server/rpc/RpcTokenAwareRemoteService.java" kind="src" path="GWT_USER_TESTS"/>
-	<classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER"/>
+	<classpathentry excluding="**/CoreJavaTest.java" including="**/CoreJavaTest.java|**/CoreJavaTestService*|**/CustomFieldSerializerTestService*|**/CustomFieldSerializerTestSet*.java|**/CustomPluralsTest.java|**/EnumsTestService*|**/ExceptionsTestService*|**/InheritanceTestService*|**/InheritanceTestSet*.java|**/LogFilterServletContext.java|**/ManuallySerialized*.java|**/MixedSerializable.java|**/MixedSerializableEchoService*|**/ObjectGraphTestService*|**/RecursiveClassTestService*|**/RemoteServiceServletTestService*|**/RpcTestBase.java|**/SerializableGenericWrapperType.java|**/TypeChecked*Class.java|**/TypeCheckedObjectsTestService*|**/TypeCheckedObjectsTestSet*.java|**/TypeUncheckedGenericClass.java|**/UnicodeEscapingService*|**/ValidationClientGwtTestCase.java|**/ValueTypesTestService*|**/XsrfProtectionTest.java|**/XsrfTestService*|**/constraints/PatternValidatorGwtTest.java|**/junit/client/GwtTestCase.java|**/resources/client/CSSResourceTest.java|**/resources/client/CustomDataResource.java|**/resources/client/CustomImageResource.java|**/resources/client/NestedBundleTest.java|**/resources/client/impl/Custom*ResourcePrototype.java|**/resources/rg/Custom*ResourceGenerator.java|**/rpc/TestSet*.java|**/rpc/Type*FieldSerializer.java|**/server/JUnitHostImpl.java|**/server/rpc/AnnotatedRpcTokenTestServiceImpl.java|**/server/rpc/RpcTokenServiceImpl.java|**/user/**/Collections*.java|**/user/client/AsyncProxy*.java|**/user/client/rpc/AnnotatedRpcTokenTest*.java|**/user/client/rpc/MockXsrfTokenService*.java|**/user/client/rpc/RpcTokenTest*.java|**/user/server/rpc/MockXsrfTokenServiceImpl.java|**/user/server/rpc/RpcTokenAwareRemoteService.java" kind="src" path="GWT_USER_TESTS"/>
+	<classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER/App Engine (3)"/>
 	<classpathentry kind="output" path="war/WEB-INF/classes"/>
 </classpath>
diff --git a/SPWebTest/.settings/SPAWebTest.launch b/SPWebTest/.settings/SPAWebTest.launch
@@ -20,5 +20,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-startupUrl SPAWebTest.html -war D:\SPWK\SPWebTest\war -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -codeServerPort 9997 -port 8888 -server com.google.appengine.tools.development.gwt.AppEngineLauncher com.gdevelop.gwt.syncrpc.spawebtest.SPAWebTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="SPWebTest"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:D:\Programs\eclipse\plugins\com.google.appengine.eclipse.sdkbundle_1.9.0\appengine-java-sdk-1.9.0\lib\agent\appengine-agent.jar -Ddatastore.default_high_rep_job_policy_unapplied_job_pct=50 -Xmx512m"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:D:\Programs\eclipse\plugins\com.google.appengine.eclipse.sdkbundle_1.9.6\appengine-java-sdk-1.9.6\lib\agent\appengine-agent.jar -Ddatastore.default_high_rep_job_policy_unapplied_job_pct=50 -Xmx512m"/>
 </launchConfiguration>
diff --git a/SPWebTest/.settings/com.google.appengine.eclipse.core.prefs b/SPWebTest/.settings/com.google.appengine.eclipse.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
-filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.9.0.jar|appengine-api-labs.jar|appengine-endpoints-deps.jar|appengine-endpoints.jar|appengine-jsr107cache-1.9.0.jar|jsr107cache-1.1.jar
+filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.9.6.jar|appengine-api-labs.jar|appengine-endpoints-deps.jar|appengine-endpoints.jar|appengine-jsr107cache-1.9.6.jar|jsr107cache-1.1.jar
 gaeDatanucleusEnabled=false
 gaeDatanucleusVersion=v2
 gaeHrdEnabled=true

diff --git a/...B-INF/lib/appengine-api-1.0-sdk-1.9.0.jar → ...B-INF/lib/appengine-api-1.0-sdk-1.9.6.jar b/...B-INF/lib/appengine-api-1.0-sdk-1.9.0.jar → ...B-INF/lib/appengine-api-1.0-sdk-1.9.6.jar
diff --git a/SPWebTest/war/WEB-INF/lib/appengine-api-labs.jar b/SPWebTest/war/WEB-INF/lib/appengine-api-labs.jar
diff --git a/SPWebTest/war/WEB-INF/lib/appengine-endpoints-deps.jar b/SPWebTest/war/WEB-INF/lib/appengine-endpoints-deps.jar
diff --git a/SPWebTest/war/WEB-INF/lib/appengine-endpoints.jar b/SPWebTest/war/WEB-INF/lib/appengine-endpoints.jar
diff --git a/...B-INF/lib/appengine-jsr107cache-1.9.0.jar → ...B-INF/lib/appengine-jsr107cache-1.9.6.jar b/...B-INF/lib/appengine-jsr107cache-1.9.0.jar → ...B-INF/lib/appengine-jsr107cache-1.9.6.jar
diff --git a/SPWebTest/war/WEB-INF/lib/gwt-servlet.jar b/SPWebTest/war/WEB-INF/lib/gwt-servlet.jar
diff --git a/gwt-syncproxy/.classpath b/gwt-syncproxy/.classpath
@@ -8,7 +8,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER"/>
+	<classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER/App Engine (3)"/>
 	<classpathentry kind="lib" path="GData/java/lib/gdata-client-1.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/gwt-syncproxy/.settings/com.google.appengine.eclipse.core.prefs b/gwt-syncproxy/.settings/com.google.appengine.eclipse.core.prefs
@@ -1,2 +1,2 @@
 eclipse.preferences.version=1
-filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.9.0.jar|appengine-api-labs.jar|appengine-endpoints-deps.jar|appengine-endpoints.jar|appengine-jsr107cache-1.9.0.jar|datanucleus-appengine-1.0.10.final.jar|datanucleus-core-1.1.5.jar|datanucleus-jpa-1.1.5.jar|geronimo-jpa_3.0_spec-1.1.1.jar|geronimo-jta_1.1_spec-1.1.1.jar|jdo2-api-2.3-eb.jar|jsr107cache-1.1.jar
+filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.9.6.jar|appengine-api-labs.jar|appengine-endpoints-deps.jar|appengine-endpoints.jar|appengine-jsr107cache-1.9.6.jar|datanucleus-appengine-1.0.10.final.jar|datanucleus-core-1.1.5.jar|datanucleus-jpa-1.1.5.jar|geronimo-jpa_3.0_spec-1.1.1.jar|geronimo-jta_1.1_spec-1.1.1.jar|jdo2-api-2.3-eb.jar|jsr107cache-1.1.jar