Revert "Improved console modules to put wars in lib"

This reverts commit 49f0e7af4346b8cfc96e9f490407ceb7b81a26a6.

6 files changed, 4 insertions, 59 deletions

diff --git a/jetty-distribution/src/main/resources/etc/hawtio.xml b/jetty-distribution/src/main/resources/etc/hawtio.xml
deleted file mode 100644
index 228adc159a..0000000000
--- a/jetty-distribution/src/main/resources/etc/hawtio.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
-
-<Configure id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection">
-  <Call name="addHandler">
-    <Arg>
-      <New class="org.eclipse.jetty.webapp.WebAppContext">
-	<Set name="contextPath">/hawtio</Set>
-	<Set name="war"><Property name="jetty.base" default="."/>/lib/hawtio/hawtio.war</Set>
-	<Set name="extractWAR">true</Set>
-	<Set name="copyWebDir">false</Set>
-	<Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>
-      </New>
-    </Arg>
-  </Call>
-</Configure>
diff --git a/jetty-distribution/src/main/resources/etc/jamon.xml b/jetty-distribution/src/main/resources/etc/jamon.xml
index 6796ff6328..8b72eef0ae 100644
--- a/jetty-distribution/src/main/resources/etc/jamon.xml
+++ b/jetty-distribution/src/main/resources/etc/jamon.xml
@@ -6,7 +6,6 @@
 <!-- =============================================================== -->
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
-
   <Get id="oldhandler" name="handler" />
   <Set name="handler">
     <New id="JamonHandler" class="com.jamonapi.http.JAMonJettyHandlerNew">
@@ -14,18 +13,5 @@
     </New>
   </Set>
 
-  <Ref refid="Contexts">
-    <Call name="addHandler">
-      <Arg>
-	<New class="org.eclipse.jetty.webapp.WebAppContext">
-	  <Set name="contextPath">/jamon</Set>
-	  <Set name="war"><Property name="jetty.base" default="."/>/lib/jamon/jamon.war</Set>
-	  <Set name="extractWAR">true</Set>
-	  <Set name="copyWebDir">false</Set>
-	  <Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>
-	</New>
-      </Arg>
-    </Call>
-  </Ref>
 
 </Configure>
diff --git a/jetty-distribution/src/main/resources/etc/jolokia.xml b/jetty-distribution/src/main/resources/etc/jolokia.xml
deleted file mode 100644
index 575912f9b7..0000000000
--- a/jetty-distribution/src/main/resources/etc/jolokia.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
-
-<Configure id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection">
-  <Call name="addHandler">
-    <Arg>
-      <New class="org.eclipse.jetty.webapp.WebAppContext">
-	<Set name="contextPath">/jolokia</Set>
-	<Set name="war"><Property name="jetty.base" default="."/>/lib/jolokia/jolokia.war</Set>
-	<Set name="extractWAR">true</Set>
-	<Set name="copyWebDir">false</Set>
-	<Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>
-      </New>
-    </Arg>
-  </Call>
-</Configure>
diff --git a/jetty-distribution/src/main/resources/modules/hawtio.mod b/jetty-distribution/src/main/resources/modules/hawtio.mod
index 7b175f352d..5c927c1776 100644
--- a/jetty-distribution/src/main/resources/modules/hawtio.mod
+++ b/jetty-distribution/src/main/resources/modules/hawtio.mod
@@ -7,16 +7,8 @@ stats
 deploy
 jmx
 
-[xml]
-etc/hawtio.xml
 
 [files]
-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
 
-[ini-template]
+https://oss.sonatype.org/content/repositories/public/io/hawt/hawtio-default/1.4.16/hawtio-default-1.4.16.war|webapps/hawtio.war
 
--Dhawtio.authenticationEnabled=false
--Dhawtio.dirname=/dirname
--Dhawtio.config.dir=${jetty.base}/etc/hawtio
diff --git a/jetty-distribution/src/main/resources/modules/jamon.mod b/jetty-distribution/src/main/resources/modules/jamon.mod
index ebb3926119..1389d4766d 100644
--- a/jetty-distribution/src/main/resources/modules/jamon.mod
+++ b/jetty-distribution/src/main/resources/modules/jamon.mod
@@ -14,7 +14,7 @@ etc/jamon.xml
 [files]
 lib/jamon/
 http://central.maven.org/maven2/com/jamonapi/jamon/2.78/jamon-2.78.jar|lib/jamon/jamon-2.78.jar
-http://central.maven.org/maven2/com/jamonapi/jamon_war/2.78/jamon_war-2.78.war|lib/jamon/jamon.war
+http://central.maven.org/maven2/com/jamonapi/jamon_war/2.78/jamon_war-2.78.war|webapps/jamon.war
 
 [lib]
 lib/jamon/**.jar
diff --git a/jetty-distribution/src/main/resources/modules/jolokia.mod b/jetty-distribution/src/main/resources/modules/jolokia.mod
index d4c6eab659..9709df5c56 100644
--- a/jetty-distribution/src/main/resources/modules/jolokia.mod
+++ b/jetty-distribution/src/main/resources/modules/jolokia.mod
@@ -7,9 +7,8 @@ stats
 deploy
 jmx
 
-[xml]
-etc/jolokia.xml
 
 [files]
-http://repo1.maven.org/maven2/org/jolokia/jolokia-war/1.2.2/jolokia-war-1.2.2.war|lib/jolokia/jolokia.war
+http://repo1.maven.org/maven2/org/jolokia/jolokia-war/1.2.2/jolokia-war-1.2.2.war|webapps/jolokia.war
+