From 3e91339db514c172e4417b3873c990c4ab92f6ed Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim@intalio.com>
Date: Mon, 7 Dec 2009 20:39:49 +0000
Subject: [PATCH] Adding Jetty DeploymentManager to jetty.xml as default
 deployer with standard configuration to mimic the legacy deployer behavior.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1131 7e9141cc-0065-0410-87d8-b60c137991c4
---
 .../jetty/deploy/DeploymentManager.java       |  6 +-
 jetty-server/src/main/config/etc/jetty.xml    | 60 +++++++++++++++++--
 2 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java
index 6a7941c0614..24b40514b5a 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java
@@ -322,7 +322,7 @@ public class DeploymentManager extends AbstractLifeCycle
      * @param name
      * @return
      */
-    public Object getAttribute(String name)
+    public Object getContextAttribute(String name)
     {
         return contextAttributes.getAttribute(name);
     }
@@ -399,7 +399,7 @@ public class DeploymentManager extends AbstractLifeCycle
      * 
      * @param name
      */
-    public void removeAttribute(String name)
+    public void removeContextAttribute(String name)
     {
         contextAttributes.removeAttribute(name);
     }
@@ -500,7 +500,7 @@ public class DeploymentManager extends AbstractLifeCycle
      * @param name
      * @param value
      */
-    public void setAttribute(String name, Object value)
+    public void setContextAttribute(String name, Object value)
     {
         contextAttributes.setAttribute(name,value);
     }
diff --git a/jetty-server/src/main/config/etc/jetty.xml b/jetty-server/src/main/config/etc/jetty.xml
index 56d5d4856b4..e690afac76b 100644
--- a/jetty-server/src/main/config/etc/jetty.xml
+++ b/jetty-server/src/main/config/etc/jetty.xml
@@ -93,7 +93,55 @@
         </Set>
       </New>
     </Set>
-    
+
+    <!-- =========================================================== -->
+    <!-- Configure the deployment manager                            -->
+    <!--                                                             -->
+    <!-- Sets up 2 monitored dir app providers that are configured   -->
+    <!-- to behave in a similaraly to the legacy ContextDeployer     -->
+    <!-- and WebAppDeployer from previous versions of Jetty.         -->
+    <!-- =========================================================== -->
+    <Call name="addBean">
+      <Arg>
+        <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
+          <Set name="contexts">
+            <Ref id="Contexts" />
+          </Set>
+          <Call name="setContextAttribute">
+            <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
+            <Arg>.*/jsp-api-[^/]*\.jar$|.*/jsp-[^/]*\.jar$</Arg>
+          </Call>
+          <!-- Providers of Apps via Context XML files.
+               Configured to behave similar to the legacy ContextDeployer -->
+          <Call name="addAppProvider">
+            <Arg>
+              <New class="org.eclipse.jetty.deploy.providers.MonitoredDirAppProvider">
+                <Set name="monitoredDir"><Property name="jetty.home" default="." />/contexts</Set>
+                <Set name="acceptContextXmlFiles">true</Set>
+                <Set name="acceptWarFiles">false</Set>
+                <Set name="scanInterval">5</Set>
+                <Set name="recursive">false</Set>
+              </New>
+            </Arg>
+          </Call>
+          <!-- Providers of Apps via WAR file existence.
+               Configured to behave similar to the legacy WebAppDeployer -->
+          <Call name="addAppProvider">
+            <Arg>
+              <New class="org.eclipse.jetty.deploy.providers.MonitoredDirAppProvider">
+                <Set name="monitoredDir"><Property name="jetty.home" default="." />/webapps</Set>
+                <Set name="acceptContextXmlFiles">false</Set>
+                <Set name="acceptWarFiles">true</Set>
+                <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set>
+                <Set name="scanInterval">5</Set>
+                <Set name="recursive">false</Set>
+              </New>
+            </Arg>
+          </Call>
+        </New>
+      </Arg>
+    </Call>
+
     <!-- =========================================================== -->
     <!-- Configure the context deployer                              -->
     <!-- A context deployer will deploy contexts described in        -->
@@ -105,6 +153,7 @@
     <!-- in the $JETTY_HOME/contexts directory                       -->
     <!--                                                             -->
     <!-- =========================================================== -->
+    <!-- 
     <Call name="addBean">
       <Arg>
         <New class="org.eclipse.jetty.deploy.ContextDeployer">
@@ -118,6 +167,7 @@
         </New>
       </Arg>
     </Call>
+      -->
 
     <!-- =========================================================== -->
     <!-- Configure the webapp deployer.                              -->
@@ -132,14 +182,15 @@
     <!-- Normally only one type of deployer need be used.            -->
     <!--                                                             -->
     <!-- =========================================================== -->
+    <!-- 
     <Call name="addBean">
       <Arg>
         <New class="org.eclipse.jetty.deploy.WebAppDeployer">
           <Set name="contexts"><Ref id="Contexts"/></Set>
           <Set name="webAppDir"><SystemProperty name="jetty.home" default="."/>/webapps</Set>
-	  <Set name="parentLoaderPriority">false</Set>
-	  <Set name="extract">true</Set>
-	  <Set name="allowDuplicates">false</Set>
+          <Set name="parentLoaderPriority">false</Set>
+          <Set name="extract">true</Set>
+          <Set name="allowDuplicates">false</Set>
           <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set>
           <Call name="setAttribute">
             <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
@@ -148,6 +199,7 @@
         </New>
       </Arg>
     </Call>
+      -->
 
     <!-- =========================================================== -->
     <!-- Configure Authentication Login Service                      -->