308420 - convert jetty-plus.xml to use DeploymentManager

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1478 7e9141cc-0065-0410-87d8-b60c137991c4

VERSION.txt

@@ -7,6 +7,7 @@ jetty-7.1-SNAPSHOT
  + JETTY-1202 Use platform default algorithm for SecureRandom
  + Fix jetty-plus.xml reference to addLifeCycle
  + Add AnnotationConfiguration to jetty-plus.xml
+ + 308420 convert jetty-plus.xml to use DeploymentManager 
 
 jetty-7.0.2.v20100331
  + 297552 Don't call Continuation timeouts from acceptor tick

jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java

@@ -31,6 +31,7 @@ public class WebAppProvider extends ScanningAppProvider
     private boolean _parentLoaderPriority = false;
     private String _defaultsDescriptor;
     private Filter _filter;
+    private String[] _configurationClasses;
 
     private static class Filter implements FilenameFilter
     {
@@ -167,6 +168,26 @@ public class WebAppProvider extends ScanningAppProvider
         }
     }
     
+    
+    /* ------------------------------------------------------------ */
+    /**
+     * @param configurations The configuration class names.
+     */
+    public void setConfigurationClasses(String[] configurations)
+    {
+        _configurationClasses = configurations==null?null:(String[])configurations.clone();
+    }  
+    
+    /* ------------------------------------------------------------ */
+    /**
+     * 
+     */
+    public String[] getConfigurationClasses()
+    {
+        return _configurationClasses;
+    }
+    
+    
     /* ------------------------------------------------------------ */
     public ContextHandler createContextHandler(final App app) throws Exception
     {
@@ -208,6 +229,8 @@ public class WebAppProvider extends ScanningAppProvider
             wah.setDefaultsDescriptor(_defaultsDescriptor);
         wah.setExtractWAR(_extractWars);
         wah.setParentLoaderPriority(_parentLoaderPriority);
+        if (_configurationClasses != null)
+            wah.setConfigurationClasses(_configurationClasses);
 
         return wah; 
     }

jetty-plus/src/main/config/etc/jetty-plus.xml

@@ -55,28 +55,25 @@
   <!-- =========================================================== -->
   <!-- Deploy all webapps in webapps-plus                          -->
   <!-- =========================================================== -->
-  <!-- Uncomment the following to set up a WebAppDeployer that will -->
+  <!-- Uncomment the following to set up a deployer that will      -->
   <!-- deploy webapps from a directory called webapps-plus. Note   -->
   <!-- that you will need to create this directory first!          -->
   <!--
-    <Call name="addLifeCycle">
+  <Ref id="DeploymentManager">
+      <Call name="addAppProvider">
         <Arg>
-        <New class="org.eclipse.jetty.deploy.WebAppDeployer">
-          <Set name="contexts"><Ref id="Contexts"/></Set>
-          <Set name="webAppDir"><SystemProperty name="jetty.home" default="."/>/webapps-plus</Set>
-          <Set name="parentLoaderPriority">false</Set>
-          <Set name="extract">true</Set>
-          <Set name="allowDuplicates">false</Set>
+          <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
+            <Set name="monitoredDir"><Property name="jetty.home" default="." />/webapps-plus</Set>
             <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set>
+            <Set name="scanInterval">5</Set>
+            <Set name="contextXmlDir"><Property name="jetty.home" default="." />/contexts</Set>
+            <Set name="parentLoaderPriority">false</Set>
+            <Set name="extractWars">true</Set>
             <Set name="configurationClasses"><Ref id="plusConfig"/></Set>
-          <Call name="setAttribute">
-            <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
-            <Arg>.*/jsp-api-[^/]*\.jar$|.*/jsp-[^/]*\.jar$</Arg>
-          </Call>
           </New>
         </Arg>
       </Call>
+  </Ref>
   -->
-
 </Configure>