From c4f0a3b18e012ee9b91f105280a5b5e6b4928a8f Mon Sep 17 00:00:00 2001
From: Shun Fan <sfan@google.com>
Date: Wed, 20 Apr 2016 16:38:52 -0700
Subject: [PATCH 1/2] Add remote api sample

---
 appengine/remote/README.md                    | 26 +++++++
 appengine/remote/remote-client/pom.xml        | 78 +++++++++++++++++++
 .../appengine/remote/RemoteApiExample.java    | 50 ++++++++++++
 appengine/remote/remote-server/pom.xml        | 69 ++++++++++++++++
 .../appengine/remote/RemoteServlet.java       | 36 +++++++++
 .../src/main/webapp/WEB-INF/appengine-web.xml | 21 +++++
 .../src/main/webapp/WEB-INF/web.xml           | 39 ++++++++++
 pom.xml                                       |  4 +-
 8 files changed, 322 insertions(+), 1 deletion(-)
 create mode 100644 appengine/remote/README.md
 create mode 100644 appengine/remote/remote-client/pom.xml
 create mode 100644 appengine/remote/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java
 create mode 100644 appengine/remote/remote-server/pom.xml
 create mode 100644 appengine/remote/remote-server/src/main/java/com/example/appengine/remote/RemoteServlet.java
 create mode 100644 appengine/remote/remote-server/src/main/webapp/WEB-INF/appengine-web.xml
 create mode 100644 appengine/remote/remote-server/src/main/webapp/WEB-INF/web.xml

diff --git a/appengine/remote/README.md b/appengine/remote/README.md
new file mode 100644
index 00000000000..83c3ac9ce68
--- /dev/null
+++ b/appengine/remote/README.md
@@ -0,0 +1,26 @@
+# Google App Engine Standard Environment Remote API Sample
+
+This sample demonstrates how to access App Engine Standard Environment APIs remotely,
+using the [Remote API](https://cloud.google.com/appengine/docs/java/tools/remoteapi).
+
+## Set up the server component of Remote API 
+1. Navigate to the remote-server directory
+1. Update the `<application>` tag in `src/main/webapp/WEB-INF/appengine-web.xml`
+   with your project name.
+1. Update the `<version>` tag in `src/main/webapp/WEB-INF/appengine-web.xml`
+   with your version name.
+1. Deploy the app
+   `mvn appengine:update`
+1. Alternatively, run the app locally with
+   `mvn appengine:devserver`
+## Set up the client component of Remote API
+1. Navigate to the remote-client directory
+1. Update the SERVER_STRING constant with the deployed app name 
+   `src/main/java/com/example/appengine/remote/RemoteApiExample.java`
+   1. If you deployed the app, it should be "YOUR-APP-ID.appspot.com"
+   1. If you are running on the development server, it should be "localhost"
+1. Package the app as a jar
+   `mvn clean package`
+1. Excute the jar file
+   java -jar appengine-remote-client-1.0-SNAPSHOT-jar-with-dependencies.jar
+
diff --git a/appengine/remote/remote-client/pom.xml b/appengine/remote/remote-client/pom.xml
new file mode 100644
index 00000000000..6c1780730ac
--- /dev/null
+++ b/appengine/remote/remote-client/pom.xml
@@ -0,0 +1,78 @@
+<!--
+ Copyright 2016 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.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>jar</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <groupId>com.example.appengine</groupId>
+  <artifactId>appengine-remote-client</artifactId>
+
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>../../..</relativePath>
+  </parent>
+  <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
+  <dependencies>
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-remote-api</artifactId>
+      <version>${appengine.sdk.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-api-1.0-sdk</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <!-- for hot reload of the web application -->
+    <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
+    <plugins>
+      <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <archive>
+            <manifest>
+              <mainClass>com.example.appengine.remote.RemoteApiExample</mainClass>
+            </manifest>
+          </archive>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <version>3.3</version>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/appengine/remote/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java b/appengine/remote/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java
new file mode 100644
index 00000000000..9c717f26712
--- /dev/null
+++ b/appengine/remote/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright 2016 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.example.appengine.remote;
+
+import com.google.appengine.api.datastore.DatastoreService;
+import com.google.appengine.api.datastore.DatastoreServiceFactory;
+import com.google.appengine.api.datastore.Entity;
+import com.google.appengine.tools.remoteapi.RemoteApiInstaller;
+import com.google.appengine.tools.remoteapi.RemoteApiOptions;
+
+import java.io.IOException;
+
+// [START example]
+public class RemoteApiExample {
+  private static final String SERVER_STRING = "YOUR-APP-ID.appspot.com";
+
+  public static void main(String[] args) throws IOException {
+    RemoteApiOptions options;
+    if (SERVER_STRING.equals("localhost")) {
+      options = new RemoteApiOptions().server(SERVER_STRING,
+        8080).useDevelopmentServerCredential();
+    } else {
+      options = new RemoteApiOptions().server(SERVER_STRING,
+        443).useApplicationDefaultCredential();
+    }
+    RemoteApiInstaller installer = new RemoteApiInstaller();
+    installer.install(options);
+    try {
+      DatastoreService ds = DatastoreServiceFactory.getDatastoreService();
+      System.out.println("Key of new entity is " + ds.put(new Entity("Hello Remote API!")));
+    } finally {
+      installer.uninstall();
+    }
+  }
+}
+//[END example]
\ No newline at end of file
diff --git a/appengine/remote/remote-server/pom.xml b/appengine/remote/remote-server/pom.xml
new file mode 100644
index 00000000000..450e28e3285
--- /dev/null
+++ b/appengine/remote/remote-server/pom.xml
@@ -0,0 +1,69 @@
+<!--
+ Copyright 2016 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.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>war</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <groupId>com.example.appengine</groupId>
+  <artifactId>appengine-remote-server</artifactId>
+
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>../../..</relativePath>
+  </parent>
+  <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
+  <dependencies>
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-api-1.0-sdk</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
+      <type>jar</type>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <!-- for hot reload of the web application -->
+    <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
+    <plugins>
+      <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
+      <plugin>
+        <groupId>com.google.appengine</groupId>
+        <artifactId>appengine-maven-plugin</artifactId>
+        <version>${appengine.sdk.version}</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <version>3.3</version>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/appengine/remote/remote-server/src/main/java/com/example/appengine/remote/RemoteServlet.java b/appengine/remote/remote-server/src/main/java/com/example/appengine/remote/RemoteServlet.java
new file mode 100644
index 00000000000..45f910cddcc
--- /dev/null
+++ b/appengine/remote/remote-server/src/main/java/com/example/appengine/remote/RemoteServlet.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright 2016 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.example.appengine.remote;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+// [START example]
+@SuppressWarnings("serial")
+public class RemoteServlet extends HttpServlet {
+
+  @Override
+  public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+    PrintWriter out = resp.getWriter();
+    out.println("Hello, world");
+  }
+}
+// [END example]
diff --git a/appengine/remote/remote-server/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/remote/remote-server/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 00000000000..089c609c550
--- /dev/null
+++ b/appengine/remote/remote-server/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- [START_EXCLUDE] -->
+<!--
+  Copyright 2016 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.
+-->
+<!-- [END_EXCLUDE] -->
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>YOUR-PROJECT-ID</application>
+  <version>YOUR-VERSION-ID</version>
+  <threadsafe>true</threadsafe>
+</appengine-web-app>
+
diff --git a/appengine/remote/remote-server/src/main/webapp/WEB-INF/web.xml b/appengine/remote/remote-server/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 00000000000..6da6fe9bffa
--- /dev/null
+++ b/appengine/remote/remote-server/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- [START_EXCLUDE] -->
+<!--
+  Copyright 2016 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.
+-->
+<!-- [END_EXCLUDE] -->
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"
+  xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+  version="2.5">
+  <servlet>
+    <display-name>Remote API Servlet</display-name>
+    <servlet-name>RemoteApiServlet</servlet-name>
+    <servlet-class>com.google.apphosting.utils.remoteapi.RemoteApiServlet</servlet-class>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>RemoteApiServlet</servlet-name>
+    <url-pattern>/remote_api</url-pattern>
+  </servlet-mapping>
+  <servlet>
+    <servlet-name>remote</servlet-name>
+    <servlet-class>com.example.appengine.remote.RemoteServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>remote</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+</web-app>
+
diff --git a/pom.xml b/pom.xml
index 741e29e6b06..084aa542b65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <properties>
-        <appengine.sdk.version>1.9.34</appengine.sdk.version>
+        <appengine.sdk.version>1.9.36</appengine.sdk.version>
         <appengine.app.version>1</appengine.app.version>
         <project.http.version>1.19.0</project.http.version>
         <project.oauth.version>1.19.0</project.oauth.version>
@@ -51,6 +51,8 @@
         <module>appengine/memcache</module>
         <module>appengine/oauth2</module>
         <module>appengine/sendgrid</module>
+        <module>appengine/remote/remote-client</module>
+        <module>appengine/remote/remote-server</module>
         <module>appengine/static-files</module>
         <module>appengine/twilio</module>
         <module>appengine/urlfetch</module>

From 00409bc15ca5171346d08c8e79824dd036c344a1 Mon Sep 17 00:00:00 2001
From: Shun Fan <sfan@google.com>
Date: Thu, 21 Apr 2016 15:59:28 -0700
Subject: [PATCH 2/2] Allow users to input server name from command line for
 remote sample

---
 appengine/remote/README.md                           | 12 +++++-------
 appengine/remote/remote-client/pom.xml               |  9 ---------
 .../example/appengine/remote/RemoteApiExample.java   | 10 +++++-----
 appengine/remote/remote-server/pom.xml               |  9 ---------
 4 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/appengine/remote/README.md b/appengine/remote/README.md
index 83c3ac9ce68..ae17b8bbf9f 100644
--- a/appengine/remote/README.md
+++ b/appengine/remote/README.md
@@ -14,13 +14,11 @@ using the [Remote API](https://cloud.google.com/appengine/docs/java/tools/remote
 1. Alternatively, run the app locally with
    `mvn appengine:devserver`
 ## Set up the client component of Remote API
-1. Navigate to the remote-client directory
-1. Update the SERVER_STRING constant with the deployed app name 
-   `src/main/java/com/example/appengine/remote/RemoteApiExample.java`
-   1. If you deployed the app, it should be "YOUR-APP-ID.appspot.com"
-   1. If you are running on the development server, it should be "localhost"
 1. Package the app as a jar
    `mvn clean package`
-1. Excute the jar file
-   java -jar appengine-remote-client-1.0-SNAPSHOT-jar-with-dependencies.jar
+1. Navigate to the target directory
+1. Excute the jar file with the server connection string as the first argument
+   1. If you deployed the app, it should be "YOUR-APP-ID.appspot.com"
+   1. If you are running on the development server, it should be "localhost"
+   java -jar appengine-remote-client-1.0-SNAPSHOT-jar-with-dependencies.jar "YOUR-APP-NAME"
 
diff --git a/appengine/remote/remote-client/pom.xml b/appengine/remote/remote-client/pom.xml
index 6c1780730ac..7cc0db66a85 100644
--- a/appengine/remote/remote-client/pom.xml
+++ b/appengine/remote/remote-client/pom.xml
@@ -64,15 +64,6 @@
           </descriptorRefs>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <version>3.3</version>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/appengine/remote/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java b/appengine/remote/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java
index 9c717f26712..3a6c3b42b36 100644
--- a/appengine/remote/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java
+++ b/appengine/remote/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java
@@ -26,15 +26,15 @@
 
 // [START example]
 public class RemoteApiExample {
-  private static final String SERVER_STRING = "YOUR-APP-ID.appspot.com";
 
   public static void main(String[] args) throws IOException {
+    String serverString = args[0];
     RemoteApiOptions options;
-    if (SERVER_STRING.equals("localhost")) {
-      options = new RemoteApiOptions().server(SERVER_STRING,
+    if (serverString.equals("localhost")) {
+      options = new RemoteApiOptions().server(serverString,
         8080).useDevelopmentServerCredential();
     } else {
-      options = new RemoteApiOptions().server(SERVER_STRING,
+      options = new RemoteApiOptions().server(serverString,
         443).useApplicationDefaultCredential();
     }
     RemoteApiInstaller installer = new RemoteApiInstaller();
@@ -47,4 +47,4 @@ public static void main(String[] args) throws IOException {
     }
   }
 }
-//[END example]
\ No newline at end of file
+//[END example]
diff --git a/appengine/remote/remote-server/pom.xml b/appengine/remote/remote-server/pom.xml
index 450e28e3285..4dd421113dc 100644
--- a/appengine/remote/remote-server/pom.xml
+++ b/appengine/remote/remote-server/pom.xml
@@ -55,15 +55,6 @@
         <artifactId>appengine-maven-plugin</artifactId>
         <version>${appengine.sdk.version}</version>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <version>3.3</version>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>