lib/rubyfox/server/data/lib/jetty/etc/jetty-deploy.xml in rubyfox-server-2.11.1.0 vs lib/rubyfox/server/data/lib/jetty/etc/jetty-deploy.xml in rubyfox-server-2.12.1.0

- old
+ new

@@ -1,7 +1,7 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> <!-- Create the deployment manager --> <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <!-- The deplyment manager handles the lifecycle of deploying web --> @@ -16,11 +16,11 @@ <Set name="contexts"> <Ref refid="Contexts" /> </Set> <Call name="setContextAttribute"> <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg> - <Arg>.*/servlet-api-[^/]*\.jar$</Arg> + <Arg>.*/[^/]*servlet-api-[^/]*\.jar$|.*/javax.servlet.jsp.jstl-.*\.jar$|.*/org.apache.taglibs.taglibs-standard-impl-.*\.jar$</Arg> </Call> <!-- Add a customize step to the deployment lifecycle --> <!-- uncomment and replace DebugBinding with your extended AppLifeCycle.Binding class <Call name="insertLifeCycleNode"> @@ -37,13 +37,27 @@ </Call> --> <Call id="webappprovider" name="addAppProvider"> <Arg> <New class="org.eclipse.jetty.deploy.providers.WebAppProvider"> - <Set name="monitoredDirName"><Property name="jetty.base" default="." />../../../www</Set> - <Set name="defaultsDescriptor"><Property name="jetty.home" default="." />/etc/webdefault.xml</Set> - <Set name="scanInterval">1</Set> - <Set name="extractWars">true</Set> + <Set name="monitoredDirName"> + <Property> + <Name>jetty.deploy.monitoredPath</Name> + <Default> + <Property name="jetty.base" default="." />../../../<Property name="jetty.deploy.monitoredDir" deprecated="jetty.deploy.monitoredDirName" default="www"/> + </Default> + </Property> + </Set> + <Set name="defaultsDescriptor"> + <Property> + <Name>jetty.deploy.defaultsDescriptorPath</Name> + <Default> + <Property name="jetty.home" default="." />/etc/webdefault.xml + </Default> + </Property> + </Set> + <Set name="scanInterval"><Property name="jetty.deploy.scanInterval" default="1"/></Set> + <Set name="extractWars"><Property name="jetty.deploy.extractWars" default="true"/></Set> <Set name="configurationManager"> <New class="org.eclipse.jetty.deploy.PropertiesConfigurationManager"> <!-- file of context configuration properties <Set name="file"><SystemProperty name="jetty.base"/>/etc/some.properties</Set> -->