From af0a2abe258d38d9da9e08a34979221875a63013 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Tue, 11 Oct 2016 20:02:50 +1100
Subject: [PATCH] moved 3rd party xml to modules

---
 jetty-home/src/main/resources/modules/hawtio.mod                 | 1 +
 jetty-home/src/main/resources/{etc => modules/hawtio}/hawtio.xml | 0
 jetty-home/src/main/resources/modules/jamon.mod                  | 1 +
 jetty-home/src/main/resources/{etc => modules/jamon}/jamon.xml   | 0
 jetty-home/src/main/resources/modules/jminix.mod                 | 1 +
 jetty-home/src/main/resources/{etc => modules/jminix}/jminix.xml | 0
 jetty-home/src/main/resources/modules/jolokia.mod                | 1 +
 .../src/main/resources/{etc => modules/jolokia}/jolokia.xml      | 0
 8 files changed, 4 insertions(+)
 rename jetty-home/src/main/resources/{etc => modules/hawtio}/hawtio.xml (100%)
 rename jetty-home/src/main/resources/{etc => modules/jamon}/jamon.xml (100%)
 rename jetty-home/src/main/resources/{etc => modules/jminix}/jminix.xml (100%)
 rename jetty-home/src/main/resources/{etc => modules/jolokia}/jolokia.xml (100%)

diff --git a/jetty-home/src/main/resources/modules/hawtio.mod b/jetty-home/src/main/resources/modules/hawtio.mod
index c8eeb0d888d..2191e37595c 100644
--- a/jetty-home/src/main/resources/modules/hawtio.mod
+++ b/jetty-home/src/main/resources/modules/hawtio.mod
@@ -16,6 +16,7 @@ etc/hawtio.xml
 etc/hawtio/
 lib/hawtio/
 https://oss.sonatype.org/content/repositories/public/io/hawt/hawtio-default/1.4.16/hawtio-default-1.4.16.war|lib/hawtio/hawtio.war
+basehome:modules/hawtio/hawtio.xml|etc/hawtio.xml
 
 [license]
 Hawtio is a redhat JBoss project released under the Apache License, v2.0
diff --git a/jetty-home/src/main/resources/etc/hawtio.xml b/jetty-home/src/main/resources/modules/hawtio/hawtio.xml
similarity index 100%
rename from jetty-home/src/main/resources/etc/hawtio.xml
rename to jetty-home/src/main/resources/modules/hawtio/hawtio.xml
diff --git a/jetty-home/src/main/resources/modules/jamon.mod b/jetty-home/src/main/resources/modules/jamon.mod
index 72c76f055ff..5fe87c68754 100644
--- a/jetty-home/src/main/resources/modules/jamon.mod
+++ b/jetty-home/src/main/resources/modules/jamon.mod
@@ -17,6 +17,7 @@ etc/jamon.xml
 lib/jamon/
 maven://com.jamonapi/jamon/2.81|lib/jamon/jamon-2.81.jar
 maven://com.jamonapi/jamon_war/2.81/war|lib/jamon/jamon.war
+basehome:modules/jamon/jamon.xml|etc/jamon.xml
 
 [lib]
 lib/jamon/**.jar
diff --git a/jetty-home/src/main/resources/etc/jamon.xml b/jetty-home/src/main/resources/modules/jamon/jamon.xml
similarity index 100%
rename from jetty-home/src/main/resources/etc/jamon.xml
rename to jetty-home/src/main/resources/modules/jamon/jamon.xml
diff --git a/jetty-home/src/main/resources/modules/jminix.mod b/jetty-home/src/main/resources/modules/jminix.mod
index fc8328921f5..6310834a283 100644
--- a/jetty-home/src/main/resources/modules/jminix.mod
+++ b/jetty-home/src/main/resources/modules/jminix.mod
@@ -29,6 +29,7 @@ maven://commons-collections/commons-collections/3.2|lib/jminix/commons-collectio
 maven://net.sf.ezmorph/ezmorph/1.0.6|lib/jminix/ezmorph-1.0.6.jar
 maven://org.jgroups/jgroups/2.12.1.3.Final|lib/jminix/jgroups-2.12.1.3.Final.jar
 maven://org.jasypt/jasypt/1.8|lib/jminix/jasypt-1.8.jar
+basehome:modules/jminix/jminix.xml|etc/jminix.xml
 
 [lib]
 lib/jminix/**.jar
diff --git a/jetty-home/src/main/resources/etc/jminix.xml b/jetty-home/src/main/resources/modules/jminix/jminix.xml
similarity index 100%
rename from jetty-home/src/main/resources/etc/jminix.xml
rename to jetty-home/src/main/resources/modules/jminix/jminix.xml
diff --git a/jetty-home/src/main/resources/modules/jolokia.mod b/jetty-home/src/main/resources/modules/jolokia.mod
index 5020a2fd83b..a5d21a86ba4 100644
--- a/jetty-home/src/main/resources/modules/jolokia.mod
+++ b/jetty-home/src/main/resources/modules/jolokia.mod
@@ -14,6 +14,7 @@ etc/jolokia.xml
 
 [files]
 maven://org.jolokia/jolokia-war/1.2.2/war|lib/jolokia/jolokia.war
+basehome:modules/jolokia/jolokia.xml|etc/jolokia.xml
 
 [license]
 Jolokia is released under the Apache License 2.0
diff --git a/jetty-home/src/main/resources/etc/jolokia.xml b/jetty-home/src/main/resources/modules/jolokia/jolokia.xml
similarity index 100%
rename from jetty-home/src/main/resources/etc/jolokia.xml
rename to jetty-home/src/main/resources/modules/jolokia/jolokia.xml