diff --git a/appengine/datastore/indexes-exploding/pom.xml b/appengine/datastore/indexes-exploding/pom.xml index 05d7a2992e3..11d3ed3aabf 100644 --- a/appengine/datastore/indexes-exploding/pom.xml +++ b/appengine/datastore/indexes-exploding/pom.xml @@ -36,7 +36,7 @@ javax.servlet servlet-api - jar + 2.5 provided diff --git a/appengine/datastore/indexes-perfect/pom.xml b/appengine/datastore/indexes-perfect/pom.xml index b491d4adb50..33279493428 100644 --- a/appengine/datastore/indexes-perfect/pom.xml +++ b/appengine/datastore/indexes-perfect/pom.xml @@ -36,7 +36,7 @@ javax.servlet servlet-api - jar + 2.5 provided diff --git a/appengine/datastore/indexes/pom.xml b/appengine/datastore/indexes/pom.xml index 17b1019acd3..4f800629cf6 100644 --- a/appengine/datastore/indexes/pom.xml +++ b/appengine/datastore/indexes/pom.xml @@ -36,7 +36,7 @@ javax.servlet servlet-api - jar + 2.5 provided diff --git a/appengine/datastore/pom.xml b/appengine/datastore/pom.xml index 1d0ac140081..721ded97c1c 100644 --- a/appengine/datastore/pom.xml +++ b/appengine/datastore/pom.xml @@ -33,6 +33,14 @@ appengine-api-1.0-sdk ${appengine.sdk.version} + + + javax.servlet + servlet-api + 2.5 + provided + + com.google.auto.value auto-value @@ -51,12 +59,6 @@ 20.0 - - javax.servlet - servlet-api - jar - provided - joda-time joda-time diff --git a/appengine/helloworld/pom.xml b/appengine/helloworld/pom.xml index af1b1b5899f..55155e62efd 100644 --- a/appengine/helloworld/pom.xml +++ b/appengine/helloworld/pom.xml @@ -30,7 +30,7 @@ Copyright 2015 Google Inc. All Rights Reserved. javax.servlet servlet-api - jar + 2.5 provided diff --git a/appengine/images/pom.xml b/appengine/images/pom.xml index 4cfcd385fee..d724e4c911e 100644 --- a/appengine/images/pom.xml +++ b/appengine/images/pom.xml @@ -45,7 +45,7 @@ Copyright 2015 Google Inc. All Rights Reserved. javax.servlet servlet-api - jar + 2.5 provided diff --git a/appengine/oauth2/pom.xml b/appengine/oauth2/pom.xml index aa11ccaee26..4382d2b0273 100644 --- a/appengine/oauth2/pom.xml +++ b/appengine/oauth2/pom.xml @@ -37,7 +37,7 @@ javax.servlet servlet-api - jar + 2.5 provided diff --git a/appengine/urlfetch/pom.xml b/appengine/urlfetch/pom.xml index a8eb02741f4..2acd297343b 100644 --- a/appengine/urlfetch/pom.xml +++ b/appengine/urlfetch/pom.xml @@ -31,7 +31,7 @@ Copyright 2015 Google Inc. All Rights Reserved. javax.servlet servlet-api - jar + 2.5 provided diff --git a/appengine/xmpp/README.md b/appengine/xmpp/README.md deleted file mode 100644 index 7ca936b5f0c..00000000000 --- a/appengine/xmpp/README.md +++ /dev/null @@ -1,20 +0,0 @@ -# Google App Engine Standard Environment XMPP Java API Overview - -This sample demonstrates how to use XMPP Java API on Google App Engine. - -See the [Google App Engine standard environment documentation][ae-docs] for more -detailed instructions. - -[ae-docs]: https://cloud.google.com/appengine/docs/java/ - -## Setup -1. Update the `` tag in `src/main/webapp/WEB-INF/appengine-web.xml` - with your project name. -1. Update the `` tag in `src/main/webapp/WEB-INF/appengine-web.xml` - with your version name. - -## Running locally - $ mvn appengine:devserver - -## Deploying - $ mvn appengine:update diff --git a/appengine/xmpp/pom.xml b/appengine/xmpp/pom.xml deleted file mode 100644 index 6472a6fc11c..00000000000 --- a/appengine/xmpp/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - 4.0.0 - war - 1.0-SNAPSHOT - com.example.appengine - appengine-xmpp - - com.google.cloud - doc-samples - 1.0.0 - ../.. - - - - javax.servlet - servlet-api - jar - provided - - - - - - com.google.appengine - appengine-api-1.0-sdk - - - - - com.google.guava - guava - 20.0 - - - - - - ${project.build.directory}/${project.build.finalName}/WEB-INF/classes - - - org.apache.maven.plugins - 3.3 - maven-compiler-plugin - - 1.7 - 1.7 - - - - - com.google.appengine - appengine-maven-plugin - ${appengine.sdk.version} - - - - diff --git a/appengine/xmpp/src/main/java/com/example/appengine/xmpp/ErrorServlet.java b/appengine/xmpp/src/main/java/com/example/appengine/xmpp/ErrorServlet.java deleted file mode 100644 index 20a6779207c..00000000000 --- a/appengine/xmpp/src/main/java/com/example/appengine/xmpp/ErrorServlet.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * 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.xmpp; - -import com.google.common.io.ByteStreams; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.util.logging.Logger; - -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -// [START example] -@SuppressWarnings("serial") -public class ErrorServlet extends HttpServlet { - private static final Logger log = Logger.getLogger(ErrorServlet.class.getName()); - - @Override - public void doPost(HttpServletRequest req, HttpServletResponse res) - throws IOException { - // Parse the POST data, which is sent as a MIME stream containing the stanza. - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - ServletInputStream inputStream = req.getInputStream(); - ByteStreams.copy(inputStream, baos); - - // Log the error - log.warning("Error stanza received: " + baos.toString()); - } -} -// [END example] diff --git a/appengine/xmpp/src/main/java/com/example/appengine/xmpp/MessageReceiverServlet.java b/appengine/xmpp/src/main/java/com/example/appengine/xmpp/MessageReceiverServlet.java deleted file mode 100644 index d43754048a2..00000000000 --- a/appengine/xmpp/src/main/java/com/example/appengine/xmpp/MessageReceiverServlet.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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.xmpp; - -import com.google.appengine.api.xmpp.JID; -import com.google.appengine.api.xmpp.Message; -import com.google.appengine.api.xmpp.XMPPService; -import com.google.appengine.api.xmpp.XMPPServiceFactory; - -import java.io.IOException; -import java.util.logging.Logger; - -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -// [START example] -@SuppressWarnings("serial") -public class MessageReceiverServlet extends HttpServlet { - private static final Logger log = Logger.getLogger(MessageReceiverServlet.class.getName()); - - @Override - public void doPost(HttpServletRequest req, HttpServletResponse res) - throws IOException { - - XMPPService xmpp = XMPPServiceFactory.getXMPPService(); - Message message = xmpp.parseMessage(req); - - JID fromJid = message.getFromJid(); - String body = message.getBody(); - - log.info("Received a message with id: " + fromJid + " and body: " + body); - // ... - } -} -// [END example] diff --git a/appengine/xmpp/src/main/java/com/example/appengine/xmpp/MessageSenderServlet.java b/appengine/xmpp/src/main/java/com/example/appengine/xmpp/MessageSenderServlet.java deleted file mode 100644 index 05461091698..00000000000 --- a/appengine/xmpp/src/main/java/com/example/appengine/xmpp/MessageSenderServlet.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * 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.xmpp; - -import com.google.appengine.api.xmpp.JID; -import com.google.appengine.api.xmpp.Message; -import com.google.appengine.api.xmpp.MessageBuilder; -import com.google.appengine.api.xmpp.SendResponse; -import com.google.appengine.api.xmpp.XMPPService; -import com.google.appengine.api.xmpp.XMPPServiceFactory; - -import java.io.IOException; -import java.util.logging.Logger; - -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -// [START example] -@SuppressWarnings("serial") -public class MessageSenderServlet extends HttpServlet { - private static final Logger log = Logger.getLogger(MessageSenderServlet.class.getName()); - - @Override - public void doGet(HttpServletRequest req, HttpServletResponse res) - throws IOException { - - JID jid = new JID("example@gmail.com"); - String msgBody = "Someone has sent you a gift on Example.com. To view: http://example.com/gifts/"; - Message msg = - new MessageBuilder() - .withRecipientJids(jid) - .withBody(msgBody) - .build(); - - boolean messageSent = false; - XMPPService xmpp = XMPPServiceFactory.getXMPPService(); - SendResponse status = xmpp.sendMessage(msg); - messageSent = (status.getStatusMap().get(jid) == SendResponse.Status.SUCCESS); - - log.info("Message sent? " + messageSent); - - if (!messageSent) { - // Send an email message instead... - } - } -} -// [END example] diff --git a/appengine/xmpp/src/main/java/com/example/appengine/xmpp/PresenceServlet.java b/appengine/xmpp/src/main/java/com/example/appengine/xmpp/PresenceServlet.java deleted file mode 100644 index 1af7e0bea5a..00000000000 --- a/appengine/xmpp/src/main/java/com/example/appengine/xmpp/PresenceServlet.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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.xmpp; - -import com.google.appengine.api.xmpp.Presence; -import com.google.appengine.api.xmpp.PresenceType; -import com.google.appengine.api.xmpp.XMPPService; -import com.google.appengine.api.xmpp.XMPPServiceFactory; - -import java.io.IOException; -import java.util.logging.Logger; - -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -// [START example] -@SuppressWarnings("serial") -public class PresenceServlet extends HttpServlet { - private static final Logger log = Logger.getLogger(PresenceServlet.class.getName()); - - @Override - public void doPost(HttpServletRequest req, HttpServletResponse res) - throws IOException { - - XMPPService xmpp = XMPPServiceFactory.getXMPPService(); - Presence presence = xmpp.parsePresence(req); - - // Split the XMPP address (e.g., user@gmail.com) - // from the resource (e.g., gmail.CD6EBC4A) - String from = presence.getFromJid().getId().split("/")[0]; - - log.info("Received presence from: " + from); - - // Mirror the contact's presence back to them - xmpp.sendPresence( - presence.getFromJid(), - PresenceType.AVAILABLE, - presence.getPresenceShow(), - presence.getStatus()); - } -} -// [END example] diff --git a/appengine/xmpp/src/main/java/com/example/appengine/xmpp/SubscriptionServlet.java b/appengine/xmpp/src/main/java/com/example/appengine/xmpp/SubscriptionServlet.java deleted file mode 100644 index e330006109f..00000000000 --- a/appengine/xmpp/src/main/java/com/example/appengine/xmpp/SubscriptionServlet.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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.xmpp; - -import com.google.appengine.api.xmpp.Subscription; -import com.google.appengine.api.xmpp.XMPPService; -import com.google.appengine.api.xmpp.XMPPServiceFactory; - -import java.io.IOException; -import java.util.logging.Logger; - -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -// [START example] -@SuppressWarnings("serial") -public class SubscriptionServlet extends HttpServlet { - private static final Logger log = Logger.getLogger(SubscriptionServlet.class.getName()); - - @Override - public void doPost(HttpServletRequest req, HttpServletResponse res) - throws IOException { - XMPPService xmppService = XMPPServiceFactory.getXMPPService(); - Subscription sub = xmppService.parseSubscription(req); - - // Split the bare XMPP address (e.g., user@gmail.com) - // from the resource (e.g., gmail.CD6EBC4A) - String from = sub.getFromJid().getId().split("/")[0]; - - log.info("Received subscription event from: " + from); - } -} -// [END example] diff --git a/appengine/xmpp/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/xmpp/src/main/webapp/WEB-INF/appengine-web.xml deleted file mode 100644 index efe638217ee..00000000000 --- a/appengine/xmpp/src/main/webapp/WEB-INF/appengine-web.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - YOUR-PROJECT-ID - YOUR-VERSION-ID - true - - - - xmpp_message - xmpp_presence - xmpp_subscribe - xmpp_error - - - - diff --git a/appengine/xmpp/src/main/webapp/WEB-INF/web.xml b/appengine/xmpp/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 5bbb66f21c2..00000000000 --- a/appengine/xmpp/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - error - com.example.appengine.xmpp.ErrorServlet - - - error - /_ah/xmpp/error/ - - - - messagereceiver - com.example.appengine.xmpp.MessageReceiverServlet - - - messagereceiver - /_ah/xmpp/message/chat/ - - - - messagesender - com.example.appengine.xmpp.MessageSenderServlet - - - messagesender - /messagesender - - - presence - com.example.appengine.xmpp.PresenceServlet - - - presence - /_ah/xmpp/presence/available/ - /_ah/xmpp/presence/unavailable/ - /_ah/xmpp/presence/probe/ - - - subscription - com.example.appengine.xmpp.SubscriptionServlet - - - subscription - /_ah/xmpp/subscription/subscribe/ - /_ah/xmpp/subscription/subscribed/ - /_ah/xmpp/subscription/unsubscribe/ - /_ah/xmpp/subscription/unsubscribed/ - - diff --git a/flexible/analytics/pom.xml b/flexible/analytics/pom.xml index 01a1a4271a0..d997c8761fb 100644 --- a/flexible/analytics/pom.xml +++ b/flexible/analytics/pom.xml @@ -17,8 +17,8 @@ 4.0.0 war 1.0-SNAPSHOT - com.example.managedvms - managed-vms-analytics + com.example.flexible + flexible-analytics doc-samples @@ -30,11 +30,17 @@ 1.8 1.8 - 3.0.0 - 2.0.9.121.v20160815 - 9.3.7.v20160115 + + 1.0.0 + 9.3.8.v20160314 + + false + + 3.3.9 + + org.apache.httpcomponents @@ -54,22 +60,17 @@ ${project.build.directory}/${project.build.finalName}/WEB-INF/classes - com.google.appengine - gcloud-maven-plugin - ${gcloud-maven-plugin-version} - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin-version} + com.google.cloud.tools + appengine-maven-plugin + ${appengine.maven.plugin} - false + org.eclipse.jetty jetty-maven-plugin - ${jetty-maven-plugin-version} + ${jetty.maven.plugin} diff --git a/flexible/analytics/src/main/appengine/app.yaml b/flexible/analytics/src/main/appengine/app.yaml index 94400f39805..fb4e73fcbe8 100644 --- a/flexible/analytics/src/main/appengine/app.yaml +++ b/flexible/analytics/src/main/appengine/app.yaml @@ -1,5 +1,5 @@ runtime: java -vm: true +env: flex handlers: - url: /.* diff --git a/flexible/analytics/src/main/java/com/example/managedvms/analytics/AnalyticsServlet.java b/flexible/analytics/src/main/java/com/example/analytics/AnalyticsServlet.java similarity index 98% rename from flexible/analytics/src/main/java/com/example/managedvms/analytics/AnalyticsServlet.java rename to flexible/analytics/src/main/java/com/example/analytics/AnalyticsServlet.java index d7c5ed5e620..d451a799629 100644 --- a/flexible/analytics/src/main/java/com/example/managedvms/analytics/AnalyticsServlet.java +++ b/flexible/analytics/src/main/java/com/example/analytics/AnalyticsServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.example.managedvms.analytics; +package com.example.analytics; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpPost; diff --git a/flexible/async-rest/pom.xml b/flexible/async-rest/pom.xml index 97e40e14836..f223e54e3d5 100644 --- a/flexible/async-rest/pom.xml +++ b/flexible/async-rest/pom.xml @@ -17,7 +17,7 @@ 4.0.0 com.google.appengine.demos - managed-vms-async-rest + async-rest 1.0.0-SNAPSHOT war @@ -29,11 +29,14 @@ + YOUR_PLACES_APP_KEY + 1.0.0 9.3.8.v20160314 + 1.8 1.8 - YOUR_PLACES_APP_KEY + false @@ -54,10 +57,6 @@ com.google.cloud.tools appengine-maven-plugin ${appengine.maven.plugin} - - true - true - org.apache.maven.plugins diff --git a/flexible/async-rest/src/main/appengine/app.yaml b/flexible/async-rest/src/main/appengine/app.yaml index e439d2821ad..a38abdca5df 100644 --- a/flexible/async-rest/src/main/appengine/app.yaml +++ b/flexible/async-rest/src/main/appengine/app.yaml @@ -13,7 +13,7 @@ # limitations under the License. # [START appyaml] runtime: custom -vm: true +env: flex handlers: - url: /.* diff --git a/flexible/async-rest/src/main/docker/Dockerfile b/flexible/async-rest/src/main/docker/Dockerfile index 7796e353862..20c68ce44d5 100644 --- a/flexible/async-rest/src/main/docker/Dockerfile +++ b/flexible/async-rest/src/main/docker/Dockerfile @@ -1,8 +1,8 @@ FROM gcr.io/google_appengine/jetty9 -#FROM gcr.io/YOUR_PROJECT/jetty9 -ADD managed-vms-async-rest-1.0.0-SNAPSHOT.war $JETTY_BASE/webapps/root.war + +ADD async-rest-1.0.0-SNAPSHOT.war $JETTY_BASE/webapps/root.war ADD jetty-logging.properties $JETTY_BASE/resources/jetty-logging.properties RUN chown jetty:jetty $JETTY_BASE/webapps/root.war $JETTY_BASE/resources/jetty-logging.properties WORKDIR $JETTY_BASE -#RUN java -jar $JETTY_HOME/start.jar --approve-all-licenses --add-to-startd=jmx,stats,hawtio +#RUN java -jar $JETTY_HOME/start.jar --approve-all-licenses --add-to-startd=jmx,stats,hawtio diff --git a/flexible/cloudsql/README.md b/flexible/cloudsql/README.md index 2bba231a4db..7b8be9c60fd 100644 --- a/flexible/cloudsql/README.md +++ b/flexible/cloudsql/README.md @@ -29,4 +29,4 @@ Before you can run or deploy the sample, you will need to do the following: $ mvn clean jetty:run ## Deploying - $ mvn clean gcloud:deploy + $ mvn clean appengine:deploy diff --git a/flexible/cloudsql/pom.xml b/flexible/cloudsql/pom.xml index 578731a6448..71782bdf0b3 100644 --- a/flexible/cloudsql/pom.xml +++ b/flexible/cloudsql/pom.xml @@ -17,8 +17,8 @@ 4.0.0 war 1.0-SNAPSHOT - com.example.managedvms - managed-vms-cloudsql + com.example.flexible + flexible-cloudsql doc-samples @@ -30,9 +30,11 @@ 1.8 1.8 - 3.0.0 - 2.0.9.121.v20160815 - 9.3.7.v20160115 + + 1.0.0 + 9.3.8.v20160314 + + false @@ -56,22 +58,17 @@ ${project.build.directory}/${project.build.finalName}/WEB-INF/classes - com.google.appengine - gcloud-maven-plugin - ${gcloud-maven-plugin-version} - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin-version} + com.google.cloud.tools + appengine-maven-plugin + ${appengine.maven.plugin} - false + org.eclipse.jetty jetty-maven-plugin - ${jetty-maven-plugin-version} + ${jetty.maven.plugin} diff --git a/flexible/cloudsql/src/main/appengine/app.yaml b/flexible/cloudsql/src/main/appengine/app.yaml index 95fbc276f57..3e936c97ac4 100644 --- a/flexible/cloudsql/src/main/appengine/app.yaml +++ b/flexible/cloudsql/src/main/appengine/app.yaml @@ -21,6 +21,8 @@ handlers: secure: always # [START env_variables] +# YOUR-INSTANCE-NAME is ProjectID:Region:DbInstance +# YOUR-DB-NAME is your DatabaseName env_variables: SQL_URL: jdbc:mysql://google/YOUR-DB-NAME?cloudSqlInstance=YOUR-INSTANCE-NAME&socketFactory=com.google.cloud.sql.mysql.SocketFactory&user=USERNAME&password=PASSWORD # [END env_variables] diff --git a/flexible/cloudsql/src/main/java/com/example/managedvms/cloudsql/CloudSqlServlet.java b/flexible/cloudsql/src/main/java/com/example/cloudsql/CloudSqlServlet.java similarity index 98% rename from flexible/cloudsql/src/main/java/com/example/managedvms/cloudsql/CloudSqlServlet.java rename to flexible/cloudsql/src/main/java/com/example/cloudsql/CloudSqlServlet.java index 2cfc51bf151..7400583bfa0 100644 --- a/flexible/cloudsql/src/main/java/com/example/managedvms/cloudsql/CloudSqlServlet.java +++ b/flexible/cloudsql/src/main/java/com/example/cloudsql/CloudSqlServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.example.managedvms.cloudsql; +package com.example.cloudsql; import java.io.IOException; import java.io.PrintWriter; diff --git a/flexible/cloudstorage/README.md b/flexible/cloudstorage/README.md index 64af6f8f677..1d0ee071298 100644 --- a/flexible/cloudstorage/README.md +++ b/flexible/cloudstorage/README.md @@ -22,4 +22,4 @@ Before you can run or deploy the sample, you will need to do the following: $ mvn clean jetty:run ## Deploying - $ mvn clean gcloud:deploy + $ mvn clean appengine:deploy diff --git a/flexible/cloudstorage/pom.xml b/flexible/cloudstorage/pom.xml index be8466c81e2..6dbf235250f 100644 --- a/flexible/cloudstorage/pom.xml +++ b/flexible/cloudstorage/pom.xml @@ -17,8 +17,8 @@ 4.0.0 war 1.0-SNAPSHOT - com.example.managedvms - managed-vms-cloudstorage + com.example.flexible + flexible-cloudstorage doc-samples @@ -30,9 +30,11 @@ 1.8 1.8 - 3.0.0 - 2.0.9.121.v20160815 - 9.3.7.v20160115 + + 1.0.0 + 9.3.8.v20160314 + + false @@ -56,22 +58,17 @@ ${project.build.directory}/${project.build.finalName}/WEB-INF/classes - com.google.appengine - gcloud-maven-plugin - ${gcloud-maven-plugin-version} - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin-version} + com.google.cloud.tools + appengine-maven-plugin + ${appengine.maven.plugin} - false + org.eclipse.jetty jetty-maven-plugin - ${jetty-maven-plugin-version} + ${jetty.maven.plugin} diff --git a/flexible/cloudstorage/src/main/appengine/app.yaml b/flexible/cloudstorage/src/main/appengine/app.yaml index 539cc47fbbb..5dd24c8506d 100644 --- a/flexible/cloudstorage/src/main/appengine/app.yaml +++ b/flexible/cloudstorage/src/main/appengine/app.yaml @@ -1,5 +1,5 @@ runtime: java -vm: true +env: flex handlers: - url: /.* diff --git a/flexible/cloudstorage/src/main/java/com/example/managedvms/cloudstorage/UploadServlet.java b/flexible/cloudstorage/src/main/java/com/example/cloudstorage/UploadServlet.java similarity index 98% rename from flexible/cloudstorage/src/main/java/com/example/managedvms/cloudstorage/UploadServlet.java rename to flexible/cloudstorage/src/main/java/com/example/cloudstorage/UploadServlet.java index fc3c39e26dc..0935e72127a 100644 --- a/flexible/cloudstorage/src/main/java/com/example/managedvms/cloudstorage/UploadServlet.java +++ b/flexible/cloudstorage/src/main/java/com/example/cloudstorage/UploadServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.example.managedvms.cloudstorage; +package com.example.cloudstorage; import com.google.cloud.storage.Acl; import com.google.cloud.storage.Blob; diff --git a/flexible/cron/pom.xml b/flexible/cron/pom.xml index 7b7c6019e6b..ff1ced1f34b 100644 --- a/flexible/cron/pom.xml +++ b/flexible/cron/pom.xml @@ -30,9 +30,11 @@ 1.8 1.8 - 3.0.0 - 2.0.9.121.v20160815 - 9.3.7.v20160115 + + 1.0.0 + 9.3.8.v20160314 + + false @@ -52,22 +54,17 @@ ${project.build.directory}/${project.build.finalName}/WEB-INF/classes - com.google.appengine - gcloud-maven-plugin - ${gcloud-maven-plugin-version} - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin-version} + com.google.cloud.tools + appengine-maven-plugin + ${appengine.maven.plugin} - false + org.eclipse.jetty jetty-maven-plugin - ${jetty-maven-plugin-version} + ${jetty.maven.plugin} diff --git a/flexible/cron/src/main/appengine/app.yaml b/flexible/cron/src/main/appengine/app.yaml index 2a659160df5..959f6c227dc 100644 --- a/flexible/cron/src/main/appengine/app.yaml +++ b/flexible/cron/src/main/appengine/app.yaml @@ -1,5 +1,5 @@ runtime: java -vm: true +env: flex handlers: - url: /.* diff --git a/flexible/cron/src/main/java/com/example/managedvms/cron/CronServlet.java b/flexible/cron/src/main/java/com/example/cron/CronServlet.java similarity index 96% rename from flexible/cron/src/main/java/com/example/managedvms/cron/CronServlet.java rename to flexible/cron/src/main/java/com/example/cron/CronServlet.java index 770ca75b468..998e013b2e2 100644 --- a/flexible/cron/src/main/java/com/example/managedvms/cron/CronServlet.java +++ b/flexible/cron/src/main/java/com/example/cron/CronServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.example.managedvms.cron; +package com.example.cron; import java.io.IOException; import java.io.PrintWriter; diff --git a/flexible/datastore/pom.xml b/flexible/datastore/pom.xml index b479cce8e18..d4bad0beb3a 100644 --- a/flexible/datastore/pom.xml +++ b/flexible/datastore/pom.xml @@ -17,8 +17,8 @@ 4.0.0 war 1.0-SNAPSHOT - com.example.managedvms - managed-vms-datastore + com.example.flexible + flexible-datastore doc-samples @@ -30,9 +30,11 @@ 1.8 1.8 - 3.0.0 - 2.0.9.121.v20160815 - 9.3.7.v20160115 + + 1.0.0 + 9.3.8.v20160314 + + false @@ -56,22 +58,17 @@ ${project.build.directory}/${project.build.finalName}/WEB-INF/classes - com.google.appengine - gcloud-maven-plugin - ${gcloud-maven-plugin-version} - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin-version} + com.google.cloud.tools + appengine-maven-plugin + ${appengine.maven.plugin} - false + org.eclipse.jetty jetty-maven-plugin - ${jetty-maven-plugin-version} + ${jetty.maven.plugin} diff --git a/flexible/datastore/src/main/appengine/app.yaml b/flexible/datastore/src/main/appengine/app.yaml index b45dd027208..b537cc91c42 100644 --- a/flexible/datastore/src/main/appengine/app.yaml +++ b/flexible/datastore/src/main/appengine/app.yaml @@ -14,7 +14,7 @@ # runtime: java -vm: true +env: flex handlers: - url: /.* diff --git a/flexible/datastore/src/main/java/com/example/managedvms/datastore/DatastoreServlet.java b/flexible/datastore/src/main/java/com/example/datastore/DatastoreServlet.java similarity index 100% rename from flexible/datastore/src/main/java/com/example/managedvms/datastore/DatastoreServlet.java rename to flexible/datastore/src/main/java/com/example/datastore/DatastoreServlet.java diff --git a/flexible/disk/pom.xml b/flexible/disk/pom.xml index a970b164da1..163c5969ee9 100644 --- a/flexible/disk/pom.xml +++ b/flexible/disk/pom.xml @@ -17,8 +17,8 @@ 4.0.0 war 1.0-SNAPSHOT - com.example.managedvms - managed-vms-disk + com.example.flexible + flexible-disk doc-samples @@ -30,9 +30,11 @@ 1.8 1.8 - 3.0.0 - 2.0.9.121.v20160815 - 9.3.7.v20160115 + + 1.0.0 + 9.3.8.v20160314 + + false @@ -49,22 +51,17 @@ ${project.build.directory}/${project.build.finalName}/WEB-INF/classes - com.google.appengine - gcloud-maven-plugin - ${gcloud-maven-plugin-version} - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin-version} + com.google.cloud.tools + appengine-maven-plugin + ${appengine.maven.plugin} - false + org.eclipse.jetty jetty-maven-plugin - ${jetty-maven-plugin-version} + ${jetty.maven.plugin} diff --git a/flexible/disk/src/main/appengine/app.yaml b/flexible/disk/src/main/appengine/app.yaml index 2a659160df5..959f6c227dc 100644 --- a/flexible/disk/src/main/appengine/app.yaml +++ b/flexible/disk/src/main/appengine/app.yaml @@ -1,5 +1,5 @@ runtime: java -vm: true +env: flex handlers: - url: /.* diff --git a/flexible/disk/src/main/java/com/example/managedvms/disk/DiskServlet.java b/flexible/disk/src/main/java/com/example/disk/DiskServlet.java similarity index 94% rename from flexible/disk/src/main/java/com/example/managedvms/disk/DiskServlet.java rename to flexible/disk/src/main/java/com/example/disk/DiskServlet.java index 4089d0a597b..24c0e5b027a 100644 --- a/flexible/disk/src/main/java/com/example/managedvms/disk/DiskServlet.java +++ b/flexible/disk/src/main/java/com/example/disk/DiskServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.example.managedvms.disk; +package com.example.disk; import java.io.IOException; import java.io.PrintWriter; @@ -41,8 +41,8 @@ public class DiskServlet extends HttpServlet { @Override public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException { String instanceId = - System.getenv().containsKey("GAE_MODULE_INSTANCE") - ? System.getenv("GAE_MODULE_INSTANCE") : "1"; + System.getenv().containsKey("GAE_INSTANCE") + ? System.getenv("GAE_INSTANCE") : "1"; // store only the first two octets of a users ip address String userIp = req.getRemoteAddr(); InetAddress address = InetAddress.getByName(userIp); diff --git a/flexible/endpoints/pom.xml b/flexible/endpoints/pom.xml index fefb3acde20..17a01909014 100644 --- a/flexible/endpoints/pom.xml +++ b/flexible/endpoints/pom.xml @@ -5,8 +5,8 @@ 4.0.0 war 1.0-SNAPSHOT - com.example.managedvms - managed-vms-endpoints + com.example.flexible + flexible-endpoints doc-samples @@ -15,6 +15,16 @@ ../.. + + 1.8 + 1.8 + + 1.0.0 + 9.3.8.v20160314 + + false + + javax.servlet @@ -36,7 +46,7 @@ ${project.build.directory}/${project.build.finalName}/WEB-INF/classes - + com.google.appengine gcloud-maven-plugin 2.0.9.121.v20160815 @@ -44,27 +54,19 @@ beta + - org.apache.maven.plugins - maven-war-plugin - 2.6 - - false - - - - org.apache.maven.plugins - 3.3 - maven-compiler-plugin + com.google.cloud.tools + appengine-maven-plugin + ${appengine.maven.plugin} - 1.7 - 1.7 + org.eclipse.jetty jetty-maven-plugin - 9.3.8.v20160314 + ${jetty.maven.plugin} diff --git a/flexible/endpoints/src/main/appengine/Dockerfile b/flexible/endpoints/src/main/appengine/Dockerfile index 49864ba44c8..063636ed556 100644 --- a/flexible/endpoints/src/main/appengine/Dockerfile +++ b/flexible/endpoints/src/main/appengine/Dockerfile @@ -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 diff --git a/flexible/endpoints/src/main/appengine/app.yaml b/flexible/endpoints/src/main/appengine/app.yaml index 6d375d8db22..5882f5a8952 100644 --- a/flexible/endpoints/src/main/appengine/app.yaml +++ b/flexible/endpoints/src/main/appengine/app.yaml @@ -1,5 +1,5 @@ runtime: custom -vm: true +env: flex handlers: - url: /.* diff --git a/flexible/endpoints/src/main/java/com/example/managedvms/endpoints/AuthInfoServlet.java b/flexible/endpoints/src/main/java/com/example/endpoints/AuthInfoServlet.java similarity index 96% rename from flexible/endpoints/src/main/java/com/example/managedvms/endpoints/AuthInfoServlet.java rename to flexible/endpoints/src/main/java/com/example/endpoints/AuthInfoServlet.java index c5bc081040c..233ea414239 100644 --- a/flexible/endpoints/src/main/java/com/example/managedvms/endpoints/AuthInfoServlet.java +++ b/flexible/endpoints/src/main/java/com/example/endpoints/AuthInfoServlet.java @@ -14,10 +14,12 @@ * 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; @@ -25,9 +27,6 @@ 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). diff --git a/flexible/endpoints/src/main/java/com/example/managedvms/endpoints/EchoServlet.java b/flexible/endpoints/src/main/java/com/example/endpoints/EchoServlet.java similarity index 94% rename from flexible/endpoints/src/main/java/com/example/managedvms/endpoints/EchoServlet.java rename to flexible/endpoints/src/main/java/com/example/endpoints/EchoServlet.java index e54da65bd43..40e0f1f5038 100644 --- a/flexible/endpoints/src/main/java/com/example/managedvms/endpoints/EchoServlet.java +++ b/flexible/endpoints/src/main/java/com/example/endpoints/EchoServlet.java @@ -14,11 +14,14 @@ * 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; @@ -26,11 +29,6 @@ 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. */ diff --git a/flexible/extending-runtime/README.md b/flexible/extending-runtime/README.md index 95290cfb3f9..a1c5801e06a 100644 --- a/flexible/extending-runtime/README.md +++ b/flexible/extending-runtime/README.md @@ -1,4 +1,6 @@ -# Java extending runtime sample for Google Managed VMs -This sample demonstrates how to use custom runtime on Google Managed VMs +# Java extending runtime sample for Google App Engine Flexible +This sample demonstrates how to use custom runtime on Google App Engine Flexible + ## Setup -Before you can run this sample locally, you will have to edit the and properties in the pom.xml + +... ?? diff --git a/flexible/extending-runtime/pom.xml b/flexible/extending-runtime/pom.xml index 4f4b3a1079f..91a45359896 100644 --- a/flexible/extending-runtime/pom.xml +++ b/flexible/extending-runtime/pom.xml @@ -17,8 +17,8 @@ 4.0.0 war 1.0-SNAPSHOT - com.example.managedvms - managed-vms-extendingruntime + com.example.flexible + extendingruntime doc-samples @@ -30,9 +30,11 @@ 1.8 1.8 - 3.0.0 - 2.0.9.121.v20160815 - 9.3.7.v20160115 + + 1.0.0 + 9.3.8.v20160314 + + false @@ -49,22 +51,17 @@ ${project.build.directory}/${project.build.finalName}/WEB-INF/classes - com.google.appengine - gcloud-maven-plugin - ${gcloud-maven-plugin-version} - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin-version} + com.google.cloud.tools + appengine-maven-plugin + ${appengine.maven.plugin} - false + org.eclipse.jetty jetty-maven-plugin - ${jetty-maven-plugin-version} + ${jetty.maven.plugin} diff --git a/flexible/extending-runtime/src/main/appengine/Dockerfile b/flexible/extending-runtime/src/main/appengine/Dockerfile index 928d5a31b5a..e56e4a134e5 100644 --- a/flexible/extending-runtime/src/main/appengine/Dockerfile +++ b/flexible/extending-runtime/src/main/appengine/Dockerfile @@ -1,4 +1,4 @@ FROM gcr.io/google_appengine/jetty9 RUN apt-get update && apt-get install -y fortunes -ADD managed-vms-extendingruntime-1.0-SNAPSHOT.war $JETTY_BASE/webapps/root.war +ADD extendingruntime-1.0-SNAPSHOT.war $JETTY_BASE/webapps/root.war diff --git a/flexible/extending-runtime/src/main/appengine/app.yaml b/flexible/extending-runtime/src/main/appengine/app.yaml index 425bda136cd..3473c6e27d6 100644 --- a/flexible/extending-runtime/src/main/appengine/app.yaml +++ b/flexible/extending-runtime/src/main/appengine/app.yaml @@ -1,5 +1,5 @@ runtime: custom -vm: true +env: flexible handlers: - url: /.* diff --git a/flexible/extending-runtime/src/main/java/com/example/managedvms/extendingruntime/FortuneServlet.java b/flexible/extending-runtime/src/main/java/com/example/extendingruntime/FortuneServlet.java similarity index 97% rename from flexible/extending-runtime/src/main/java/com/example/managedvms/extendingruntime/FortuneServlet.java rename to flexible/extending-runtime/src/main/java/com/example/extendingruntime/FortuneServlet.java index 8176049ec2f..3b232db2d74 100644 --- a/flexible/extending-runtime/src/main/java/com/example/managedvms/extendingruntime/FortuneServlet.java +++ b/flexible/extending-runtime/src/main/java/com/example/extendingruntime/FortuneServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.example.managedvms.extendingruntime; +package com.example.extendingruntime; import java.io.BufferedReader; import java.io.File; diff --git a/flexible/helloworld/pom.xml b/flexible/helloworld/pom.xml index c654960798e..e0797547262 100644 --- a/flexible/helloworld/pom.xml +++ b/flexible/helloworld/pom.xml @@ -33,7 +33,7 @@ 1.8 1.0.0 - 9.3.7.v20160115 + 9.3.8.v20160314 false @@ -63,17 +63,13 @@ ${appengine.maven.plugin} - org.eclipse.jetty jetty-maven-plugin - ${jetty-maven-plugin-version} + ${jetty.maven.plugin} diff --git a/flexible/helloworld/src/main/appengine/app.yaml b/flexible/helloworld/src/main/appengine/app.yaml index b37fa66a82e..c5fb6e69481 100644 --- a/flexible/helloworld/src/main/appengine/app.yaml +++ b/flexible/helloworld/src/main/appengine/app.yaml @@ -13,7 +13,7 @@ # limitations under the License. # [START appyaml] runtime: java -vm: true +env: flex handlers: - url: /.* diff --git a/flexible/mailgun/README.md b/flexible/mailgun/README.md index fd3b6c97681..cbd6b6d3460 100644 --- a/flexible/mailgun/README.md +++ b/flexible/mailgun/README.md @@ -1,10 +1,12 @@ # Java Mailgun email sample for Google App Engine Managed VMs This sample demonstrates how to use [Mailgun](https://www.mailgun.com) on [Google App Engine Managed VMs](https://cloud.google.com/appengine). For more information about Mailgun, see their [documentation](https://documentation.mailgun.com/). + ## Setup Before you can run or deploy the sample, you will need to do the following: 1. [Create a Mailgun Account](http://www.mailgun.com/google). As of September 2015, Google users start with 30,000 free emails per month. 2. Configure your Mailgun settings in the environment variables section in ``app.yaml``. + ## Running locally Refer to the [top-level README](../README.md) for instructions on running and deploying. You can run the application locally and send emails from your local machine. You @@ -12,3 +14,8 @@ will need to set environment variables before starting your application: $ export MAILGUN_API_KEY=[your-mailgun-api-key] $ export MAILGUN_DOMAIN_NAME=[your-mailgun-domain-name] $ mvn clean jetty:run + +## Deployment +update values above in your `src/main/appengine/app.yaml` + + $ mvn clean appengine:deploy diff --git a/flexible/mailgun/pom.xml b/flexible/mailgun/pom.xml index 5d7974922b3..84e6b51265c 100644 --- a/flexible/mailgun/pom.xml +++ b/flexible/mailgun/pom.xml @@ -17,8 +17,8 @@ 4.0.0 war 1.0-SNAPSHOT - com.example.managedvms - managed-vms-mailgun + com.example.flexible + mailgun doc-samples @@ -30,9 +30,11 @@ 1.8 1.8 - 3.0.0 - 2.0.9.121.v20160815 - 9.3.7.v20160115 + + 1.0.0 + 9.3.8.v20160314 + + false @@ -61,27 +63,23 @@ + ${project.build.directory}/${project.build.finalName}/WEB-INF/classes - com.google.appengine - gcloud-maven-plugin - ${gcloud-maven-plugin-version} - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin-version} + com.google.cloud.tools + appengine-maven-plugin + ${appengine.maven.plugin} - false + org.eclipse.jetty jetty-maven-plugin - ${jetty-maven-plugin-version} + ${jetty.maven.plugin} diff --git a/flexible/mailgun/src/main/appengine/app.yaml b/flexible/mailgun/src/main/appengine/app.yaml index bf7142e6d6e..6bc8593fa46 100644 --- a/flexible/mailgun/src/main/appengine/app.yaml +++ b/flexible/mailgun/src/main/appengine/app.yaml @@ -1,5 +1,5 @@ runtime: java -vm: true +env: flex handlers: - url: /.* diff --git a/flexible/mailgun/src/main/java/com/example/managedvms/mailgun/MailgunServlet.java b/flexible/mailgun/src/main/java/com/example/mailgun/MailgunServlet.java similarity index 98% rename from flexible/mailgun/src/main/java/com/example/managedvms/mailgun/MailgunServlet.java rename to flexible/mailgun/src/main/java/com/example/mailgun/MailgunServlet.java index 0d7ca24f879..304cd05f917 100644 --- a/flexible/mailgun/src/main/java/com/example/managedvms/mailgun/MailgunServlet.java +++ b/flexible/mailgun/src/main/java/com/example/mailgun/MailgunServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.example.managedvms.mailgun; +package com.example.mailgun; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.ClientResponse; diff --git a/flexible/mailgun/src/main/webapp/index.html b/flexible/mailgun/src/main/webapp/index.html index 3b26f817c78..96d9a88b936 100644 --- a/flexible/mailgun/src/main/webapp/index.html +++ b/flexible/mailgun/src/main/webapp/index.html @@ -1,7 +1,7 @@ - Mailgun on Google App Engine Managed VMs + Mailgun on Google App Engine Flexible diff --git a/flexible/mailjet/README.md b/flexible/mailjet/README.md index 37289ddc7fb..0f51f24cf69 100644 --- a/flexible/mailjet/README.md +++ b/flexible/mailjet/README.md @@ -12,4 +12,4 @@ send emails from a verified sender you own. ## Deploying 1. Edit the environment variables in the app.yaml with the appropriate Mailjet values. - $ mvn clean gcloud:deploy + $ mvn clean appengine:deploy diff --git a/flexible/mailjet/pom.xml b/flexible/mailjet/pom.xml index ae93a07e1a4..68bc3da161d 100644 --- a/flexible/mailjet/pom.xml +++ b/flexible/mailjet/pom.xml @@ -17,8 +17,8 @@ 4.0.0 war 1.0-SNAPSHOT - com.example.managedvms - managed-vms-mailjet + com.example.flexible + mailjet com.google.cloud @@ -30,9 +30,12 @@ 1.8 1.8 - 3.0.0 - 2.0.9.121.v20160815 - 9.3.7.v20160115 + + 1.0.0 + 9.3.8.v20160314 + + false + 4.0.5 @@ -57,22 +60,17 @@ ${project.build.directory}/${project.build.finalName}/WEB-INF/classes - com.google.appengine - gcloud-maven-plugin - ${gcloud-maven-plugin-version} - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin-version} + com.google.cloud.tools + appengine-maven-plugin + ${appengine.maven.plugin} - false + org.eclipse.jetty jetty-maven-plugin - ${jetty-maven-plugin-version} + ${jetty.maven.plugin} diff --git a/flexible/mailjet/src/main/appengine/app.yaml b/flexible/mailjet/src/main/appengine/app.yaml index 3b3ed8ecd1d..12f3bd467de 100644 --- a/flexible/mailjet/src/main/appengine/app.yaml +++ b/flexible/mailjet/src/main/appengine/app.yaml @@ -1,5 +1,5 @@ runtime: java -vm: true +env: flex handlers: - url: /.* @@ -10,4 +10,4 @@ handlers: env_variables: MAILJET_API_KEY: YOUR-MAILJET-API-KEY MAILJET_SECRET_KEY: YOUR-MAILJET-SECRET-KEY -# [END env_variables] \ No newline at end of file +# [END env_variables] diff --git a/flexible/mailjet/src/main/java/com/example/managedvms/mailjet/MailjetServlet.java b/flexible/mailjet/src/main/java/com/example/mailjet/MailjetServlet.java similarity index 98% rename from flexible/mailjet/src/main/java/com/example/managedvms/mailjet/MailjetServlet.java rename to flexible/mailjet/src/main/java/com/example/mailjet/MailjetServlet.java index f8a921c9b50..b8723834431 100644 --- a/flexible/mailjet/src/main/java/com/example/managedvms/mailjet/MailjetServlet.java +++ b/flexible/mailjet/src/main/java/com/example/mailjet/MailjetServlet.java @@ -15,7 +15,7 @@ */ // [START mailjet_imports] -package com.example.managedvms.mailjet; +package com.example.mailjet; import com.mailjet.client.MailjetClient; import com.mailjet.client.MailjetRequest; diff --git a/flexible/mailjet/src/main/webapp/index.html b/flexible/mailjet/src/main/webapp/index.html index 037fddcea91..5b7cc9a3ee6 100644 --- a/flexible/mailjet/src/main/webapp/index.html +++ b/flexible/mailjet/src/main/webapp/index.html @@ -13,7 +13,7 @@ --> - Mailgun on Google App Engine Managed VMs + Mailgun on Google App Engine Flexible diff --git a/flexible/memcache/README.md b/flexible/memcache/README.md new file mode 100644 index 00000000000..aab8ddf0d2e --- /dev/null +++ b/flexible/memcache/README.md @@ -0,0 +1,7 @@ +# flexible/memcache + +How to use memcache on flexible. + +# NEEDS WORK + +This sample needs to be updated to use redis-memcache diff --git a/flexible/memcache/pom.xml b/flexible/memcache/pom.xml index a8c4af87025..06aa7f7e235 100644 --- a/flexible/memcache/pom.xml +++ b/flexible/memcache/pom.xml @@ -17,8 +17,8 @@ 4.0.0 war 1.0-SNAPSHOT - com.example.managedvms - managed-vms-memcache + com.example.flexible + memcache doc-samples @@ -30,9 +30,11 @@ 1.8 1.8 - 3.0.0 - 2.0.9.121.v20160815 - 9.3.7.v20160115 + + 1.0.0 + 9.3.8.v20160314 + + false @@ -55,23 +57,19 @@ ${project.build.directory}/${project.build.finalName}/WEB-INF/classes + - com.google.appengine - gcloud-maven-plugin - ${gcloud-maven-plugin-version} - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin-version} + com.google.cloud.tools + appengine-maven-plugin + ${appengine.maven.plugin} - false + org.eclipse.jetty jetty-maven-plugin - ${jetty-maven-plugin-version} + ${jetty.maven.plugin} diff --git a/flexible/memcache/src/main/appengine/app.yaml b/flexible/memcache/src/main/appengine/app.yaml index 7076ee01f42..cec454abe50 100644 --- a/flexible/memcache/src/main/appengine/app.yaml +++ b/flexible/memcache/src/main/appengine/app.yaml @@ -1,5 +1,5 @@ runtime: java -vm: true +env: flex handlers: - url: /.* diff --git a/flexible/memcache/src/main/java/com/example/managedvms/memcache/MemcacheServlet.java b/flexible/memcache/src/main/java/com/example/memcache/MemcacheServlet.java similarity index 86% rename from flexible/memcache/src/main/java/com/example/managedvms/memcache/MemcacheServlet.java rename to flexible/memcache/src/main/java/com/example/memcache/MemcacheServlet.java index 966051f14a8..ad46b2437bd 100644 --- a/flexible/memcache/src/main/java/com/example/managedvms/memcache/MemcacheServlet.java +++ b/flexible/memcache/src/main/java/com/example/memcache/MemcacheServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.example.managedvms.memcache; +package com.example.memcache; import net.rubyeye.xmemcached.MemcachedClient; import net.rubyeye.xmemcached.MemcachedClientBuilder; @@ -40,11 +40,11 @@ public class MemcacheServlet extends HttpServlet { public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException, ServletException { String addr = - System.getenv().containsKey("MEMCACHE_PORT_11211_TCP_ADDR") - ? System.getenv("MEMCACHE_PORT_11211_TCP_ADDR") : "localhost"; + System.getenv().containsKey("GAE_MEMCACHE_HOST") + ? System.getenv("GAE_MEMCACHE_HOST") : "localhost"; String port = - System.getenv().containsKey("MEMCACHE_PORT_11211_TCP_ADDR") - ? System.getenv("MEMCACHE_PORT_11211_TCP_PORT") : "11211"; + System.getenv().containsKey("GAE_MEMCACHE_HOST") + ? System.getenv("GAE_MEMCACHE_PORT") : "11211"; String key = "count"; MemcachedClientBuilder builder = new XMemcachedClientBuilder( AddrUtil.getAddresses(addr + ":" + port)); diff --git a/flexible/sendgrid/pom.xml b/flexible/sendgrid/pom.xml index 31dbbfe1c8e..926dddb88a8 100644 --- a/flexible/sendgrid/pom.xml +++ b/flexible/sendgrid/pom.xml @@ -30,9 +30,11 @@ 1.8 1.8 - 3.0.0 - 2.0.9.121.v20160815 - 9.3.7.v20160115 + + 1.0.0 + 9.3.8.v20160314 + + false @@ -56,22 +58,17 @@ ${project.build.directory}/${project.build.finalName}/WEB-INF/classes - com.google.appengine - gcloud-maven-plugin - ${gcloud-maven-plugin-version} - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin-version} + com.google.cloud.tools + appengine-maven-plugin + ${appengine.maven.plugin} - false + org.eclipse.jetty jetty-maven-plugin - ${jetty-maven-plugin-version} + ${jetty.maven.plugin} diff --git a/flexible/sendgrid/src/main/appengine/app.yaml b/flexible/sendgrid/src/main/appengine/app.yaml index fd699d3ec1c..c617039af78 100644 --- a/flexible/sendgrid/src/main/appengine/app.yaml +++ b/flexible/sendgrid/src/main/appengine/app.yaml @@ -1,5 +1,5 @@ runtime: java -vm: true +env: flex handlers: - url: /.* diff --git a/flexible/sendgrid/src/main/java/com/example/managedvms/sendgrid/SendEmailServlet.java b/flexible/sendgrid/src/main/java/com/example/sendgrid/SendEmailServlet.java similarity index 98% rename from flexible/sendgrid/src/main/java/com/example/managedvms/sendgrid/SendEmailServlet.java rename to flexible/sendgrid/src/main/java/com/example/sendgrid/SendEmailServlet.java index 8e6f377f757..cfbd0232d04 100644 --- a/flexible/sendgrid/src/main/java/com/example/managedvms/sendgrid/SendEmailServlet.java +++ b/flexible/sendgrid/src/main/java/com/example/sendgrid/SendEmailServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.example.managedvms.sendgrid; +package com.example.sendgrid; import com.sendgrid.SendGrid; import com.sendgrid.SendGridException; diff --git a/flexible/sparkjava/README.md b/flexible/sparkjava/README.md index 57b1c0abdb6..49a4eb7ee41 100644 --- a/flexible/sparkjava/README.md +++ b/flexible/sparkjava/README.md @@ -6,7 +6,7 @@ from within an [App Engine flexible environment](https://cloud.google.com/appengine/docs/flexible/java/hello-world) project using [SparkJava](http://sparkjava.com/). The app allows you to create and modify a database of "users", which contains their ID, name, and email -information. +information. The Google Cloud client library is an idiomatic Java client for [Google Cloud Platform](https://cloud.google.com/) services. Read more about the library @@ -41,7 +41,7 @@ Deploying --------- If you've enabled billing (step 1 in [Setup](#Setup)), you can deploy the -application to the web by running `mvn gcloud:deploy` from your command line +application to the web by running `mvn appengine:deploy` from your command line (from the `sparkjava` directory). How does it work? diff --git a/flexible/sparkjava/pom.xml b/flexible/sparkjava/pom.xml index 6b78cfb6023..9739f03cc47 100644 --- a/flexible/sparkjava/pom.xml +++ b/flexible/sparkjava/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.google.appengine.sparkdemo - managed-vms-spark + spark 1.0 @@ -14,6 +14,13 @@ ../.. + + 1.8 + 1.8 + + 1.0.0 + + com.sparkjava @@ -43,17 +50,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.8 - 1.8 - - - maven-assembly-plugin @@ -87,15 +83,15 @@ com.google.appengine.sparkdemo.Main -jar - target/sparkdemo-1.0-jar-with-dependencies.jar + target/spark-1.0-jar-with-dependencies.jar - com.google.appengine - gcloud-maven-plugin - 2.0.9.106.v20160420 + com.google.cloud.tools + appengine-maven-plugin + ${appengine.maven.plugin} diff --git a/flexible/sparkjava/src/main/appengine/Dockerfile b/flexible/sparkjava/src/main/appengine/Dockerfile index db698b196de..ab82615c12f 100644 --- a/flexible/sparkjava/src/main/appengine/Dockerfile +++ b/flexible/sparkjava/src/main/appengine/Dockerfile @@ -1,4 +1,4 @@ FROM gcr.io/google_appengine/openjdk8 VOLUME /tmp -ADD managed-vms-spark-1.0-jar-with-dependencies.jar app.jar +ADD spark-1.0-jar-with-dependencies.jar app.jar CMD [ "java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] diff --git a/flexible/sparkjava/src/main/appengine/app.yaml b/flexible/sparkjava/src/main/appengine/app.yaml index e8b73970590..ce2a124359b 100644 --- a/flexible/sparkjava/src/main/appengine/app.yaml +++ b/flexible/sparkjava/src/main/appengine/app.yaml @@ -1,2 +1,2 @@ runtime: custom -vm: true +env: flex diff --git a/flexible/static-files/pom.xml b/flexible/static-files/pom.xml index cfeabdbd9ab..223ccdb9b88 100644 --- a/flexible/static-files/pom.xml +++ b/flexible/static-files/pom.xml @@ -17,8 +17,8 @@ 4.0.0 war 1.0-SNAPSHOT - com.example.managedvms - managed-vms-staticfiles + com.example.flexible + staticfiles doc-samples @@ -30,9 +30,11 @@ 1.8 1.8 - 3.0.0 - 2.0.9.121.v20160815 - 9.3.7.v20160115 + + 1.0.0 + 9.3.8.v20160314 + + false @@ -49,22 +51,17 @@ ${project.build.directory}/${project.build.finalName}/WEB-INF/classes - com.google.appengine - gcloud-maven-plugin - ${gcloud-maven-plugin-version} - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin-version} + com.google.cloud.tools + appengine-maven-plugin + ${appengine.maven.plugin} - false + org.eclipse.jetty jetty-maven-plugin - ${jetty-maven-plugin-version} + ${jetty.maven.plugin} diff --git a/flexible/static-files/src/main/appengine/app.yaml b/flexible/static-files/src/main/appengine/app.yaml index 2a659160df5..959f6c227dc 100644 --- a/flexible/static-files/src/main/appengine/app.yaml +++ b/flexible/static-files/src/main/appengine/app.yaml @@ -1,5 +1,5 @@ runtime: java -vm: true +env: flex handlers: - url: /.* diff --git a/flexible/twilio/pom.xml b/flexible/twilio/pom.xml index 4bb3e9efef1..2fa8fbed988 100644 --- a/flexible/twilio/pom.xml +++ b/flexible/twilio/pom.xml @@ -17,8 +17,8 @@ 4.0.0 war 1.0-SNAPSHOT - com.example.managedvms - managed-vms-twilio + com.example.flexible + twilio doc-samples @@ -30,10 +30,11 @@ 1.8 1.8 - 2.0.9.121.v20160815 - 9.3.7.v20160115 - 3.0.0 - 2.19.1 + + 1.0.0 + 9.3.8.v20160314 + + false @@ -57,22 +58,17 @@ ${project.build.directory}/${project.build.finalName}/WEB-INF/classes - com.google.appengine - gcloud-maven-plugin - ${gcloud-maven-plugin-version} - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin-version} + com.google.cloud.tools + appengine-maven-plugin + ${appengine.maven.plugin} - false + org.eclipse.jetty jetty-maven-plugin - ${jetty-maven-plugin-version} + ${jetty.maven.plugin} diff --git a/flexible/twilio/src/main/appengine/app.yaml b/flexible/twilio/src/main/appengine/app.yaml index 46ccf5f90ff..c83da5e49c9 100644 --- a/flexible/twilio/src/main/appengine/app.yaml +++ b/flexible/twilio/src/main/appengine/app.yaml @@ -1,5 +1,5 @@ runtime: java -vm: true +env: flex handlers: - url: /.* diff --git a/flexible/twilio/src/main/java/com/example/managedvms/twilio/ReceiveCallServlet.java b/flexible/twilio/src/main/java/com/example/twilio/ReceiveCallServlet.java similarity index 97% rename from flexible/twilio/src/main/java/com/example/managedvms/twilio/ReceiveCallServlet.java rename to flexible/twilio/src/main/java/com/example/twilio/ReceiveCallServlet.java index 5d2c2b0d207..9fb115f9ab1 100644 --- a/flexible/twilio/src/main/java/com/example/managedvms/twilio/ReceiveCallServlet.java +++ b/flexible/twilio/src/main/java/com/example/twilio/ReceiveCallServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.example.managedvms.twilio; +package com.example.twilio; import com.twilio.sdk.verbs.Say; import com.twilio.sdk.verbs.TwiMLException; diff --git a/flexible/twilio/src/main/java/com/example/managedvms/twilio/ReceiveSmsServlet.java b/flexible/twilio/src/main/java/com/example/twilio/ReceiveSmsServlet.java similarity index 97% rename from flexible/twilio/src/main/java/com/example/managedvms/twilio/ReceiveSmsServlet.java rename to flexible/twilio/src/main/java/com/example/twilio/ReceiveSmsServlet.java index 5d289da692c..5a47ea3b303 100644 --- a/flexible/twilio/src/main/java/com/example/managedvms/twilio/ReceiveSmsServlet.java +++ b/flexible/twilio/src/main/java/com/example/twilio/ReceiveSmsServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.example.managedvms.twilio; +package com.example.twilio; import com.twilio.sdk.verbs.Message; import com.twilio.sdk.verbs.TwiMLException; diff --git a/flexible/twilio/src/main/java/com/example/managedvms/twilio/SendSmsServlet.java b/flexible/twilio/src/main/java/com/example/twilio/SendSmsServlet.java similarity index 98% rename from flexible/twilio/src/main/java/com/example/managedvms/twilio/SendSmsServlet.java rename to flexible/twilio/src/main/java/com/example/twilio/SendSmsServlet.java index 5aa9977dd93..ae0af6c6564 100644 --- a/flexible/twilio/src/main/java/com/example/managedvms/twilio/SendSmsServlet.java +++ b/flexible/twilio/src/main/java/com/example/twilio/SendSmsServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.example.managedvms.twilio; +package com.example.twilio; import com.twilio.sdk.TwilioRestClient; import com.twilio.sdk.TwilioRestException; diff --git a/pom.xml b/pom.xml index 148755ae8d1..1c00a0f34b6 100644 --- a/pom.xml +++ b/pom.xml @@ -31,11 +31,12 @@ 1.9.46 1 + 1.19.0 1.19.0 - 1.7 - 1.7 - 2.0.9.111.v20160525 + + 1.8 + 1.8 @@ -74,7 +75,8 @@ appengine/twilio appengine/urlfetch appengine/users - appengine/xmpp + + bigquery bigquery/cloud-client compute/cmdline @@ -130,12 +132,14 @@ appengine-api-1.0-sdk ${appengine.sdk.version} + jstl jstl diff --git a/taskqueue/deferred/pom.xml b/taskqueue/deferred/pom.xml index a4c24b8abc5..38605ecb963 100644 --- a/taskqueue/deferred/pom.xml +++ b/taskqueue/deferred/pom.xml @@ -42,8 +42,10 @@ appengine-api-1.0-sdk - javax.servlet - servlet-api + javax.servlet + servlet-api + 2.5 + provided jstl diff --git a/unittests/pom.xml b/unittests/pom.xml index 37ef803e780..14f49a21471 100644 --- a/unittests/pom.xml +++ b/unittests/pom.xml @@ -33,8 +33,10 @@ ${appengine.sdk.version} - javax.servlet - servlet-api + javax.servlet + servlet-api + 2.5 + provided jstl