Merge branch 'master' into cloud-talent-solution

Author: xinyunh0929

appengine-java8/twilio/pom.xml

@@ -37,13 +37,11 @@ Copyright 2015 Google Inc.
 
 
   <dependencies>
-    <!-- [START dependencies] -->
     <dependency>
       <groupId>com.twilio.sdk</groupId>
       <artifactId>twilio-java-sdk</artifactId>
       <version>6.3.0</version>
     </dependency>
-    <!-- [END dependencies] -->
 
     <dependency>
       <groupId>javax.servlet</groupId>

appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveCallServlet.java

@@ -25,7 +25,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-// [START example]
 @SuppressWarnings("serial")
 public class ReceiveCallServlet extends HttpServlet {
 
@@ -44,4 +43,3 @@ public void service(HttpServletRequest req, HttpServletResponse resp)
     resp.getWriter().print(twiml.toXML());
   }
 }
-// [END example]

appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveSmsServlet.java

@@ -25,7 +25,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-// [START example]
 @SuppressWarnings("serial")
 public class ReceiveSmsServlet extends HttpServlet {
 
@@ -48,4 +47,3 @@ public void service(HttpServletRequest request, HttpServletResponse response)
     response.getWriter().print(twiml.toXML());
   }
 }
-// [END example]

appengine-java8/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java

@@ -31,7 +31,6 @@
 import org.apache.http.NameValuePair;
 import org.apache.http.message.BasicNameValuePair;
 
-// [START example]
 @SuppressWarnings("serial")
 public class SendSmsServlet extends HttpServlet {
 
@@ -62,4 +61,3 @@ public void service(HttpServletRequest req, HttpServletResponse resp)
     }
   }
 }
-// [END example]

appengine-java8/twilio/src/main/webapp/WEB-INF/appengine-web.xml

@@ -11,7 +11,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- [START config] -->
+<!-- [START gae_java8_twilio_config] -->
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <runtime>java8</runtime>
   <threadsafe>true</threadsafe>
@@ -21,4 +21,4 @@
     <env-var name="TWILIO_NUMBER" value="YOUR-TWILIO-NUMBER" />
   </env-variables>
 </appengine-web-app>
-<!-- [END config] -->
+<!-- [END gae_java8_twilio_config] -->

appengine/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java

@@ -28,7 +28,6 @@
 import javax.servlet.http.HttpServletResponse;
 import org.apache.http.client.utils.URIBuilder;
 
-// [START example]
 @SuppressWarnings("serial")
 public class AnalyticsServlet extends HttpServlet {
 
@@ -58,4 +57,3 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
     resp.getWriter().println("Event tracked.");
   }
 }
-// [END example]

appengine/helloworld-new-plugins/build.gradle

@@ -11,7 +11,7 @@
 //  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.
-// [START gradle]
+
 buildscript {    // Configuration for building
   repositories {
     jcenter()    // Bintray's repository - a fast Maven Central mirror & more
@@ -42,7 +42,7 @@ dependencies {
 
 }
 
-// [START model]
+// [START gae_maven_model]
 appengine {  // App Engine tasks configuration
   run {      // local (dev_appserver) configuration (standard environments only)
     port = 8080                 // default
@@ -53,11 +53,10 @@ appengine {  // App Engine tasks configuration
     promote = true              // default - & make this the current version
   }
 }
-// [END model]
+// [END gae_maven_model]
 
 group = 'com.example.appengine'   // Generated output GroupId
 version = '1.0-SNAPSHOT'          // Version in generated output
 
 sourceCompatibility = 1.7  // App Engine Standard uses Java 7
 targetCompatibility = 1.7  // App Engine Standard uses Java 7
-// [END gradle]

appengine/logs/src/main/java/com/example/appengine/logs/LogsServlet.java

@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// [START logs_API_example]
 
 package com.example.appengine.logs;
 
@@ -91,5 +90,3 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp)
     writer.println(String.format("<br><a href=\"/?offset=%s\">Next</a>", lastOffset));
   }
 }
-// [END logs_API_example]
-

appengine/oauth2/src/main/java/com/example/appengine/HelloServlet.java

@@ -28,7 +28,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-// [START example]
 @SuppressWarnings("serial")
 public class HelloServlet extends HttpServlet {
 
@@ -53,4 +52,3 @@ public void doPost(final HttpServletRequest req, final HttpServletResponse resp)
     out.print("Hello world, welcome to Oauth2: " + user.getEmail());
   }
 }
-// [END example]

appengine/oauth2/src/main/java/com/example/appengine/Oauth2Filter.java

@@ -52,7 +52,6 @@ public void init(final FilterConfig config) throws ServletException {
     this.context = config.getServletContext();
   }
 
-  // [START oauth2]
   @Override
   public void doFilter(
       final ServletRequest servletReq, final ServletResponse servletResp,  final FilterChain chain)
@@ -91,7 +90,6 @@ public void doFilter(
     }
     chain.doFilter(servletReq, servletResp);  // continue processing
   }
-  // [END oauth2]
 
   @Override
   public void destroy() { }

appengine/pusher-chat/src/main/java/com/example/appengine/pusher/AuthorizeServlet.java

@@ -37,7 +37,6 @@
  *
  * @see <a href="https://pusher.com/docs/authenticating_users">Pusher Authentication Docs</a>
  */
-// [START pusher_authorize]
 public class AuthorizeServlet extends HttpServlet {
 
   @Override
@@ -92,4 +91,3 @@ private static Map<String, String> splitQuery(String query) throws UnsupportedEn
     return queryPairs;
   }
 }
-// [END pusher_authorize]

appengine/pusher-chat/src/main/java/com/example/appengine/pusher/PusherService.java

@@ -18,7 +18,6 @@
 
 import com.pusher.rest.Pusher;
 
-// [START pusher_server_initialize]
 public abstract class PusherService {
 
   public static final String APP_KEY = System.getenv("PUSHER_APP_KEY");
@@ -40,4 +39,3 @@ static Pusher getDefaultInstance() {
     return pusher;
   }
 }
-// [END pusher_server_initialize]

appengine/pusher-chat/src/main/java/com/example/appengine/pusher/SendMessageServlet.java

@@ -36,7 +36,6 @@
  * <ahref="https://pusher.com/docs/server_api_guide/server_excluding_recipients">Excluding
  * Recipients</ahref>}
  */
-// [START pusher_server_send_message]
 public class SendMessageServlet extends HttpServlet {
 
   private Gson gson = new GsonBuilder().create();
@@ -81,4 +80,3 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
     response.getWriter().println(gson.toJson(messageData));
   }
 }
-// [END pusher_server_send_message]

appengine/twilio/pom.xml

@@ -36,13 +36,13 @@ Copyright 2015 Google Inc.
   </properties>
 
   <dependencies>
-    <!-- [START dependencies] -->
+    <!-- [START gae_twilio_dependencies] -->
     <dependency>
       <groupId>com.twilio.sdk</groupId>
       <artifactId>twilio-java-sdk</artifactId>
       <version>6.3.0</version>
     </dependency>
-    <!-- [END dependencies] -->
+    <!-- [END gae_twilio_dependencies] -->
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>

appengine/twilio/src/main/java/com/example/appengine/twilio/ReceiveCallServlet.java

@@ -25,7 +25,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-// [START example]
+// [START gae_twilio_receive_call]
 @SuppressWarnings("serial")
 public class ReceiveCallServlet extends HttpServlet {
 
@@ -44,4 +44,4 @@ public void service(HttpServletRequest req, HttpServletResponse resp) throws IOE
     resp.getWriter().print(twiml.toXML());
   }
 }
-// [END example]
+// [END gae_twilio_receive_call]

appengine/twilio/src/main/java/com/example/appengine/twilio/ReceiveSmsServlet.java

@@ -26,7 +26,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-// [START example]
+// [START gae_twilio_receive_sms]
 @SuppressWarnings("serial")
 public class ReceiveSmsServlet extends HttpServlet {
 
@@ -49,4 +49,4 @@ public void service(HttpServletRequest request, HttpServletResponse response) th
     response.getWriter().print(twiml.toXML());
   }
 }
-// [END example]
+// [END gae_twilio_receive_sms]

appengine/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java

@@ -31,7 +31,7 @@
 import org.apache.http.NameValuePair;
 import org.apache.http.message.BasicNameValuePair;
 
-// [START example]
+// [START gae_twilio_send_sms]
 @SuppressWarnings("serial")
 public class SendSmsServlet extends HttpServlet {
 
@@ -62,4 +62,4 @@ public void service(HttpServletRequest req, HttpServletResponse resp) throws IOE
     }
   }
 }
-// [END example]
+// [END gae_twilio_send_sms]

appengine/twilio/src/main/webapp/WEB-INF/appengine-web.xml

@@ -11,7 +11,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- [START config] -->
+<!-- [START gae_twilio_config] -->
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>YOUR-PROJECT-ID</application>
   <version>YOUR-VERSION-ID</version>
@@ -22,4 +22,4 @@
     <env-var name="TWILIO_NUMBER" value="YOUR-TWILIO-NUMBER" />
   </env-variables>
 </appengine-web-app>
-<!-- [END config] -->
+<!-- [END gae_twilio_config] -->