From 7a0ffe6ca2415f051e3ff54fc7f12f9282c55222 Mon Sep 17 00:00:00 2001
From: "Ignacio J. Perez Portal" <5990@protonmail.com>
Date: Wed, 9 Oct 2024 06:02:25 -0300
Subject: [PATCH] fix(wordlist): merged duplicate 'Apache Tomcat' wordlists

merged 'tomcat.txt' with 'ApacheTomcat.fuzz.txt'
---
 Discovery/Web-Content/ApacheTomcat.fuzz.txt   | 53 -------------------
 .../Web-Content/Web-Servers/Apache-Tomcat.txt | 30 ++++++++---
 2 files changed, 22 insertions(+), 61 deletions(-)
 delete mode 100644 Discovery/Web-Content/ApacheTomcat.fuzz.txt

diff --git a/Discovery/Web-Content/ApacheTomcat.fuzz.txt b/Discovery/Web-Content/ApacheTomcat.fuzz.txt
deleted file mode 100644
index 7d4cfd65..00000000
--- a/Discovery/Web-Content/ApacheTomcat.fuzz.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-examples
-examples/jsp/index.html
-examples/jsp/snp/snoop.jsp
-examples/jsp/source.jsp
-examples/servlet/HelloWorldExample
-examples/servlet/SnoopServlet
-examples/servlet/TroubleShooter
-examples/servlet/default/jsp/snp/snoop.jsp
-examples/servlet/default/jsp/source.jsp
-examples/servlet/org.apache.catalina.INVOKER.HelloWorldExample
-examples/servlet/org.apache.catalina.INVOKER.SnoopServlet
-examples/servlet/org.apache.catalina.INVOKER.TroubleShooter
-examples/servlet/org.apache.catalina.servlets.DefaultServlet/jsp/snp/snoop.jsp
-examples/servlet/org.apache.catalina.servlets.DefaultServlet/jsp/source.jsp
-examples/servlet/org.apache.catalina.servlets.WebdavServlet/jsp/snp/snoop.jsp
-examples/servlet/org.apache.catalina.servlets.WebdavServlet/jsp/source.jsp
-examples/servlet/snoop
-examples/servlets/index.html
-jsp-examples
-manager
-manager/deploy?path=foo
-manager/html/
-manager/html
-manager/text
-manager/jmxproxy
-manager/status
-servlet/default/
-servlet/default
-servlet/mstrWebAdmin
-servlet/org.apache.catalina.INVOKER.org.apache.catalina.servlets.DefaultServlet/tomcat.gif
-servlet/org.apache.catalina.INVOKER.org.apache.catalina.servlets.SnoopAllServlet
-servlet/org.apache.catalina.INVOKER.org.apache.catalina.servlets.WebdavServlet/
-servlet/org.apache.catalina.servlets.DefaultServlet/
-servlet/org.apache.catalina.servlets.DefaultServlet/tomcat.gif
-servlet/org.apache.catalina.servlets.HTMLManagerServlet
-servlet/org.apache.catalina.servlets.InvokerServlet/org.apache.catalina.servlets.DefaultServlet/tomcat.gif
-servlet/org.apache.catalina.servlets.InvokerServlet/org.apache.catalina.servlets.SnoopAllServlet
-servlet/org.apache.catalina.servlets.ManagerServlet
-servlet/org.apache.catalina.servlets.SnoopAllServlet
-servlet/org.apache.catalina.servlets.WebdavServlet/
-tomcat-docs
-webdav
-webdav/index.html
-webdav/servlet/org.apache.catalina.servlets.WebdavServlet/
-webdav/servlet/webdav/
-conf/
-conf/server.xml/
-WEB-INF/
-WEB-INF/web.xml
-WEB-INF/classes/
-shared/
-shared/lib/
-RELEASE-NOTES.txt
diff --git a/Discovery/Web-Content/Web-Servers/Apache-Tomcat.txt b/Discovery/Web-Content/Web-Servers/Apache-Tomcat.txt
index 6fde1b86..5f06edd5 100644
--- a/Discovery/Web-Content/Web-Servers/Apache-Tomcat.txt
+++ b/Discovery/Web-Content/Web-Servers/Apache-Tomcat.txt
@@ -1,17 +1,19 @@
-ROOT
 add
 balancer
+conf/
+conf/server.xml/
 dav
 deploy
 examples
+examples/%252e%252e/manager/html
+examples/%2e%2e/manager/html
+examples/../manager/html
 examples/jsp/index.html
 examples/jsp/snp/snoop.jsp
 examples/jsp/source.jsp
-examples/servlet/HelloWorldExample
-examples/servlet/SnoopServlet
-examples/servlet/TroubleShooter
 examples/servlet/default/jsp/snp/snoop.jsp
 examples/servlet/default/jsp/source.jsp
+examples/servlet/HelloWorldExample
 examples/servlet/org.apache.catalina.INVOKER.HelloWorldExample
 examples/servlet/org.apache.catalina.INVOKER.SnoopServlet
 examples/servlet/org.apache.catalina.INVOKER.TroubleShooter
@@ -20,10 +22,9 @@ examples/servlet/org.apache.catalina.servlets.DefaultServlet/jsp/source.jsp
 examples/servlet/org.apache.catalina.servlets.WebdavServlet/jsp/snp/snoop.jsp
 examples/servlet/org.apache.catalina.servlets.WebdavServlet/jsp/source.jsp
 examples/servlet/snoop
+examples/servlet/SnoopServlet
+examples/servlet/TroubleShooter
 examples/servlets/index.html
-examples/../manager/html
-examples/%2e%2e/manager/html
-examples/%252e%252e/manager/html
 host-manager
 host-manager/add
 host-manager/host-manager.xml
@@ -40,7 +41,9 @@ jsp-examples
 list
 manager
 manager/deploy
+manager/deploy?path=foo
 manager/html
+manager/html/
 manager/html/*
 manager/install
 manager/jmxproxy
@@ -55,17 +58,23 @@ manager/save
 manager/serverinfo
 manager/sessions
 manager/start
+manager/status
 manager/status.xsd
 manager/status/*
 manager/stop
+manager/text
 manager/undeploy
+RELEASE-NOTES.txt
 reload
 remove
 resources
 roles
+ROOT
 save
 serverinfo
+servlet/default
 servlet/default/
+servlet/mstrWebAdmin
 servlet/org.apache.catalina.INVOKER.org.apache.catalina.servlets.DefaultServlet/tomcat.gif
 servlet/org.apache.catalina.INVOKER.org.apache.catalina.servlets.SnoopAllServlet
 servlet/org.apache.catalina.INVOKER.org.apache.catalina.servlets.WebdavServlet/
@@ -79,12 +88,17 @@ servlet/org.apache.catalina.servlets.SnoopAllServlet
 servlet/org.apache.catalina.servlets.WebdavServlet/
 servlets-examples
 sessions
+shared/
+shared/lib/
 start
 status/*
 stop
 tomcat-docs
 undeploy
+WEB-INF/
+WEB-INF/classes/
+WEB-INF/web.xml
 webdav
 webdav/index.html
 webdav/servlet/org.apache.catalina.servlets.WebdavServlet/
-webdav/servlet/webdav/
+webdav/servlet/webdav/
\ No newline at end of file