From fb10005cbaea38675415550927853780c465a368 Mon Sep 17 00:00:00 2001
From: mcilwain <mcilwain@google.com>
Date: Tue, 7 Feb 2017 12:05:52 -0800
Subject: [PATCH] Remove unneeded WEB-INF/*.yaml resource paths

The YAML configuration files are now being built directly into the
JAR, and not stored in the WEB-INF/ directory, so this is unnecessary.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=146815937
---
 .../registry/env/alpha/backend/WEB-INF/appengine-web.xml      | 4 ----
 .../registry/env/alpha/default/WEB-INF/appengine-web.xml      | 4 ----
 .../google/registry/env/alpha/tools/WEB-INF/appengine-web.xml | 4 ----
 .../registry/env/crash/backend/WEB-INF/appengine-web.xml      | 4 ----
 .../registry/env/crash/default/WEB-INF/appengine-web.xml      | 4 ----
 .../google/registry/env/crash/tools/WEB-INF/appengine-web.xml | 4 ----
 .../registry/env/local/backend/WEB-INF/appengine-web.xml      | 4 ----
 .../registry/env/local/default/WEB-INF/appengine-web.xml      | 4 ----
 .../google/registry/env/local/tools/WEB-INF/appengine-web.xml | 4 ----
 .../registry/env/production/backend/WEB-INF/appengine-web.xml | 4 ----
 .../registry/env/production/default/WEB-INF/appengine-web.xml | 4 ----
 .../registry/env/production/tools/WEB-INF/appengine-web.xml   | 4 ----
 .../registry/env/sandbox/backend/WEB-INF/appengine-web.xml    | 4 ----
 .../registry/env/sandbox/default/WEB-INF/appengine-web.xml    | 4 ----
 .../registry/env/sandbox/tools/WEB-INF/appengine-web.xml      | 4 ----
 15 files changed, 60 deletions(-)

diff --git a/java/google/registry/env/alpha/backend/WEB-INF/appengine-web.xml b/java/google/registry/env/alpha/backend/WEB-INF/appengine-web.xml
index 745c8c2d6..774b7de5a 100644
--- a/java/google/registry/env/alpha/backend/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/alpha/backend/WEB-INF/appengine-web.xml
@@ -12,10 +12,6 @@
     <idle-timeout>10m</idle-timeout>
   </basic-scaling>
 
-  <resource-files>
-    <include path="/WEB-INF/*.yaml"/>
-  </resource-files>
-
   <system-properties>
     <property name="java.util.logging.config.file"
               value="WEB-INF/logging.properties"/>
diff --git a/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml b/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml
index c77902238..7c5654228 100644
--- a/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml
@@ -12,10 +12,6 @@
     <idle-timeout>10m</idle-timeout>
   </basic-scaling>
 
-  <resource-files>
-    <include path="/WEB-INF/*.yaml"/>
-  </resource-files>
-
   <system-properties>
     <property name="java.util.logging.config.file"
               value="WEB-INF/logging.properties"/>
diff --git a/java/google/registry/env/alpha/tools/WEB-INF/appengine-web.xml b/java/google/registry/env/alpha/tools/WEB-INF/appengine-web.xml
index e7c3038f2..0a82b840c 100644
--- a/java/google/registry/env/alpha/tools/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/alpha/tools/WEB-INF/appengine-web.xml
@@ -12,10 +12,6 @@
     <idle-timeout>5m</idle-timeout>
   </basic-scaling>
 
-  <resource-files>
-    <include path="/WEB-INF/*.yaml"/>
-  </resource-files>
-
   <system-properties>
     <property name="java.util.logging.config.file"
               value="WEB-INF/logging.properties"/>
diff --git a/java/google/registry/env/crash/backend/WEB-INF/appengine-web.xml b/java/google/registry/env/crash/backend/WEB-INF/appengine-web.xml
index c418b0140..9b9cc5403 100644
--- a/java/google/registry/env/crash/backend/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/crash/backend/WEB-INF/appengine-web.xml
@@ -12,10 +12,6 @@
     <idle-timeout>10m</idle-timeout>
   </basic-scaling>
 
-  <resource-files>
-    <include path="/WEB-INF/*.yaml"/>
-  </resource-files>
-
   <system-properties>
     <property name="java.util.logging.config.file"
               value="WEB-INF/logging.properties"/>
diff --git a/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml b/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml
index a27cfda58..ac8696486 100644
--- a/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml
@@ -12,10 +12,6 @@
     <idle-timeout>10m</idle-timeout>
   </basic-scaling>
 
-  <resource-files>
-    <include path="/WEB-INF/*.yaml"/>
-  </resource-files>
-
   <system-properties>
     <property name="java.util.logging.config.file"
               value="WEB-INF/logging.properties"/>
diff --git a/java/google/registry/env/crash/tools/WEB-INF/appengine-web.xml b/java/google/registry/env/crash/tools/WEB-INF/appengine-web.xml
index 60e1a76bc..72aac3b85 100644
--- a/java/google/registry/env/crash/tools/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/crash/tools/WEB-INF/appengine-web.xml
@@ -12,10 +12,6 @@
     <idle-timeout>10m</idle-timeout>
   </basic-scaling>
 
-  <resource-files>
-    <include path="/WEB-INF/*.yaml"/>
-  </resource-files>
-
   <system-properties>
     <property name="java.util.logging.config.file"
               value="WEB-INF/logging.properties"/>
diff --git a/java/google/registry/env/local/backend/WEB-INF/appengine-web.xml b/java/google/registry/env/local/backend/WEB-INF/appengine-web.xml
index 25aafe97b..afe90f338 100644
--- a/java/google/registry/env/local/backend/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/local/backend/WEB-INF/appengine-web.xml
@@ -12,10 +12,6 @@
     <idle-timeout>10m</idle-timeout>
   </basic-scaling>
 
-  <resource-files>
-    <include path="/WEB-INF/*.yaml"/>
-  </resource-files>
-
   <system-properties>
     <property name="java.util.logging.config.file"
               value="WEB-INF/logging.properties"/>
diff --git a/java/google/registry/env/local/default/WEB-INF/appengine-web.xml b/java/google/registry/env/local/default/WEB-INF/appengine-web.xml
index 3d1087d9d..bb32914cd 100644
--- a/java/google/registry/env/local/default/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/local/default/WEB-INF/appengine-web.xml
@@ -12,10 +12,6 @@
     <idle-timeout>10m</idle-timeout>
   </basic-scaling>
 
-  <resource-files>
-    <include path="/WEB-INF/*.yaml"/>
-  </resource-files>
-
   <system-properties>
     <property name="java.util.logging.config.file"
               value="WEB-INF/logging.properties"/>
diff --git a/java/google/registry/env/local/tools/WEB-INF/appengine-web.xml b/java/google/registry/env/local/tools/WEB-INF/appengine-web.xml
index 943e4b65f..5d1a17d65 100644
--- a/java/google/registry/env/local/tools/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/local/tools/WEB-INF/appengine-web.xml
@@ -12,10 +12,6 @@
     <idle-timeout>10m</idle-timeout>
   </basic-scaling>
 
-  <resource-files>
-    <include path="/WEB-INF/*.yaml"/>
-  </resource-files>
-
   <system-properties>
     <property name="java.util.logging.config.file"
               value="WEB-INF/logging.properties"/>
diff --git a/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml b/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml
index e7351c04a..3dbbbc1c2 100644
--- a/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml
@@ -12,10 +12,6 @@
     <idle-timeout>10m</idle-timeout>
   </basic-scaling>
 
-  <resource-files>
-    <include path="/WEB-INF/*.yaml"/>
-  </resource-files>
-
   <system-properties>
     <property name="java.util.logging.config.file"
               value="WEB-INF/logging.properties"/>
diff --git a/java/google/registry/env/production/default/WEB-INF/appengine-web.xml b/java/google/registry/env/production/default/WEB-INF/appengine-web.xml
index 02838941b..0b2da7b6b 100644
--- a/java/google/registry/env/production/default/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/production/default/WEB-INF/appengine-web.xml
@@ -12,10 +12,6 @@
     <idle-timeout>10m</idle-timeout>
   </basic-scaling>
 
-  <resource-files>
-    <include path="/WEB-INF/*.yaml"/>
-  </resource-files>
-
   <system-properties>
     <property name="java.util.logging.config.file"
               value="WEB-INF/logging.properties"/>
diff --git a/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml b/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml
index e53d33d98..11b6162eb 100644
--- a/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml
@@ -12,10 +12,6 @@
     <idle-timeout>10m</idle-timeout>
   </basic-scaling>
 
-  <resource-files>
-    <include path="/WEB-INF/*.yaml"/>
-  </resource-files>
-
   <system-properties>
     <property name="java.util.logging.config.file"
               value="WEB-INF/logging.properties"/>
diff --git a/java/google/registry/env/sandbox/backend/WEB-INF/appengine-web.xml b/java/google/registry/env/sandbox/backend/WEB-INF/appengine-web.xml
index 411a5b8be..ece64f711 100644
--- a/java/google/registry/env/sandbox/backend/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/sandbox/backend/WEB-INF/appengine-web.xml
@@ -12,10 +12,6 @@
     <idle-timeout>10m</idle-timeout>
   </basic-scaling>
 
-  <resource-files>
-    <include path="/WEB-INF/*.yaml"/>
-  </resource-files>
-
   <system-properties>
     <property name="java.util.logging.config.file"
               value="WEB-INF/logging.properties"/>
diff --git a/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml b/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml
index d4673961d..c962d22d8 100644
--- a/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml
@@ -12,10 +12,6 @@
     <idle-timeout>10m</idle-timeout>
   </basic-scaling>
 
-  <resource-files>
-    <include path="/WEB-INF/*.yaml"/>
-  </resource-files>
-
   <system-properties>
     <property name="java.util.logging.config.file"
               value="WEB-INF/logging.properties"/>
diff --git a/java/google/registry/env/sandbox/tools/WEB-INF/appengine-web.xml b/java/google/registry/env/sandbox/tools/WEB-INF/appengine-web.xml
index 3411904d1..9e8bcb777 100644
--- a/java/google/registry/env/sandbox/tools/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/sandbox/tools/WEB-INF/appengine-web.xml
@@ -12,10 +12,6 @@
     <idle-timeout>10m</idle-timeout>
   </basic-scaling>
 
-  <resource-files>
-    <include path="/WEB-INF/*.yaml"/>
-  </resource-files>
-
   <system-properties>
     <property name="java.util.logging.config.file"
               value="WEB-INF/logging.properties"/>