Remove 'servlet' from rnc schema.

3 files changed, 0 insertions, 41 deletions

diff --git a/config-model/src/main/resources/schema/containercluster.rnc b/config-model/src/main/resources/schema/containercluster.rnc
index b06bf0897cf..e8ff1721397 100644
--- a/config-model/src/main/resources/schema/containercluster.rnc
+++ b/config-model/src/main/resources/schema/containercluster.rnc
@@ -12,7 +12,6 @@ ContainerCluster = element container | jdisc {
 }
 
 ContainerServices =
-    Servlet* &
     SearchInContainer? &
     DocprocInContainer? &
     ProcessingInContainer? &
@@ -136,18 +135,6 @@ Threadpool = element threadpool {
     element queue-size { xsd:nonNegativeInteger }
 }
 
-# Servlet:
-
-Servlet = element servlet {
-    ComponentDefinition &
-    ServletConfig? &
-    element path { xsd:string { pattern = "\w[\w_/\-\.]*(\*)?" } }
-}
-
-ServletConfig = element servlet-config {
-    anyElement+
-}
-
 # SEARCH:
 
 SearchInContainer = element search {
diff --git a/config-model/src/test/schema-test-files/services.xml b/config-model/src/test/schema-test-files/services.xml
index b477ceef169..9ccf50de906 100644
--- a/config-model/src/test/schema-test-files/services.xml
+++ b/config-model/src/test/schema-test-files/services.xml
@@ -58,20 +58,6 @@
       <group name="foo" environment="aws_stage" />
     </secret-store>
 
-    <servlet id="my-servlet" class="com.yahoo.MyServlet" bundle="my-bundle">
-      <path>p/a/t/h</path>
-    </servlet>
-
-    <servlet id="my-servlet" class="com.yahoo.MyServlet" bundle="my-bundle">
-      <path>Apps/app_1.3-4/*</path>
-      <config name="foo">
-        <intVal>0</intVal>
-      </config>
-      <servlet-config>
-        <foo>bar</foo>
-      </servlet-config>
-    </servlet>
-
     <http>
       <filtering strict-mode="true">
         <access-control domain="my.athens-domain" read="true">
diff --git a/config-model/src/test/schema-test-files/standalone-container.xml b/config-model/src/test/schema-test-files/standalone-container.xml
index 85f577882fb..cc34ae43712 100644
--- a/config-model/src/test/schema-test-files/standalone-container.xml
+++ b/config-model/src/test/schema-test-files/standalone-container.xml
@@ -2,20 +2,6 @@
 <!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <container id='qrsCluster_1' version='1.0'>
 
-  <servlet id="my-servlet" class="com.yahoo.MyServlet" bundle="my-bundle">
-    <path>p/a/t/h</path>
-  </servlet>
-
-  <servlet id="my-servlet" class="com.yahoo.MyServlet" bundle="my-bundle">
-    <path>Apps/app_1.3-4/*</path>
-    <config name="foo">
-      <intVal>0</intVal>
-    </config>
-    <servlet-config>
-      <foo>bar</foo>
-    </servlet-config>
-  </servlet>
-
   <http>
     <filtering>
       <filter id="com.yahoo.YcaFilter" bundle="mybundle">