Skip to content

Commit

Permalink
More updates to the quickstart, following the example set in the appe…
Browse files Browse the repository at this point in the history
…ngine/flexible quickstart
  • Loading branch information
bradfriedman committed Nov 16, 2016
1 parent d7f2998 commit b8bcaca
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 28 deletions.
26 changes: 13 additions & 13 deletions endpoints/getting-started/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<packaging>war</packaging>
<version>1.0-SNAPSHOT</version>
<groupId>com.example.flexible.endpoints</groupId>
<artifactId>managed-vms-endpoints</artifactId>
<artifactId>flexible-endpoints</artifactId>

<parent>
<artifactId>doc-samples</artifactId>
Expand All @@ -15,6 +15,16 @@
<relativePath>../..</relativePath>
</parent>

<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>

<appengine.maven.plugin>1.0.0</appengine.maven.plugin>
<jetty.maven.plugin>9.3.8.v20160314</jetty.maven.plugin>

<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->
</properties>

<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
Expand All @@ -39,9 +49,8 @@
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>appengine-maven-plugin</artifactId>
<version>0.1.2</version>
<version>${appengine.maven.plugin}</version>
<configuration>
<gcloud_app_prefix>beta</gcloud_app_prefix>
</configuration>
</plugin>
<plugin>
Expand All @@ -52,19 +61,10 @@
<failOnMissingWebXml>false</failOnMissingWebXml>
</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>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.3.8.v20160314</version>
<version>${jetty.maven.plugin}</version>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion endpoints/getting-started/src/main/appengine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/google_appengine/jetty9

ADD managed-vms-endpoints-1.0-SNAPSHOT.war $JETTY_BASE/webapps/root.war
ADD endpoints-1.0-SNAPSHOT.war $JETTY_BASE/webapps/root.war
ADD . /app
2 changes: 1 addition & 1 deletion endpoints/getting-started/src/main/appengine/app.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
runtime: custom
vm: true
env: flex

handlers:
- url: /.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,19 @@
* limitations under the License.
*/

package com.example.managedvms.endpoints;
package com.example.endpoints;

import com.google.gson.Gson;
import com.google.gson.JsonObject;

import java.io.IOException;
import java.io.PrintWriter;
import java.util.Base64;

import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.google.gson.Gson;
import com.google.gson.JsonObject;

/**
* A servlet that returns authentication information.
* See swagger.yaml for authentication mechanisms (e.g. JWT tokens, Google ID token).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,21 @@
* limitations under the License.
*/

package com.example.managedvms.endpoints;
package com.example.endpoints;

import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import com.google.gson.stream.JsonReader;

import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Map;

import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import com.google.gson.stream.JsonReader;

/**
* A servlet that echoes JSON message bodies.
*/
Expand Down

0 comments on commit b8bcaca

Please sign in to comment.