From e89eab77f3cf67cf719e618d4bf94f7c152c02d1 Mon Sep 17 00:00:00 2001
From: Jan Bartel <jan@webtide.com>
Date: Wed, 7 Apr 2010 20:04:37 +0000
Subject: [PATCH] jetty-plus.xml was not finished being ported to jetty-7
 because it still referred to addLifeCycle instead of addBean. Also added
 AnnotationConfiguration in as part of plusConfig

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1477 7e9141cc-0065-0410-87d8-b60c137991c4
---
 VERSION.txt                                   | 2 ++
 jetty-plus/src/main/config/etc/jetty-plus.xml | 1 +
 2 files changed, 3 insertions(+)

diff --git a/VERSION.txt b/VERSION.txt
index 64e30904c23..4c5cde3159d 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -5,6 +5,8 @@ jetty-7.1-SNAPSHOT
  + 307847 Fixed combining mime type parameters
  + 307898 Handle large/async websocket messages
  + JETTY-1202 Use platform default algorithm for SecureRandom
+ + Fix jetty-plus.xml reference to addLifeCycle
+ + Add AnnotationConfiguration to jetty-plus.xml
 
 jetty-7.0.2.v20100331
  + 297552 Don't call Continuation timeouts from acceptor tick
diff --git a/jetty-plus/src/main/config/etc/jetty-plus.xml b/jetty-plus/src/main/config/etc/jetty-plus.xml
index 3a9375f3141..8aece6ab3ee 100644
--- a/jetty-plus/src/main/config/etc/jetty-plus.xml
+++ b/jetty-plus/src/main/config/etc/jetty-plus.xml
@@ -47,6 +47,7 @@
     <Item>org.eclipse.jetty.webapp.FragmentConfiguration</Item>
     <Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item>
     <Item>org.eclipse.jetty.plus.webapp.Configuration</Item>
+    <Item>org.eclipse.jetty.annotations.AnnotationConfiguration</Item>
     <Item>org.eclipse.jetty.webapp.JettyWebXmlConfiguration</Item>
     <Item>org.eclipse.jetty.webapp.TagLibConfiguration</Item>
   </Array>