Adds JARs from App Engine SDK 1.7.7

Q42 · Apr 9, 2013 · c00ea47 · c00ea47
1 parent 0b53d95
commit c00ea47
Show file tree

Hide file tree

Showing 39 changed files with 15 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,5 @@ samples-and-tests/lists-with-gae/true
 *.iml
 
 play-framework
+manifest
+out
diff --git a/lib/appengine-agent.jar b/lib/appengine-agent.jar
diff --git a/lib/appengine-agentimpl.jar b/lib/appengine-agentimpl.jar
diff --git a/lib/appengine-agentruntime.jar b/lib/appengine-agentruntime.jar
diff --git a/lib/appengine-api-1.0-sdk-1.7.7.jar b/lib/appengine-api-1.0-sdk-1.7.7.jar
diff --git a/lib/appengine-api-labs-1.7.7.jar b/lib/appengine-api-labs-1.7.7.jar
diff --git a/lib/appengine-api-labs.jar b/lib/appengine-api-labs.jar
diff --git a/lib/appengine-api-stubs.jar b/lib/appengine-api-stubs.jar
diff --git a/lib/appengine-api.jar b/lib/appengine-api.jar
diff --git a/lib/appengine-dev-jdk-overrides.jar b/lib/appengine-dev-jdk-overrides.jar
diff --git a/lib/appengine-endpoints.jar b/lib/appengine-endpoints.jar
diff --git a/lib/appengine-jsr107cache-1.6.1.1.jar b/lib/appengine-jsr107cache-1.6.1.1.jar
diff --git a/lib/appengine-jsr107cache-1.7.7.jar b/lib/appengine-jsr107cache-1.7.7.jar
diff --git a/lib/appengine-local-endpoints.jar b/lib/appengine-local-endpoints.jar
diff --git a/lib/appengine-local-runtime-shared.jar b/lib/appengine-local-runtime-shared.jar
diff --git a/lib/appengine-local-runtime.jar b/lib/appengine-local-runtime.jar
diff --git a/lib/appengine-remote-api.jar b/lib/appengine-remote-api.jar
diff --git a/lib/appengine-testing.jar b/lib/appengine-testing.jar
diff --git a/lib/appengine-tools-api.jar b/lib/appengine-tools-api.jar
diff --git a/lib/asm-4.1.jar b/lib/asm-4.1.jar
diff --git a/lib/datanucleus-core-1.1.5.jar b/lib/datanucleus-core-1.1.5.jar
diff --git a/lib/datanucleus-enhancer-1.1.4.jar b/lib/datanucleus-enhancer-1.1.4.jar
diff --git a/lib/datanucleus-jpa-1.1.5.jar b/lib/datanucleus-jpa-1.1.5.jar
diff --git a/lib/el-api.jar b/lib/el-api.jar
diff --git a/lib/geronimo-jpa_3.0_spec-1.1.1.jar b/lib/geronimo-jpa_3.0_spec-1.1.1.jar
diff --git a/lib/google_sql.jar b/lib/google_sql.jar
diff --git a/lib/jdo2-api-2.3-eb.jar b/lib/jdo2-api-2.3-eb.jar
diff --git a/lib/jsp-api.jar b/lib/jsp-api.jar
diff --git a/lib/jta-1.1.jar b/lib/jta-1.1.jar
diff --git a/lib/repackaged-appengine-ant-1.7.1.jar b/lib/repackaged-appengine-ant-1.7.1.jar
diff --git a/lib/repackaged-appengine-ant-launcher-1.7.1.jar b/lib/repackaged-appengine-ant-launcher-1.7.1.jar
diff --git a/lib/repackaged-appengine-jakarta-jstl-1.1.2.jar b/lib/repackaged-appengine-jakarta-jstl-1.1.2.jar
diff --git a/lib/repackaged-appengine-jakarta-standard-1.1.2.jar b/lib/repackaged-appengine-jakarta-standard-1.1.2.jar
diff --git a/lib/repackaged-appengine-jasper-6.0.29.jar b/lib/repackaged-appengine-jasper-6.0.29.jar
diff --git a/lib/repackaged-appengine-jasper-el-6.0.29.jar b/lib/repackaged-appengine-jasper-el-6.0.29.jar
diff --git a/lib/repackaged-appengine-jasper-jdt-6.0.29.jar b/lib/repackaged-appengine-jasper-jdt-6.0.29.jar
diff --git a/lib/repackaged-appengine-tomcat-juli-6.0.29.jar b/lib/repackaged-appengine-tomcat-juli-6.0.29.jar
diff --git a/lib/servlet-api.jar b/lib/servlet-api.jar
diff --git a/src/play/modules/gae/PlayDevEnvironment.java b/src/play/modules/gae/PlayDevEnvironment.java
@@ -1,11 +1,7 @@
 package play.modules.gae;
 
-import com.google.appengine.tools.development.ApiProxyLocal;
-import com.google.appengine.tools.development.ApiProxyLocalFactory;
-import com.google.appengine.tools.development.LocalServerEnvironment;
-//import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
-//import com.google.appengine.tools.development.testing.LocalTaskQueueTestConfig;
 import com.google.appengine.api.datastore.dev.LocalDatastoreService;
+import com.google.appengine.tools.development.*;
 import com.google.apphosting.api.ApiProxy;
 import com.google.apphosting.api.ApiProxy.Environment;
 import play.Play;
@@ -14,9 +10,13 @@
 import play.server.Server;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
+//import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
+//import com.google.appengine.tools.development.testing.LocalTaskQueueTestConfig;
+
 public class PlayDevEnvironment implements Environment, LocalServerEnvironment {
 
     public static PlayDevEnvironment create() {
@@ -97,7 +97,10 @@ public void setDefaultNamespace(String ns) {
 
     @Override
     public Map<String, Object> getAttributes() {
-        return new HashMap<String, Object>();
+        HashMap<String, Object> hashMap = new HashMap<String, Object>();
+      hashMap.put(LocalEnvironment.REQUEST_END_LISTENERS, new ArrayList<RequestEndListener>());
+
+      return hashMap;
     }
 
     @Override
@@ -151,6 +154,9 @@ protected static String getBaseUrl() {
         }
     }
 
-
+    @Override
+    public long getRemainingMillis() {
+        return 60000;
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,3 +23,5 @@ samples-and-tests/lists-with-gae/true @@
     *.iml
     play-framework
+    manifest
+    out