Revert "Improved console modules to put wars in lib"
This reverts commit 49f0e7af43
.
This commit is contained in:
parent
9baae458a4
commit
39d597da74
|
@ -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>
|
|
|
@ -6,7 +6,6 @@
|
||||||
<!-- =============================================================== -->
|
<!-- =============================================================== -->
|
||||||
|
|
||||||
<Configure id="Server" class="org.eclipse.jetty.server.Server">
|
<Configure id="Server" class="org.eclipse.jetty.server.Server">
|
||||||
|
|
||||||
<Get id="oldhandler" name="handler" />
|
<Get id="oldhandler" name="handler" />
|
||||||
<Set name="handler">
|
<Set name="handler">
|
||||||
<New id="JamonHandler" class="com.jamonapi.http.JAMonJettyHandlerNew">
|
<New id="JamonHandler" class="com.jamonapi.http.JAMonJettyHandlerNew">
|
||||||
|
@ -14,18 +13,5 @@
|
||||||
</New>
|
</New>
|
||||||
</Set>
|
</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>
|
</Configure>
|
||||||
|
|
|
@ -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>
|
|
|
@ -7,16 +7,8 @@ stats
|
||||||
deploy
|
deploy
|
||||||
jmx
|
jmx
|
||||||
|
|
||||||
[xml]
|
|
||||||
etc/hawtio.xml
|
|
||||||
|
|
||||||
[files]
|
[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
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ etc/jamon.xml
|
||||||
[files]
|
[files]
|
||||||
lib/jamon/
|
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/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]
|
||||||
lib/jamon/**.jar
|
lib/jamon/**.jar
|
||||||
|
|
|
@ -7,9 +7,8 @@ stats
|
||||||
deploy
|
deploy
|
||||||
jmx
|
jmx
|
||||||
|
|
||||||
[xml]
|
|
||||||
etc/jolokia.xml
|
|
||||||
|
|
||||||
[files]
|
[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
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue