JETTY-1297

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

VERSION.txt

@@ -49,6 +49,7 @@ jetty-7.2-SNAPSHOT
  + JETTY-1269 Improve log multithreadedness
  + JETTY-1270 Websocket closed endp protection
  + JETTY-1271 handled unavailable exception
+ + JETTY-1297 Make jetty-plus.xml enable plus features for all webapps by default
  + Fix jetty-plus.xml for new configuration names
  + Added ignore to Logger interface
  + Improved debug dump

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

@@ -36,9 +36,29 @@
   </Call>
   -->
 
+
   <!-- =========================================================== -->
-  <!-- Configurations for WebAppContexts                           -->
-  <!-- Sequence of configurations to enable Plus features.         -->
+  <!-- Enabling plus feature.                                      -->
+  <!-- Choose one of the following methods. NOTE that by default   -->
+  <!-- the last method (enabled for all webapps on this Server) is -->
+  <!-- enabled.                                                    -->
+  <!--                                                             -->
+  <!-- For a single webapp:                                        -->
+  <!-- Use a context xml file to call                              -->
+  <!--  setConfigurationClasses(plusConfig).                       -->
+  <!--                                                             -->
+  <!-- For all webapps in a directory:                             -->
+  <!-- Uncomment the section entitled  "Apply plusConfig to all    -->
+  <!-- webapps in webapps-plus".                                   -->
+  <!--                                                             -->
+  <!-- For all webapps deployed via this Server instance:          -->
+  <!-- Uncomment the section entitled "Apply plusConfig to all     -->
+  <!-- webapps for this Server". NOTE: this is the default.        -->
+  <!-- =========================================================== -->
+  
+
+  <!-- =========================================================== -->
+  <!-- Sequence of configurations to defining Plus features.       -->
   <!-- =========================================================== -->
   <Array id="plusConfig" type="java.lang.String">
     <Item>org.eclipse.jetty.webapp.WebInfConfiguration</Item>
@@ -53,11 +73,12 @@
   </Array>
 
   <!-- =========================================================== -->
-  <!-- Deploy all webapps in webapps-plus                          -->
+  <!-- Apply plusConfig to all webapps in webapps-plus             -->
   <!-- =========================================================== -->
   <!-- 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!          -->
+  <!--
   <Ref id="DeploymentManager">
       <Call name="addAppProvider">
         <Arg>
@@ -73,5 +94,17 @@
         </Arg>
       </Call>
   </Ref>
+  -->
+
+  <!-- =========================================================== -->
+  <!-- Apply plusConfig to all webapps for this Server             -->
+  <!-- =========================================================== -->
+    <Call name="setAttribute">
+      <Arg>org.eclipse.jetty.webapp.configuration</Arg>
+      <Arg>
+          <Ref id="plusConfig"/>
+      </Arg>
+    </Call>
+
 </Configure>