From 613fefb2512371e323b2c37d032aae9faaee883f Mon Sep 17 00:00:00 2001
From: Wesley Wong <wesleywong@google.com>
Date: Wed, 31 Aug 2016 16:13:51 -0500
Subject: [PATCH] Adds filters for management and uses public repo.

---
 .../endpoints-frameworks-v2/backend/pom.xml   | 11 +------
 .../backend/src/main/webapp/WEB-INF/web.xml   | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/appengine/endpoints-frameworks-v2/backend/pom.xml b/appengine/endpoints-frameworks-v2/backend/pom.xml
index ac799f82599..a0cabc5964b 100644
--- a/appengine/endpoints-frameworks-v2/backend/pom.xml
+++ b/appengine/endpoints-frameworks-v2/backend/pom.xml
@@ -32,20 +32,11 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <endpoints.framework.version>2.0.0-beta.7</endpoints.framework.version>
-        <endpoints.management.version>0.0.20-SNAPSHOT</endpoints.management.version>
+        <endpoints.management.version>1.0.0-beta.7</endpoints.management.version>
 
         <endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>
     </properties>
 
-    <!-- TODO(wmwong): Remove this repo before merging. -->
-    <repositories>
-        <repository>
-            <id>internal-endpoints-testing</id>
-            <name>Internal Endpoints Testing</name>
-            <url>http://104.197.230.53:8081/nexus/content/repositories/snapshots/</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <!-- Compile/runtime dependencies -->
         <dependency>
diff --git a/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/web.xml b/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/web.xml
index 53beffe8208..66db1fda503 100644
--- a/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/web.xml
@@ -32,4 +32,34 @@
     <welcome-file-list>
         <welcome-file>index.html</welcome-file>
     </welcome-file-list>
+
+    <!-- Add a filter that fetches the service config from service management. -->
+    <filter>
+        <filter-name>endpoints-api-configuration</filter-name>
+        <filter-class>com.google.api.control.ServiceManagementConfigFilter</filter-class>
+    </filter>
+
+    <!-- Add a filter that performs Endpoints logging and monitoring. -->
+    <filter>
+        <filter-name>endpoints-api-controller</filter-name>
+        <filter-class>com.google.api.control.extensions.appengine.GoogleAppEngineControlFilter</filter-class>
+        <init-param>
+            <param-name>endpoints.projectId</param-name>
+            <param-value>${endpoints.project.id}</param-value>
+        </init-param>
+        <init-param>
+            <param-name>endpoints.serviceName</param-name>
+            <param-value>${endpoints.project.id}.appspot.com</param-value>
+        </init-param>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>endpoints-api-configuration</filter-name>
+        <servlet-name>EndpointsServlet</servlet-name>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>endpoints-api-controller</filter-name>
+        <servlet-name>EndpointsServlet</servlet-name>
+    </filter-mapping>
 </web-app>