googleapis · vam-google · Apr 11, 2017 · Apr 10, 2017 · Apr 11, 2017 · Apr 11, 2017
diff --git a/google-cloud-core/src/main/java/com/google/cloud/HttpTransportOptions.java b/google-cloud-core/src/main/java/com/google/cloud/HttpTransportOptions.java
@@ -50,8 +50,9 @@ public static class DefaultHttpTransportFactory implements HttpTransportFactory
 
     @Override
     public HttpTransport create() {
-      // Consider App Engine
-      if (ServiceOptions.getAppEngineAppId() != null) {
+      // Consider App Engine Standard
+      if (System.getProperty("com.google.appengine.runtime.version") != null
+          && System.getenv("GAE_SERVICE") == null) {
         try {
           return new UrlFetchTransport();
         } catch (Exception ignore) {

diff --git a/testing/google-cloud-appengine-flex-compat/pom.xml b/testing/google-cloud-appengine-flex-compat/pom.xml
@@ -47,7 +47,7 @@
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <version>3.3</version>
+        <version>3.5.1</version>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>${java.source.version}</source>

diff --git a/testing/google-cloud-appengine-java8/pom.xml b/testing/google-cloud-appengine-java8/pom.xml
@@ -41,7 +41,7 @@
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <version>3.3</version>
+        <version>3.5.1</version>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>${java.source.version}</source>

diff --git a/testing/google-cloud-appengine-java8/src/main/webapp/WEB-INF/appengine-web.xml b/testing/google-cloud-appengine-java8/src/main/webapp/WEB-INF/appengine-web.xml
@@ -9,4 +9,8 @@
   <manual-scaling>
     <instances>1</instances>
   </manual-scaling>
+  <url-stream-handler>native</url-stream-handler>
+  <system-properties>
+    <property name="GOOGLE_CLOUD_PROJECT" value="GCLOUD_PROJECT_ID_HERE"/>
+  </system-properties>
 </appengine-web-app>
diff --git a/...loud/managed/test/GcjFlexTestServlet.java → ...cloud/managed/test/GaeGcjTestServlet.java b/...loud/managed/test/GcjFlexTestServlet.java → ...cloud/managed/test/GaeGcjTestServlet.java
@@ -28,8 +28,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-@WebServlet(name = "flex", value = "/test")
-public class GcjFlexTestServlet extends HttpServlet {
+@WebServlet(value = "/test")
+public class GaeGcjTestServlet extends HttpServlet {
 
   private static final long serialVersionUID = 523885428311420041L;
 
@@ -107,7 +107,6 @@ private String getTestOutput(HttpServletRequest req, HttpServletResponse resp) {
           + "'>"
           + link
           + "</a> to start a new test";
-
     }
   }
 

diff --git a/...google-cloud-managed-test/src/main/java/com/google/cloud/managed/test/GaeInfoServlet.java b/...google-cloud-managed-test/src/main/java/com/google/cloud/managed/test/GaeInfoServlet.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2017 Google Inc. All Rights Reserved.
+ *
+ * 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.
+ */
+package com.google.cloud.managed.test;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Map;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@WebServlet(value = "/info")
+public class GaeInfoServlet extends HttpServlet {
+
+  private static final long serialVersionUID = -3598229312089602597L;
+
+  @Override
+  protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+      throws ServletException, IOException {
+    resp.setContentType("text");
+    PrintWriter out = resp.getWriter();
+
+    ClassLoader cl = getClass().getClassLoader();
+    out.append("CLASS LOADER:\n\n");
+    out.append("Name: ").append(cl != null ? cl.getClass().getName() : null).append('\n');
+    if (cl instanceof URLClassLoader) {
+      URLClassLoader urlCl = (URLClassLoader) cl;
+      out.append("Urls: ").append('\n');
+      for (URL url : urlCl.getURLs()) {
+        out.append(url.toString()).append('\n');
+      }
+    }
+
+    out.append("\nENVIRONMENT VARIABLES:\n\n");
+    Map<String, String> envVars = System.getenv();
+    for (Map.Entry<String, String> entry : envVars.entrySet()) {
+      out.append(entry.getKey()).append("=").append(entry.getValue()).append('\n');
+    }
+
+    out.append("\n\nSYSTEM PROPERTIES:\n\n");
+    System.getProperties().list(out);
+
+    out.close();
+  }
+}
diff --git a/.../google-cloud-managed-test/src/main/java/com/google/cloud/managed/test/GcjTestRunner.java b/.../google-cloud-managed-test/src/main/java/com/google/cloud/managed/test/GcjTestRunner.java
@@ -43,7 +43,9 @@ public void run() {
       resultBytes.reset();
     }
     for (Class<?> clazz : classes) {
-      resultStream.append("\n").append("Running ").append(clazz.getName()).append("\n\n");
+      resultStream.append("\n").append("Running ").append(clazz.getName());
+      ClassLoader classLoader = clazz.getClassLoader();
+      resultStream.append(" (loaded by ").append(classLoader.getClass().getName()).append(")\n\n");
       unit.run(clazz);
     }