Revert "Merge branch 'release-8'"

This reverts commit 9e72457941, reversing
changes made to df12605f0e.

VERSION.txt

@@ -1,17 +1,4 @@
-jetty-8.1.0-SNAPSHOT
+jetty-7.6.0-SNAPSHOT
-
-jetty-8.1.0.RC0 - 30 November 2011
- + 352565 cookie httponly flag ignored
- + 353285 ServletSecurity annotation ignored
- + 357163 jetty 8 ought to proxy jetty8 javadocs
- + 357209 JSP tag listeners not called
- + 360051 SocketConnectionTest.testServerClosedConnection is excluded.
- + 361135 Allow session cookies to NEVER be marked as secure, even on HTTPS
-   requests.
- + 362249 update shell scripts to jetty8
- + 363878 Add ecj compiler to jetty-8 for jsp
- + 364283 can't parse the servlet multipart-config for the web.xml
- + 364430 Support web.xml enabled state for servlets
 
 jetty-7.6.0.RC0 - 29 November 2011
  + Refactored NIO layer for better half close handling
@@ -43,22 +30,6 @@ jetty-7.6.0.RC0 - 29 November 2011
  + 364657 Support HTTP only cookies from standard API
  + JETTY-1442 add _hostHeader setter for ProxyRule
 
-jetty-8.0.4.v20111024 - 24 October 2011
- + 358263 JDBCSessionIdManager add setDatasource(DataSource) method
- + 358649 Replace existing StdErrLog system properties for DEBUG/IGNORED with
-   LEVEL instead.
- + 360836 Accept parameters with bad UTF-8. Use replacement character
- + 360912 CrossOriginFilter does not send Access-Control-Allow-Origin on
-   responses. 355103 Make allowCredentials default to true in
-   CrossOriginFilter.
- + 360938 Connections closed after a while.
- + 361135 secure cookies for sessions
- + 361319 Log initialization does not catch correct exceptions on all jvms
- + 361325 359292 Allow KeyStore to be set
- + 361456 release timer task on connection failed
- + 361655 ExecutorThreadPool.isLowOnThreads() returns wrong value.
- + JETTY-1444 start threadpool before selector manager
-
 jetty-7.5.4.v20111024 - 24 October 2011
  + 358263 JDBCSessionIdManager add setDatasource(DataSource) method
  + 358649 Replace existing StdErrLog system properties for DEBUG/IGNORED with
@@ -74,62 +45,6 @@ jetty-7.5.4.v20111024 - 24 October 2011
  + 361655 ExecutorThreadPool.isLowOnThreads() returns wrong value.
  + JETTY-1444 start threadpool before selector manager
 
-jetty-8.0.3.v20111011 - 11 October 2011
- + 348978 migrate jetty-http-spi
- + 358649 StdErrLog system properties for package/class logging LEVEL.
-
-jetty-8.0.2.v20111006 - 06 October 2011
- + 336443 add missing comma in DigestAuthenticator string
- + 342161 ScannerTest fails intermittently on Mac OS X
- + 346419 testing HttpClient FDs
- + 353267 Request._parameters initialization bug
- + 353509 jetty-client unit tests are running too long
- + 353627 Basic Auth checks that Basic method has been send
- + 356144 Allow SelectorManager thread priority to be set
- + 356274 Start SSL socket factory in call to open()
- + 357163 jetty 8 ought to proxy jetty8 javadocs
- + 357178 websockets draft 14 support
- + 357188 Send content buffer directly
- + 357209 JSP tag listeners not called
- + 357216 Logging via Log4J does not expand braces in format strings
- + 357240 more half close refinements
- + 357338 remove debug
- + 357672 resolve issue with serializing pojos with mongodb session manager,
-   thanks to john simone for the discovery and fix
- + 357959 Include javadoc in distribution
- + 358027 NullPointerException in ResourceHandler with jetty-stylesheet.css
- + 358035 idle time only active if > 0
- + 358147 Add catch for UnknownHostException to fix leaky file descriptor in
-   client
- + 358164 Dispatch from servlet to handler
- + 358263 add method for osgi users to register a driver as Class.forName does
-   not work for them
- + 358649 StdErrLog system properties for package/class logging LEVEL.
- + 358674 Still allows sslv3 for now
- + 358687 Updated jsp does not scan for system tlds Fixed pattern.
- + 358784 JSP broken on Java 1.5
- + 358925 bit more javadoc on usage
- + 358959 File descriptor leak with UnresolvedAddressException
- + 359309 adjust previous test for servletPath to include pathInfo
- + 359673 updated websocket version handling
- + 359675 Principal != String, fix for issue in property file login manager
- + 360051 SocketConnectionTest.testServerClosedConnection is excluded.
- + 360066 jsps referenced in web.xml <jsp-file> elements do not compile
- + JETTY-1130 Access Sessions from HashSessionIdManager
- + JETTY-1277 Fixed sendRedirect encoding of relative locations
- + JETTY-1322 idle sweeper checks for closed endp
- + JETTY-1377 extra logging for busy selector
- + JETTY-1378 new sys property for the latest jsp-impl to force the use of the
-   JDTCompiler when running in OSGi.
- + JETTY-1414 applied to PropertyUserStore
- + JETTY-1415 Start/Stop Server and Client only once in test, code format
- + JETTY-1420 Set Host header for new request in RedirectListener
- + JETTY-1421 Implement RedirectListener.onException,onConnectionFailed
- + JETTY-1423 force connection to be closed returned
- + JETTY-1430 local JNDI contexts don't carry environment
- + JETTY-1434 Add a jsp that exercises jstl.
- + JETTY-1439 space in directory installation path causes classloader problem
-
 jetty-7.5.3.v20111011 - 11 October 2011
  + 348978 migrate jetty-http-spi
  + 358649 StdErrLog system properties for package/class logging LEVEL.
@@ -145,7 +60,6 @@ jetty-7.5.2.v20111006 - 06 October 2011
  + 356274 Start SSL socket factory in call to open()
  + 357178 websockets draft 14 support
  + 357188 Send content buffer directly
- + 357209 JSP tag listeners not called
  + 357216 Logging via Log4J does not expand braces in format strings
  + 357240 more half close refinements
  + 357338 remove debug
@@ -185,18 +99,6 @@ jetty-7.5.2.v20111006 - 06 October 2011
  + JETTY-1434 Add a jsp that exercises jstl.
  + JETTY-1439 space in directory installation path causes classloader problem
 
-jetty-8.0.1.v20110908 - 08 September 2011
- + 350634 Added Resource.newResource(File)
- + 356190 fix monodb tests  for changed test api
- + 356428 removed timed waits from test
- + 356693 reduce visibility to webapp of websocket implementations
- + 356695 jetty server jars are provided for websockets
- + 356726 Instead of the sessionDestroyed called sessionCreated after
-   invalidate session
- + 356751 Add null protection to ServletContextHandler.doStop
- + 356823 correctly decode close codes.  Send not utf-8 close code.
- + 357058 Acceptor thread blocking
-
 jetty-7.5.1.v20110908 - 08 September 2011
  + 350634 Added Resource.newResource(File)
  + 356190 fix monodb tests  for changed test api
@@ -209,12 +111,6 @@ jetty-7.5.1.v20110908 - 08 September 2011
  + 356823 correctly decode close codes.  Send not utf-8 close code.
  + 357058 Acceptor thread blocking
 
-jetty-8.0.0.v20110901 - 01 September 2011
- + 352565 cookie httponly flag ignored
- + 353073 better warnings
- + 353285 ServletSecurity annotation ignored
- + 356421 Upgraded websocket to draft 13 support
-
 jetty-7.5.0.v20110901 - 01 September 2011
  + 356421 Upgraded websocket to draft 13 support
  + 353073 better warnings
@@ -249,19 +145,6 @@ jetty-7.5.0.RC1 - 19 August 2011
  + JETTY-1414 HashLoginService doesn't refresh realm if specified config
    filename is not an absolute platform specific value
 
-jetty-8.0.0.RC0 - 16 August 2011
- + Merge from jetty-7.4.3
- + Enable annotations by default
- + 352565 cookie httponly flag ignored
- + 353285 ServletSecurity annotation ignored
-
-jetty-8.0.0.M3 - 27 May 2011
- + 324505 Implement API login
- + 335500 request.getParts() throws a NullPointerException
- + 343472 isUserInRole does not prevent subsequent login call.
- + 346180 jsp-2.2 support
- + Updated to jetty-7.4.2.v20110526
-
 jetty-7.5.0.RC0 - 15 August 2011
  + 298502 Handle 200 Connect responses with no content-length
  + 347484 / - > ${/} in some paths in grant codebases
@@ -444,26 +327,6 @@ jetty-7.4.0.RC0
  + Ensure generated fragment names are unique
  + Added extra session removal test
 
-jetty-8.0.0.M2 - 16 November 2010
- + 320073 Reconsile configuration mechanism
- + 321068 JSF2 fails to initialize
- + 324493 Registration init parameter handling null check, setInitParameters
-   additive
- + 324505 Request.login method must throw ServletException if it cant login
- + 324872 allow disabling listener restriction from using *Registration
-   interfaces
- + 327416 Change meaning of @HandlesTypes in line with latest interpretation by
-   JSR315
- + 327489 Change meaning of @MultipartConfig to match servlet spec 3.0
-   maintenance release 3.0a
- + 328008 Handle update to Servlet Spec 3 Section 8.2.3.h.ii
- + 330188 Reject web-fragment.xml with same <name> as another already loaded
-   one
- + 330208 Support new wording on servlet-mapping and filter-mapping merging
-   from servlet3.0a
- + 330292 request.getParts() returns only one part when the name is the same
- + Update to jetty-7.2.1.v20101111
-
 jetty-7.3.1.v20110307 - 07 March 2011
  + 316382 Support a more strict SSL option with certificates
  + 333481 Handle UCS-4 codepoints in decode and encode
@@ -489,7 +352,9 @@ jetty-7.3.1.v20110307 - 07 March 2011
  + 338068 Leaking ConstraintMappings on redeploy
  + 338092 ProxyServlet leaks memory
  + 338607 Removed managed attributes when context is stopped
- + 338819 Externally control Deployment Manager application lifecycle
+ + 338880 Fixed failing buffer range checks
+ + 338920 Handle non existent real path directories
+ + 338961 AJP packet size
  + JETTY-1304 Allow quoted boundaries in Multipart filter
  + JETTY-1317 More elegent handling of bad URIs in requests
  + JETTY-1331 Allow alternate XML configuration processors (eg spring)
@@ -675,6 +540,7 @@ jetty-7.2.0.RC0 - 01 October 2010
  + JETTY-1245 Do not use direct buffers with NIO SSL
  + JETTY-1249 Apply max idle time to all connectors
  + JETTY-1250 Parallel start of HandlerCollection
+ + JETTY-1252 Handle more multipart transfer encodings
  + JETTY-1256 annotation and jta jars from Orbit
  + JETTY-1259 NullPointerException in JDBCSessionIdManager when invalidating
    session
@@ -702,15 +568,6 @@ jetty-7.1.6.v20100715
  + JETTY-1249 Apply max idle time to all connectors
  + JETTY-1251 Replace then close selector for JVM bugs
 
-jetty-8.0.0.M1 - 12 July 2010
- + 306350 Ensure jars excluded by ordering are not scanned for annotations
- + JETTY-1224 Change jetty-8 merge rules for fragment descriptors and
-   annotations
- + Ensure <absolute-ordering> in web.xml overrides relative <ordering> in
-   fragments
- + Ensure empty <absolute-ordering> implies exclusion of all fragments
- + Ensure servlet-api jar class inheritance hierarchy is scanned
-
 jetty-7.1.5.v20100705
  + Update ecj to 3.6 Helios release drop
  + 288194 Add blacklist/whitelist to ProxyServlet and ProxyHandler
@@ -874,9 +731,6 @@ jetty-7.1.0.RC0 - 27 April 2010
  + Fix jetty-plus.xml reference to addLifeCycle
  + JETTY-1200 SSL NIO Endpoint wraps non NIO buffers
  + JETTY-1202 Use platform default algorithm for SecureRandom
- + Merged 7.0.2.v20100331
- + Add NPE protection to ContainerInitializerConfiguration
- + Temporarily remove jetty-osgi module to clarify jsp version compatibility
  + JETTY-1212 handle long content lengths
  + JETTY-1214 avoid ISE when scavenging invalid session
  + JETTY-903 Stop both caches
@@ -1023,18 +877,9 @@ jetty-7.0.2.RC0
  + Added IPAccessHandler
  + Updated Servlet3Continuation to final 3.0.20100224
  + 305997 Coalesce buffers in ChannelEndPoint.flush()
- + 306028 Enable TCP_NODELAY by default in client connectors <<<<<<< HEAD
+ + 306028 Enable TCP_NODELAY by default in client connectors
-
-jetty-8.0.0.M0 - 28 February 2010
- + Updated servlet 3.0 spec 20100224
- + Merged 7.0.1.v20091116
- + Updated to cometd 1.0.1
 
 jetty-7.0.1.v20091125 - 25 November 2009
- + =======
-
-jetty-7.0.1.v20091125 - 25 November 2009
- + >>>>>>> origin/master
  + 274251 DefaultServlet supports exact match mode.
  + 288401 HttpExchange.cancel() Method Unimplemented
  + 289027 deobfuscate HttpClient SSL passwords

example-async-rest/async-rest-jar/pom.xml

@@ -1,24 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <groupId>org.eclipse.jetty</groupId>
-    <artifactId>example-async-rest</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
-  </parent>  
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.eclipse.jetty.example-async-rest</groupId>
-  <artifactId>example-async-rest-jar</artifactId>
-  <packaging>jar</packaging>
-  <name>Example Async Rest :: Jar</name>
-  <dependencies>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-client</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-      <dependency>
-         <groupId>${servlet.spec.groupId}</groupId>
-         <artifactId>${servlet.spec.artifactId}</artifactId>
-         <scope>provided</scope>
-       </dependency>
-  </dependencies>
-</project>

example-async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AbstractRestServlet.java

@@ -1,116 +0,0 @@
-//========================================================================
-//Copyright 2004-2008 Mort Bay Consulting Pty. Ltd.
-//------------------------------------------------------------------------
-//Licensed under the Apache License, Version 2.0 (the "License");
-//you may not use this file except in compliance with the License.
-//You may obtain a copy of the License at 
-//http://www.apache.org/licenses/LICENSE-2.0
-//Unless required by applicable law or agreed to in writing, software
-//distributed under the License is distributed on an "AS IS" BASIS,
-//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//See the License for the specific language governing permissions and
-//limitations under the License.
-//========================================================================
-
-package org.eclipse.jetty.example.asyncrest;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.net.URLEncoder;
-import java.util.Map;
-import java.util.Queue;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Abstract Servlet implementation class AsyncRESTServlet.
- * Enquires ebay REST service for auctions by key word.
- * May be configured with init parameters: <dl>
- * <dt>appid</dt><dd>The eBay application ID to use</dd>
- * </dl>
- * Each request examines the following request parameters:<dl>
- * <dt>items</dt><dd>The keyword to search for</dd>
- * </dl>
- */
-public class AbstractRestServlet extends HttpServlet
-{
-    protected final static String __DEFAULT_APPID = "Webtide81-adf4-4f0a-ad58-d91e41bbe85";
-    protected final static String STYLE = 
-        "<style type='text/css'>"+
-        "  img.thumb:hover {height:50px}"+
-        "  img.thumb {vertical-align:text-top}"+
-        "  span.red {color: #ff0000}"+
-        "  span.green {color: #00ff00}"+
-        "  iframe {border: 0px}"+
-        "</style>";
-
-    protected final static String ITEMS_PARAM = "items";
-    protected final static String APPID_PARAM = "appid";
-
-    protected String _appid;
-
-    public void init(ServletConfig servletConfig) throws ServletException
-    {
-        if (servletConfig.getInitParameter(APPID_PARAM) == null)
-            _appid = __DEFAULT_APPID;
-        else
-            _appid = servletConfig.getInitParameter(APPID_PARAM);
-    }
-    
-    protected String restURL(String item) 
-    {
-        try
-        {
-            return ("http://open.api.ebay.com/shopping?MaxEntries=3&appid=" + _appid + 
-                    "&version=573&siteid=0&callname=FindItems&responseencoding=JSON&QueryKeywords=" + 
-                    URLEncoder.encode(item,"UTF-8"));
-        }
-        catch(Exception e)
-        {
-            throw new RuntimeException(e);
-        }
-    }
-    
-    protected String generateThumbs(Queue<Map<String,String>> results)
-    {
-        StringBuilder thumbs = new StringBuilder();
-        for (Map<String, String> m : results)
-        {
-            if (!m.containsKey("GalleryURL"))
-                continue;
-                
-            thumbs.append("<a href=\""+m.get("ViewItemURLForNaturalSearch")+"\">");
-            thumbs.append("<img class='thumb' border='1px' height='25px'"+
-                        " src='"+m.get("GalleryURL")+"'"+
-                        " title='"+m.get("Title")+"'"+
-                        "/>");
-            thumbs.append("</a>&nbsp;");
-        }
-        return thumbs.toString();
-    }
-
-    protected String ms(long nano)
-    {
-        BigDecimal dec = new BigDecimal(nano);
-        return dec.divide(new BigDecimal(1000000L)).setScale(1,RoundingMode.UP).toString();
-    }
-    
-    protected int width(long nano)
-    {
-        int w=(int)((nano+999999L)/5000000L);
-        if (w==0)
-            w=2;
-        return w;
-    }
-    
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
-    {
-        doGet(request, response);
-    }
-
-}

example-async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServlet.java

@@ -1,207 +0,0 @@
-//========================================================================
-//Copyright 2004-2008 Mort Bay Consulting Pty. Ltd.
-//------------------------------------------------------------------------
-//Licensed under the Apache License, Version 2.0 (the "License");
-//you may not use this file except in compliance with the License.
-//You may obtain a copy of the License at 
-//http://www.apache.org/licenses/LICENSE-2.0
-//Unless required by applicable law or agreed to in writing, software
-//distributed under the License is distributed on an "AS IS" BASIS,
-//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//See the License for the specific language governing permissions and
-//limitations under the License.
-//========================================================================
-
-package org.eclipse.jetty.example.asyncrest;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Map;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.servlet.AsyncContext;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.eclipse.jetty.client.ContentExchange;
-import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.util.ajax.JSON;
-
-/**
- * Servlet implementation class AsyncRESTServlet.
- * Enquires ebay REST service for auctions by key word.
- * May be configured with init parameters: <dl>
- * <dt>appid</dt><dd>The eBay application ID to use</dd>
- * </dl>
- * Each request examines the following request parameters:<dl>
- * <dt>items</dt><dd>The keyword to search for</dd>
- * </dl>
- */
-public class AsyncRestServlet extends AbstractRestServlet
-{
-    final static String RESULTS_ATTR = "org.eclipse.jetty.demo.client";
-    final static String DURATION_ATTR = "org.eclipse.jetty.demo.duration";
-    final static String START_ATTR = "org.eclispe.jetty.demo.start";
-
-    HttpClient _client;
-
-    public void init(ServletConfig servletConfig) throws ServletException
-    {
-        super.init(servletConfig);
-        
-        _client = new HttpClient();
-        _client.setConnectorType(HttpClient.CONNECTOR_SELECT_CHANNEL);
-
-        try
-        {
-            _client.start();
-        }
-        catch (Exception e)
-        {
-            throw new ServletException(e);
-        }
-    }
-
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
-    {
-        Long start=System.nanoTime();
-        
-        // Do we have results yet?
-        Queue<Map<String, String>> results = (Queue<Map<String, String>>) request.getAttribute(RESULTS_ATTR);
-        
-        // If no results, this must be the first dispatch, so send the REST request(s)
-        if (results==null)
-        {
-            // define results data structures
-            final Queue<Map<String, String>> resultsQueue = new ConcurrentLinkedQueue<Map<String,String>>();
-            request.setAttribute(RESULTS_ATTR, results=resultsQueue);
-            
-            // suspend the request
-            // This is done before scheduling async handling to avoid race of 
-            // dispatch before startAsync!
-            final AsyncContext async = request.startAsync();
-            async.setTimeout(30000);
-
-            // extract keywords to search for
-            String[] keywords=request.getParameter(ITEMS_PARAM).split(",");
-            final AtomicInteger outstanding=new AtomicInteger(keywords.length);
-            
-            // Send request each keyword
-            for (final String item:keywords)
-            {
-                _client.send(
-                        new AsyncRestRequest(item)
-                        {
-                            void onAuctionFound(Map<String,String> auction)
-                            {
-                                resultsQueue.add(auction);
-                            }
-                            void onComplete()
-                            {
-                                if (outstanding.decrementAndGet()<=0)
-                                    async.dispatch();
-                            }
-                        });
-            }
-            
-            // save timing info and return
-            request.setAttribute(START_ATTR, start);
-            request.setAttribute(DURATION_ATTR, new Long(System.nanoTime() - start));
-
-            return;
-        }
-
-        // We have results!
-        
-        // Generate the response
-        String thumbs = generateThumbs(results);
-        
-        response.setContentType("text/html");
-        PrintWriter out = response.getWriter();
-        out.println("<html><head>");
-        out.println(STYLE);
-        out.println("</head><body><small>");
-
-        long initial = (Long) request.getAttribute(DURATION_ATTR);
-        long start0 = (Long) request.getAttribute(START_ATTR);
-
-        long now = System.nanoTime();
-        long total=now-start0;
-        long generate=now-start;
-        long thread=initial+generate;
-        
-        out.print("<b>Asynchronous: "+request.getParameter(ITEMS_PARAM)+"</b><br/>");
-        out.print("Total Time: "+ms(total)+"ms<br/>");
-
-        out.print("Thread held (<span class='red'>red</span>): "+ms(thread)+"ms (" + ms(initial) + " initial + " + ms(generate) + " generate )<br/>");
-        out.print("Async wait (<span class='green'>green</span>): "+ms(total-thread)+"ms<br/>");
-        
-        out.println("<img border='0px' src='asyncrest/red.png'   height='20px' width='"+width(initial)+"px'>"+
-                    "<img border='0px' src='asyncrest/green.png' height='20px' width='"+width(total-thread)+"px'>"+
-                    "<img border='0px' src='asyncrest/red.png'   height='20px' width='"+width(generate)+"px'>");
-        
-        out.println("<hr />");
-        out.println(thumbs);
-        out.println("</small>");
-        out.println("</body></html>");
-        out.close();
-    }
-
-    private abstract class AsyncRestRequest extends ContentExchange
-    {
-        AsyncRestRequest(final String item)
-        {
-            // send the exchange
-            setMethod("GET");
-            setURL(restURL(item));   
-        }
-        
-        abstract void onAuctionFound(Map<String,String> details);
-        abstract void onComplete();
-        
-        protected void onResponseComplete() throws IOException
-        {
-            // extract auctions from the results
-            Map<String,?> query = (Map<String,?>) JSON.parse(this.getResponseContent());
-            Object[] auctions = (Object[]) query.get("Item");
-            if (auctions != null)
-            {
-                for (Object o : auctions)
-                    onAuctionFound((Map<String,String>)o);
-            }
-
-            onComplete();
-        }
-
-        /* ------------------------------------------------------------ */
-        protected void onConnectionFailed(Throwable ex)
-        {
-            getServletContext().log("onConnectionFailed: ",ex);
-            onComplete();
-        }
-
-        /* ------------------------------------------------------------ */
-        protected void onException(Throwable ex)
-        {
-            getServletContext().log("onConnectionFailed: ",ex);
-            onComplete();
-        }
-
-        /* ------------------------------------------------------------ */
-        protected void onExpire()
-        {
-            getServletContext().log("onConnectionFailed: expired");
-            onComplete();
-        }
-    }
-
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
-    {
-        doGet(request, response);
-    }
-
-}

example-async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/SerialRestServlet.java

@@ -1,102 +0,0 @@
-//========================================================================
-//Copyright 2004-2008 Mort Bay Consulting Pty. Ltd.
-//------------------------------------------------------------------------
-//Licensed under the Apache License, Version 2.0 (the "License");
-//you may not use this file except in compliance with the License.
-//You may obtain a copy of the License at 
-//http://www.apache.org/licenses/LICENSE-2.0
-//Unless required by applicable law or agreed to in writing, software
-//distributed under the License is distributed on an "AS IS" BASIS,
-//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//See the License for the specific language governing permissions and
-//limitations under the License.
-//========================================================================
-
-package org.eclipse.jetty.example.asyncrest;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Queue;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.eclipse.jetty.util.ajax.JSON;
-
-/**
- * Servlet implementation class SerialRestServlet
- */
-public class SerialRestServlet extends AbstractRestServlet
-{   
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
-    {
-        long start = System.nanoTime();
-        
-
-        String[] keywords=request.getParameter(ITEMS_PARAM).split(",");
-        Queue<Map<String,String>> results = new LinkedList<Map<String,String>>();
-        
-        // make all requests serially
-        for (String itemName : keywords)
-        {
-            URL url = new URL(restURL(itemName));
-            
-            HttpURLConnection connection = (HttpURLConnection)url.openConnection();
-            connection.setRequestMethod("GET");
-            
-            Map query = (Map)JSON.parse(new BufferedReader(new InputStreamReader(connection.getInputStream())));
-            Object[] auctions = (Object[]) query.get("Item");
-            if (auctions != null)
-            {
-                for (Object o : auctions)
-                    results.add((Map) o);
-            }
-        }
-        
-
-        // Generate the response
-        String thumbs=generateThumbs(results);
-        
-        response.setContentType("text/html");
-        PrintWriter out = response.getWriter();
-        out.println("<html><head>");
-        out.println(STYLE);
-        out.println("</head><body><small>");
-
-        long now = System.nanoTime();
-        long total=now-start;
-
-        out.print("<b>Blocking: "+request.getParameter(ITEMS_PARAM)+"</b><br/>");
-        out.print("Total Time: "+ms(total)+"ms<br/>");
-        out.print("Thread held (<span class='red'>red</span>): "+ms(total)+"ms<br/>");
-        
-        out.println("<img border='0px' src='asyncrest/red.png'   height='20px' width='"+width(total)+"px'>");
-        
-        out.println("<hr />");
-        out.println(thumbs);
-        out.println("</small>");
-        out.println("</body></html>");
-        out.close();
-        
-        
-
-    }
-
-    /**
-     * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse
-     *      response)
-     */
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
-    {
-        doGet(request, response);
-    }
-
-}

example-async-rest/async-rest-jar/src/main/resources/META-INF/resources/asyncrest.html

@@ -1,38 +0,0 @@
-<html>
- <head>
-  <style type='text/css'>
-    iframe {border: 0px}
-    table, tr, td {border: 0px}
-  </style>
-</head>
-<body>
-<h1>Blocking vs Asynchronous REST</h1>
-<p>
-This demo calls the EBay WS API both synchronously and asynchronously,
-to obtain items matching each of the keywords passed on the query
-string.  The time the request thread is head is displayed for both.
-</p>
-
-<table width='100%'>
-	
-<tr>
-<td>
-  <iframe id="f1" width='100%' height='175px' src="testSerial?items=kayak"></iframe>
-</td>
-<td>
-  <iframe id="f3" width='100%' height='175px' src="testSerial?items=mouse,beer,gnome"></iframe>
-</td>
-</tr>
- 
-<tr>
-<td>
-  <iframe id="f2" width='100%' height='175px' src="testAsync?items=kayak"/></iframe>
-</td>
-<td>
-  <iframe id="f4" width='100%' height='175px' src="testAsync?items=mouse,beer,gnome"/></iframe>
-</td>
-</tr>
-
-</table>
-</body>
-</html>

example-async-rest/async-rest-jar/src/main/resources/META-INF/web-fragment.xml

@@ -1,22 +0,0 @@
-<web-fragment>
-	<servlet>
-		<display-name>SerialRestServlet</display-name>
-		<servlet-name>SerialRestServlet</servlet-name>
-		<servlet-class>org.eclipse.jetty.example.asyncrest.SerialRestServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>SerialRestServlet</servlet-name>
-		<url-pattern>/testSerial</url-pattern>
-	</servlet-mapping>
-	
-	<servlet>
-		<display-name>AsyncRestServlet</display-name>
-		<servlet-name>AsyncRestServlet</servlet-name>
-		<servlet-class>org.eclipse.jetty.example.asyncrest.AsyncRestServlet</servlet-class>
-		<async-supported>true</async-supported>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>AsyncRestServlet</servlet-name>
-		<url-pattern>/testAsync</url-pattern>
-	</servlet-mapping>	
-</web-fragment>

example-async-rest/async-rest-webapp/pom.xml

@@ -1,33 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <groupId>org.eclipse.jetty</groupId>
-    <artifactId>example-async-rest</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
-  </parent>  
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.eclipse.jetty.example-async-rest</groupId>
-  <artifactId>example-async-rest-webapp</artifactId>
-  <packaging>war</packaging>
-  <name>Example Async Rest :: Webapp</name>
-  <build>
-    <finalName>async-rest</finalName>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.eclipse.jetty.example-async-rest</groupId>
-      <artifactId>example-async-rest-jar</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-webapp</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-      <dependency>
-         <groupId>${servlet.spec.groupId}</groupId>
-         <artifactId>${servlet.spec.artifactId}</artifactId>
-         <scope>provided</scope>
-       </dependency>
-  </dependencies>
-</project>

example-async-rest/async-rest-webapp/src/main/webapp/META-INF/MANIFEST.MF

@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-

example-async-rest/async-rest-webapp/src/main/webapp/WEB-INF/web.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" 
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" 
-   version="3.0">
-
-	<display-name>Async REST Webservice Example</display-name>
-
-</web-app>

example-async-rest/async-rest-webapp/src/main/webapp/index.html

@@ -1,38 +0,0 @@
-<html>
- <head>
-  <style type='text/css'>
-    iframe {border: 0px}
-    table, tr, td {border: 0px}
-  </style>
-</head>
-<body>
-<h1>Blocking vs Asynchronous REST</h1>
-<p>
-This demo calls the EBay WS API both synchronously and asynchronously,
-to obtain items matching each of the keywords passed on the query
-string.  The time the request thread is head is displayed for both.
-</p>
-
-<table width='100%'>
-	
-<tr>
-<td>
-  <iframe id="f1" width='100%' height='175px' src="testSerial?items=kayak"></iframe>
-</td>
-<td>
-  <iframe id="f3" width='100%' height='175px' src="testSerial?items=mouse,beer,gnome"></iframe>
-</td>
-</tr>
- 
-<tr>
-<td>
-  <iframe id="f2" width='100%' height='175px' src="testAsync?items=kayak"/></iframe>
-</td>
-<td>
-  <iframe id="f4" width='100%' height='175px' src="testAsync?items=mouse,beer,gnome"/></iframe>
-</td>
-</tr>
-
-</table>
-</body>
-</html>

example-async-rest/async-rest-webapp/src/test/java/org/eclipse/jetty/example/asyncrest/DemoServer.java

@@ -1,30 +0,0 @@
-package org.eclipse.jetty.example.asyncrest;
-
-import org.eclipse.jetty.server.Connector;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
-import org.eclipse.jetty.webapp.WebAppContext;
-
-public class DemoServer
-{
-    public static void main(String[] args)
-        throws Exception
-    {
-        String jetty_home = System.getProperty("jetty.home",".");
-
-        Server server = new Server();
-        
-        Connector connector=new SelectChannelConnector();
-        connector.setPort(Integer.getInteger("jetty.port",8080).intValue());
-        server.setConnectors(new Connector[]{connector});
-        
-        WebAppContext webapp = new WebAppContext();
-        webapp.setContextPath("/");
-        webapp.setWar(jetty_home+"/target/example-async-rest-webapp-8.0.0.M0-SNAPSHOT");
-        
-        server.setHandler(webapp);
-        
-        server.start();
-        server.join();
-    }
-}

example-async-rest/pom.xml

@@ -1,16 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <groupId>org.eclipse.jetty</groupId>
-    <artifactId>jetty-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
-  </parent>  
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.eclipse.jetty</groupId>
-  <artifactId>example-async-rest</artifactId>
-  <packaging>pom</packaging>
-  <name>Example Async Rest</name>
-  <modules>
-    <module>async-rest-jar</module>
-    <module>async-rest-webapp</module>
-  </modules>
-</project>

example-jetty-embedded/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>example-jetty-embedded</artifactId>

example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java

@@ -135,7 +135,7 @@ public class LikeJettyXml
         webapp_provider.setDefaultsDescriptor(jetty_home + "/etc/webdefault.xml");
         webapp_provider.setContextXmlDir(jetty_home + "/contexts");
         deployer.addAppProvider(webapp_provider);
-
+        
         HashLoginService login = new HashLoginService();
         login.setName("Test Realm");
         login.setConfig(jetty_home + "/etc/realm.properties");

example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/ManyContexts.java

@@ -69,4 +69,5 @@ public class ManyContexts
         System.err.println(server.dump());
         server.join();
     }
+
 }

jetty-aggregate/jetty-all-server/pom.xml

@@ -2,10 +2,9 @@
     <parent>
         <groupId>org.eclipse.jetty.aggregate</groupId>
         <artifactId>jetty-aggregate-project</artifactId>
-        <version>8.1.0-SNAPSHOT</version>
+        <version>7.6.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.eclipse.jetty.aggregate</groupId>
     <artifactId>jetty-all-server</artifactId>
     <name>Jetty :: Aggregate :: All Server</name>
     <properties>
@@ -136,9 +135,9 @@
           <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>${servlet.spec.groupId}</groupId>
+            <groupId>javax.servlet</groupId>
-            <artifactId>${servlet.spec.artifactId}</artifactId>
+            <artifactId>servlet-api</artifactId>
-            <version>${servlet.spec.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>

jetty-aggregate/jetty-all/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.aggregate</groupId>
     <artifactId>jetty-aggregate-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-all</artifactId>
@@ -103,8 +103,12 @@
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-	  <groupId>${servlet.spec.groupId}</groupId>
+          <groupId>org.mortbay.jetty</groupId>
-	  <artifactId>${servlet.spec.artifactId}</artifactId>
+           <artifactId>servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -115,8 +119,8 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${servlet.spec.groupId}</groupId>
+      <groupId>javax.servlet</groupId>
-      <artifactId>${servlet.spec.artifactId}</artifactId>
+      <artifactId>servlet-api</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -132,8 +136,8 @@
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-	  <groupId>${servlet.spec.groupId}</groupId>
+          <groupId>javax.servlet</groupId>
-	  <artifactId>${servlet.spec.artifactId}</artifactId>
+          <artifactId>servlet-api</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.apache.geronimo.specs</groupId>
@@ -201,11 +205,6 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
-      <dependency>
-         <groupId>${servlet.spec.groupId}</groupId>
-         <artifactId>${servlet.spec.artifactId}</artifactId>
-         <scope>compile</scope>
-       </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-nested</artifactId>

jetty-aggregate/jetty-client/pom.xml

@@ -2,10 +2,9 @@
   <parent>
     <groupId>org.eclipse.jetty.aggregate</groupId>
     <artifactId>jetty-aggregate-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.eclipse.jetty.aggregate</groupId>
   <artifactId>jetty-client</artifactId>
   <name>Jetty :: Aggregate :: HTTP Client</name>
 

jetty-aggregate/jetty-plus/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.aggregate</groupId>
     <artifactId>jetty-aggregate-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-plus</artifactId>
@@ -85,8 +85,8 @@
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-	  <groupId>${servlet.spec.groupId}</groupId>
+          <groupId>javax.servlet</groupId>
-	  <artifactId>${servlet.spec.artifactId}</artifactId>
+          <artifactId>servlet-api</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.apache.geronimo.specs</groupId>
@@ -103,10 +103,9 @@
       </exclusions>
     </dependency>
     <dependency>
-       <groupId>${servlet.spec.groupId}</groupId>
+      <groupId>javax.servlet</groupId>
-       <artifactId>${servlet.spec.artifactId}</artifactId>
+      <artifactId>servlet-api</artifactId>
-       <version>${servlet.spec.version}</version>
+      <scope>compile</scope>
-       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>

jetty-aggregate/jetty-server/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.aggregate</groupId>
     <artifactId>jetty-aggregate-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-server</artifactId>
@@ -85,20 +85,21 @@
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-	  <groupId>${servlet.spec.groupId}</groupId>
+          <groupId>javax.servlet</groupId>
-	  <artifactId>${servlet.spec.artifactId}</artifactId>
+          <artifactId>servlet-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-       <groupId>${servlet.spec.groupId}</groupId>
-       <artifactId>${servlet.spec.artifactId}</artifactId>
-     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-websocket</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>

jetty-aggregate/jetty-servlet/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.aggregate</groupId>
     <artifactId>jetty-aggregate-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-servlet</artifactId>
@@ -85,15 +85,16 @@
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-	  <groupId>${servlet.spec.groupId}</groupId>
+          <groupId>javax.servlet</groupId>
-	  <artifactId>${servlet.spec.artifactId}</artifactId>
+          <artifactId>servlet-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
-      <dependency>
+    <dependency>
-         <groupId>${servlet.spec.groupId}</groupId>
+      <groupId>javax.servlet</groupId>
-         <artifactId>${servlet.spec.artifactId}</artifactId>
+      <artifactId>servlet-api</artifactId>
-       </dependency>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-websocket</artifactId>

jetty-aggregate/jetty-webapp/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.aggregate</groupId>
     <artifactId>jetty-aggregate-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-webapp</artifactId>
@@ -85,15 +85,15 @@
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-	  <groupId>${servlet.spec.groupId}</groupId>
+          <groupId>javax.servlet</groupId>
-	  <artifactId>${servlet.spec.artifactId}</artifactId>
+          <artifactId>servlet-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
-      <dependency>
+    <dependency>
-         <groupId>${servlet.spec.groupId}</groupId>
+      <groupId>javax.servlet</groupId>
-         <artifactId>${servlet.spec.artifactId}</artifactId>
+      <artifactId>servlet-api</artifactId>
-         <scope>compile</scope>
+      <scope>compile</scope>
-       </dependency>
+    </dependency>
   </dependencies>
 </project>

jetty-aggregate/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jetty.aggregate</groupId>
   <artifactId>jetty-aggregate-project</artifactId>

jetty-ajp/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-ajp</artifactId>

jetty-ajp/src/main/java/org/eclipse/jetty/ajp/Ajp13SocketConnector.java

@@ -36,10 +36,10 @@ public class Ajp13SocketConnector extends SocketConnector
     static boolean __allowShutdown = false;
     public Ajp13SocketConnector()
     {
-        super.setRequestHeaderSize(Ajp13Packet.MAX_DATA_SIZE);
+        super.setRequestHeaderSize(Ajp13Packet.MAX_PACKET_SIZE);
-        super.setResponseHeaderSize(Ajp13Packet.MAX_DATA_SIZE);
+        super.setResponseHeaderSize(Ajp13Packet.MAX_PACKET_SIZE);
-        super.setRequestBufferSize(Ajp13Packet.MAX_DATA_SIZE);
+        super.setRequestBufferSize(Ajp13Packet.MAX_PACKET_SIZE);
-        super.setResponseBufferSize(Ajp13Packet.MAX_DATA_SIZE);
+        super.setResponseBufferSize(Ajp13Packet.MAX_PACKET_SIZE);
         // IN AJP protocol the socket stay open, so
         // by default the time out is set to 0 seconds
         super.setMaxIdleTime(0);

jetty-annotations/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-annotations</artifactId>
@@ -13,23 +13,6 @@
   </properties>
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptorRefs>
-                <descriptorRef>config</descriptorRef>
-              </descriptorRefs>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -42,7 +25,7 @@
             </goals>
             <configuration>
               <instructions>
-                <Import-Package>javax.servlet.*;version="3.0",*</Import-Package>
+                <Import-Package>javax.servlet.*;version="[2.5,3.0)",*</Import-Package>
               </instructions>
             </configuration>
           </execution>

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

@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-    <!-- ================================================================= -->
-    <!-- Enable annotations - configure deployment steps for every web app -->
-    <!-- ================================================================= -->
-    <Call name="setAttribute">
-      <Arg>org.eclipse.jetty.webapp.configuration</Arg>
-      <Arg>
-          <Array type="java.lang.String">
-               <Item>org.eclipse.jetty.webapp.WebInfConfiguration</Item>
-               <Item>org.eclipse.jetty.webapp.WebXmlConfiguration</Item>
-               <Item>org.eclipse.jetty.webapp.MetaInfConfiguration</Item>
-               <Item>org.eclipse.jetty.webapp.FragmentConfiguration</Item>
-               <Item>org.eclipse.jetty.annotations.AnnotationConfiguration</Item>
-               <Item>org.eclipse.jetty.webapp.JettyWebXmlConfiguration</Item>
-          </Array>
-      </Arg>
-    </Call>
-
-</Configure>

jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java

@@ -13,32 +13,8 @@
 
 package org.eclipse.jetty.annotations;
 
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ServiceLoader;
-import java.util.Set;
-
-import javax.servlet.ServletContainerInitializer;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.HandlesTypes;
-
-
-import org.eclipse.jetty.annotations.AnnotationParser.DiscoverableAnnotationHandler;
-import org.eclipse.jetty.plus.annotation.ContainerInitializer;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
-import org.eclipse.jetty.util.resource.Resource;
-import org.eclipse.jetty.webapp.Configuration;
 import org.eclipse.jetty.webapp.AbstractConfiguration;
-import org.eclipse.jetty.webapp.Descriptor;
-import org.eclipse.jetty.webapp.DiscoveredAnnotation;
-import org.eclipse.jetty.webapp.FragmentDescriptor;
-import org.eclipse.jetty.webapp.MetaDataComplete;
 import org.eclipse.jetty.webapp.WebAppContext;
-import org.eclipse.jetty.webapp.WebDescriptor;
 
 /**
  * Configuration for Annotations
@@ -47,401 +23,15 @@ import org.eclipse.jetty.webapp.WebDescriptor;
  */
 public class AnnotationConfiguration extends AbstractConfiguration
 {
-    private static final Logger LOG = Log.getLogger(AnnotationConfiguration.class);
-    public static final String CLASS_INHERITANCE_MAP  = "org.eclipse.jetty.classInheritanceMap";    
-    public static final String CONTAINER_INITIALIZERS = "org.eclipse.jetty.containerInitializers";
-    
-    
-    public void preConfigure(final WebAppContext context) throws Exception
-    {
-    }
-   
     @Override
     public void configure(WebAppContext context) throws Exception
-    {
+    {      
-       boolean metadataComplete = context.getMetaData().isMetaDataComplete();
        context.addDecorator(new AnnotationDecorator(context));   
-      
-       
-       //Even if metadata is complete, we still need to scan for ServletContainerInitializers - if there are any
-       AnnotationParser parser = null;
-       if (!metadataComplete)
-       {
-           //If metadata isn't complete, if this is a servlet 3 webapp or isConfigDiscovered is true, we need to search for annotations
-           if (context.getServletContext().getEffectiveMajorVersion() >= 3 || context.isConfigurationDiscovered())
-           {
-               parser = createAnnotationParser();
-               parser.registerAnnotationHandler("javax.servlet.annotation.WebServlet", new WebServletAnnotationHandler(context));
-               parser.registerAnnotationHandler("javax.servlet.annotation.WebFilter", new WebFilterAnnotationHandler(context));
-               parser.registerAnnotationHandler("javax.servlet.annotation.WebListener", new WebListenerAnnotationHandler(context));
-           }
-       }
-       else
-           if (LOG.isDebugEnabled()) LOG.debug("Metadata-complete==true,  not processing discoverable servlet annotations for context "+context);
-       
-       
-       
-       //Regardless of metadata, if there are any ServletContainerInitializers with @HandlesTypes, then we need to scan all the
-       //classes so we can call their onStartup() methods correctly
-       List<ServletContainerInitializer> nonExcludedInitializers = getNonExcludedInitializers(context);
-       parser = registerServletContainerInitializerAnnotationHandlers(context, parser, nonExcludedInitializers);
-       
-       if (parser != null)
-       {           
-           if (LOG.isDebugEnabled()) LOG.debug("Scanning all classses for annotations: webxmlVersion="+context.getServletContext().getEffectiveMajorVersion()+" configurationDiscovered="+context.isConfigurationDiscovered());
-           parseContainerPath(context, parser);
-           //email from Rajiv Mordani jsrs 315 7 April 2010
-           //    If there is a <others/> then the ordering should be 
-           //          WEB-INF/classes the order of the declared elements + others.
-           //    In case there is no others then it is 
-           //          WEB-INF/classes + order of the elements.
-           parseWebInfClasses(context, parser);
-           parseWebInfLib (context, parser);
-       }
     }
-    
+
-    
-    
-    /**
-     * @return a new AnnotationParser. This method can be overridden to use a different impleemntation of
-     * the AnnotationParser. Note that this is considered internal API.
-     */
-    protected AnnotationParser createAnnotationParser()
-    {
-        return new AnnotationParser();
-    }
-    
     @Override
     public void cloneConfigure(WebAppContext template, WebAppContext context) throws Exception
     {
         context.addDecorator(new AnnotationDecorator(context));   
     }
-    
-    
-
-
-    public AnnotationParser registerServletContainerInitializerAnnotationHandlers (WebAppContext context, AnnotationParser parser, List<ServletContainerInitializer> scis)
-    throws Exception
-    {     
-        
-        //TODO verify my interpretation of the spec. That is, that metadata-complete has nothing
-        //to do with finding the ServletContainerInitializers, classes designated to be of interest to them,
-        //or even calling them on startup. 
-        
-        //Get all ServletContainerInitializers, and check them for HandlesTypes annotations.
-        //For each class in the HandlesTypes value, if it IS an annotation, register a handler
-        //that will record the classes that have that annotation.
-        //If it is NOT an annotation, then we will interrogate the type hierarchy discovered during
-        //parsing later on to find the applicable classes.
-        
-        if (scis == null || scis.isEmpty())
-            return parser; // nothing to do
-
-        ServletContainerInitializerListener listener = new ServletContainerInitializerListener();
-        listener.setWebAppContext(context);
-        context.addEventListener(listener);
-  
-        //may need to add a listener
-        
-        ArrayList<ContainerInitializer> initializers = new ArrayList<ContainerInitializer>();
-        context.setAttribute(CONTAINER_INITIALIZERS, initializers);
-
-        for (ServletContainerInitializer service : scis)
-        {
-            HandlesTypes annotation = service.getClass().getAnnotation(HandlesTypes.class);
-            ContainerInitializer initializer = new ContainerInitializer();
-            initializer.setTarget(service);
-            initializers.add(initializer);
-            if (annotation != null)
-            {
-                //There is a HandlesTypes annotation on the on the ServletContainerInitializer
-                Class[] classes = annotation.value();
-                if (classes != null)
-                {
-                    initializer.setInterestedTypes(classes);
-                    
-                    //We need to create a parser if we haven't already
-                    if (parser == null)
-                        parser = createAnnotationParser();
-                    
-                    //If we haven't already done so, we need to register a handler that will
-                    //process the whole class hierarchy
-                    if (context.getAttribute(CLASS_INHERITANCE_MAP) == null)
-                    {
-                        ClassInheritanceHandler classHandler = new ClassInheritanceHandler();
-                        context.setAttribute(CLASS_INHERITANCE_MAP, classHandler.getMap());
-                        parser.registerClassHandler(classHandler);
-                    }
-                                     
-                    for (Class c: classes)
-                    {
-                        //The value of one of the HandlesTypes classes is actually an Annotation itself so
-                        //register a handler for it
-                        if (c.isAnnotation())
-                        {
-                            if (LOG.isDebugEnabled()) LOG.debug("Registering annotation handler for "+c.getName());
-                           
-                            parser.registerAnnotationHandler(c.getName(), new ContainerInitializerAnnotationHandler(initializer, c));
-                        }
-                    }
-                }
-                else
-                    if (LOG.isDebugEnabled()) LOG.debug("No classes in HandlesTypes on initializer "+service.getClass());
-            }
-            else
-                if (LOG.isDebugEnabled()) LOG.debug("No annotation on initializer "+service.getClass());
-        }
-        
-        //return the parser in case we lazily created it
-        return parser;
-    }
-
-    
-    
-    
-    
-    
-    /**
-     * Check to see if the ServletContainerIntializer loaded via the ServiceLoader came
-     * from a jar that is excluded by the fragment ordering. See ServletSpec 3.0 p.85.
-     * @param orderedJars
-     * @param service
-     * @return
-     */
-    public boolean isFromExcludedJar (WebAppContext context, ServletContainerInitializer service)
-    throws Exception
-    {
-        List<Resource> orderedJars = context.getMetaData().getOrderedWebInfJars();
-
-        //If no ordering, nothing is excluded
-        if (context.getMetaData().getOrdering() == null)
-            return false;
-
-        //there is an ordering, but there are no jars resulting from the ordering, everything excluded
-        if (orderedJars.isEmpty())
-            return true; 
-
-        String loadingJarName = Thread.currentThread().getContextClassLoader().getResource(service.getClass().getName().replace('.','/')+".class").toString();
-
-        int i = loadingJarName.indexOf(".jar");  
-        if (i < 0)
-            return false; //not from a jar therefore not from WEB-INF so not excludable
-
-        loadingJarName = loadingJarName.substring(0,i+4);
-        loadingJarName = (loadingJarName.startsWith("jar:")?loadingJarName.substring(4):loadingJarName);
-        URI loadingJarURI = Resource.newResource(loadingJarName).getURI();
-        boolean found = false;
-        Iterator<Resource> itor = orderedJars.iterator();
-        while (!found && itor.hasNext())
-        {
-            Resource r = itor.next();         
-            found = r.getURI().equals(loadingJarURI);
-        }
-
-        return !found;
-    }
-   
-    
-    
-    public List<ServletContainerInitializer>  getNonExcludedInitializers (WebAppContext context)
-    throws Exception
-    {
-        List<ServletContainerInitializer> nonExcludedInitializers = new ArrayList<ServletContainerInitializer>();
-        
-        //We use the ServiceLoader mechanism to find the ServletContainerInitializer classes to inspect
-        ServiceLoader<ServletContainerInitializer> loadedInitializers = ServiceLoader.load(ServletContainerInitializer.class, context.getClassLoader());
-       
-        if (loadedInitializers != null)
-        {  
-            for (ServletContainerInitializer service : loadedInitializers)
-            {
-                if (!isFromExcludedJar(context, service))
-                    nonExcludedInitializers.add(service);
-            }
-        }
-        return nonExcludedInitializers;
-    }
-    
-    
-    
-    
-    public void parseContainerPath (final WebAppContext context, final AnnotationParser parser)
-    throws Exception
-    {
-        //if no pattern for the container path is defined, then by default scan NOTHING
-        LOG.debug("Scanning container jars");
-        
-        //clear any previously discovered annotations
-        clearAnnotationList(parser.getAnnotationHandlers());       
-        
-        //Convert from Resource to URI
-        ArrayList<URI> containerUris = new ArrayList<URI>();
-        for (Resource r : context.getMetaData().getOrderedContainerJars())
-        {
-            URI uri = r.getURI();
-                containerUris.add(uri);          
-        }
-        
-        parser.parse (containerUris.toArray(new URI[containerUris.size()]),
-                new ClassNameResolver ()
-                {
-                    public boolean isExcluded (String name)
-                    {
-                        if (context.isSystemClass(name)) return false;
-                        if (context.isServerClass(name)) return true;
-                        return false;
-                    }
-
-                    public boolean shouldOverride (String name)
-                    { 
-                        //looking at system classpath
-                        if (context.isParentLoaderPriority())
-                            return true;
-                        return false;
-                    }
-                });
-        
-        //gather together all annotations discovered
-        List<DiscoveredAnnotation> annotations = new ArrayList<DiscoveredAnnotation>();
-        gatherAnnotations(annotations, parser.getAnnotationHandlers());
-
-        context.getMetaData().addDiscoveredAnnotations(annotations);           
-    }
-    
-    
-    public void parseWebInfLib (final WebAppContext context, final AnnotationParser parser)
-    throws Exception
-    {  
-        List<FragmentDescriptor> frags = context.getMetaData().getFragments();
-        
-        //email from Rajiv Mordani jsrs 315 7 April 2010
-        //jars that do not have a web-fragment.xml are still considered fragments
-        //they have to participate in the ordering
-        ArrayList<URI> webInfUris = new ArrayList<URI>();
-        
-        List<Resource> jars = context.getMetaData().getOrderedWebInfJars();
-        
-        //No ordering just use the jars in any order
-        if (jars == null || jars.isEmpty())
-            jars = context.getMetaData().getWebInfJars();
-   
-        for (Resource r : jars)
-        {          
-            //clear any previously discovered annotations from handlers
-            clearAnnotationList(parser.getAnnotationHandlers());
-
-            
-            URI uri  = r.getURI();
-            FragmentDescriptor f = getFragmentFromJar(r, frags);
-           
-            //if a jar has no web-fragment.xml we scan it (because it is not exluded by the ordering)
-            //or if it has a fragment we scan it if it is not metadata complete
-            if (f == null || !isMetaDataComplete(f))
-            {
-                parser.parse(uri, 
-                             new ClassNameResolver()
-                             {
-                                 public boolean isExcluded (String name)
-                                 {    
-                                     if (context.isSystemClass(name)) return true;
-                                     if (context.isServerClass(name)) return false;
-                                     return false;
-                                 }
-
-                                 public boolean shouldOverride (String name)
-                                 {
-                                    //looking at webapp classpath, found already-parsed class of same name - did it come from system or duplicate in webapp?
-                                    if (context.isParentLoaderPriority())
-                                        return false;
-                                    return true;
-                                 }
-                             });  
-                List<DiscoveredAnnotation> annotations = new ArrayList<DiscoveredAnnotation>();
-                gatherAnnotations(annotations, parser.getAnnotationHandlers());
-                context.getMetaData().addDiscoveredAnnotations(r, annotations);
-            }
-        }
-    }
-     
-    public void parseWebInfClasses (final WebAppContext context, final AnnotationParser parser)
-    throws Exception
-    {
-        LOG.debug("Scanning classes in WEB-INF/classes");
-        if (context.getWebInf() != null)
-        {
-            Resource classesDir = context.getWebInf().addPath("classes/");
-            if (classesDir.exists())
-            {
-                clearAnnotationList(parser.getAnnotationHandlers());
-                parser.parse(classesDir, 
-                             new ClassNameResolver()
-                {
-                    public boolean isExcluded (String name)
-                    {
-                        if (context.isSystemClass(name)) return true;
-                        if (context.isServerClass(name)) return false;
-                        return false;
-                    }
-
-                    public boolean shouldOverride (String name)
-                    {
-                        //looking at webapp classpath, found already-parsed class of same name - did it come from system or duplicate in webapp?
-                        if (context.isParentLoaderPriority())
-                            return false;
-                        return true;
-                    }
-                });
-                
-                //TODO - where to set the annotations discovered from WEB-INF/classes?    
-                List<DiscoveredAnnotation> annotations = new ArrayList<DiscoveredAnnotation>();
-                gatherAnnotations(annotations, parser.getAnnotationHandlers());
-                context.getMetaData().addDiscoveredAnnotations (annotations);
-            }
-        }
-    }
-    
- 
-    
-    public FragmentDescriptor getFragmentFromJar (Resource jar,  List<FragmentDescriptor> frags)
-    throws Exception
-    {
-        //check if the jar has a web-fragment.xml
-        FragmentDescriptor d = null;
-        for (FragmentDescriptor frag: frags)
-        {
-            Resource fragResource = frag.getResource(); //eg jar:file:///a/b/c/foo.jar!/META-INF/web-fragment.xml
-            if (Resource.isContainedIn(fragResource,jar))
-            {
-                d = frag;
-                break;
-            }
-        }
-        return d;
-    }
-    
-    public boolean isMetaDataComplete (WebDescriptor d)
-    {
-        return (d!=null && d.getMetaDataComplete() == MetaDataComplete.True);
-    }
-    
-    protected void clearAnnotationList (List<DiscoverableAnnotationHandler> handlers)
-    {
-        if (handlers == null)
-            return;
-        
-        for (DiscoverableAnnotationHandler h:handlers)
-        {
-            if (h instanceof AbstractDiscoverableAnnotationHandler)
-                ((AbstractDiscoverableAnnotationHandler)h).resetList();
-        }
-    }
-
-    protected void gatherAnnotations (List<DiscoveredAnnotation> annotations, List<DiscoverableAnnotationHandler> handlers)
-    {
-        for (DiscoverableAnnotationHandler h:handlers)
-        {
-            if (h instanceof AbstractDiscoverableAnnotationHandler)
-                annotations.addAll(((AbstractDiscoverableAnnotationHandler)h).getAnnotationList());
-        }
-    }
 }

jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationDecorator.java

@@ -45,8 +45,6 @@ public class AnnotationDecorator implements Decorator
         _introspector.registerHandler(new PostConstructAnnotationHandler(context));
         _introspector.registerHandler(new PreDestroyAnnotationHandler(context));
         _introspector.registerHandler(new DeclareRolesAnnotationHandler(context));
-        _introspector.registerHandler(new MultiPartConfigAnnotationHandler(context));
-        _introspector.registerHandler(new ServletSecurityAnnotationHandler(context));
     }
 
     /* ------------------------------------------------------------ */

jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java

@@ -639,11 +639,10 @@ public class AnnotationParser
         parse(uris, resolver);
     }
 
-    protected void scanClass (InputStream is)
+    private void scanClass (InputStream is)
     throws IOException
     {
         ClassReader reader = new ClassReader(is);
         reader.accept(new MyClassVisitor(), ClassReader.SKIP_CODE|ClassReader.SKIP_DEBUG|ClassReader.SKIP_FRAMES);
     }
 }
-

jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ContainerInitializerAnnotationHandler.java

@@ -1,67 +0,0 @@
-// ========================================================================
-// Copyright (c) 2006-2009 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-// The Eclipse Public License is available at 
-// http://www.eclipse.org/legal/epl-v10.html
-// The Apache License v2.0 is available at
-// http://www.opensource.org/licenses/apache2.0.php
-// You may elect to redistribute this code under either of these licenses. 
-// ========================================================================
-
-
-package org.eclipse.jetty.annotations;
-
-import java.util.List;
-
-import javax.servlet.annotation.HandlesTypes;
-
-import org.eclipse.jetty.annotations.AnnotationParser.DiscoverableAnnotationHandler;
-import org.eclipse.jetty.annotations.AnnotationParser.Value;
-import org.eclipse.jetty.plus.annotation.ContainerInitializer;
-import org.eclipse.jetty.util.Loader;
-import org.eclipse.jetty.util.log.Log;
-
-/**
- * ContainerInitializerAnnotationHandler
- *
- *  Discovers classes that contain the specified annotation, either at class or
- *  method level. The specified annotation is derived from an @HandlesTypes on
- *  a ServletContainerInitializer class. 
- */
-public class ContainerInitializerAnnotationHandler implements DiscoverableAnnotationHandler
-{
-    ContainerInitializer _initializer;
-    Class _annotation;
-
-    public ContainerInitializerAnnotationHandler (ContainerInitializer initializer, Class annotation)
-    {
-        _initializer = initializer;
-        _annotation = annotation;
-    }
-    
-    /** 
-     * Handle finding a class that is annotated with the annotation we were constructed with.
-     * @see org.eclipse.jetty.annotations.AnnotationParser.DiscoverableAnnotationHandler#handleClass(java.lang.String, int, int, java.lang.String, java.lang.String, java.lang.String[], java.lang.String, java.util.List)
-     */
-    public void handleClass(String className, int version, int access, String signature, String superName, String[] interfaces, String annotationName,
-                            List<Value> values)
-    { 
-         _initializer.addAnnotatedTypeName(className);
-    }
-
-    public void handleField(String className, String fieldName, int access, String fieldType, String signature, Object value, String annotation,
-                            List<Value> values)
-    {
-       _initializer.addAnnotatedTypeName(className);
-    }
-
-    public void handleMethod(String className, String methodName, int access, String params, String signature, String[] exceptions, String annotation,
-                             List<Value> values)
-    {
-       _initializer.addAnnotatedTypeName(className);
-    }
-
-}

jetty-annotations/src/main/java/org/eclipse/jetty/annotations/MultiPartConfigAnnotationHandler.java

@@ -1,90 +0,0 @@
-// ========================================================================
-// Copyright (c) 2006-2009 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-// The Eclipse Public License is available at 
-// http://www.eclipse.org/legal/epl-v10.html
-// The Apache License v2.0 is available at
-// http://www.opensource.org/licenses/apache2.0.php
-// You may elect to redistribute this code under either of these licenses. 
-// ========================================================================
-
-package org.eclipse.jetty.annotations;
-
-import javax.servlet.MultipartConfigElement;
-import javax.servlet.Servlet;
-import javax.servlet.annotation.MultipartConfig;
-
-import org.eclipse.jetty.annotations.AnnotationIntrospector.AbstractIntrospectableAnnotationHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.webapp.Descriptor;
-import org.eclipse.jetty.webapp.MetaData;
-import org.eclipse.jetty.webapp.WebAppContext;
-
-/**
- * MultiPartConfigAnnotationHandler
- *
- *
- */
-public class MultiPartConfigAnnotationHandler extends AbstractIntrospectableAnnotationHandler
-{
-    protected WebAppContext _context;
-
-    public MultiPartConfigAnnotationHandler(WebAppContext context)
-    {
-        //TODO verify that MultipartConfig is not inheritable
-        super(false); 
-        _context = context;
-    }
-    /** 
-     * @see org.eclipse.jetty.annotations.AnnotationIntrospector.AbstractIntrospectableAnnotationHandler#doHandle(java.lang.Class)
-     */
-    public void doHandle(Class clazz)
-    {
-        if (!Servlet.class.isAssignableFrom(clazz))
-            return;
-        
-        MultipartConfig multi = (MultipartConfig) clazz.getAnnotation(MultipartConfig.class);
-        if (multi == null)
-            return;
-        
-        MetaData metaData = _context.getMetaData();
-              
-        //TODO: The MultipartConfigElement needs to be set on the ServletHolder's Registration.
-        //How to identify the correct Servlet?  If the Servlet has no WebServlet annotation on it, does it mean that this MultipartConfig
-        //annotation applies to all declared instances in web.xml/programmatically?
-        //Assuming TRUE for now.
-
-        ServletHolder holder = getServletHolderForClass(clazz);
-        if (holder != null)
-        {
-            Descriptor d = metaData.getOriginDescriptor(holder.getName()+".servlet.multipart-config");
-            //if a descriptor has already set the value for multipart config, do not 
-            //let the annotation override it
-            if (d == null)
-            {
-                metaData.setOrigin(holder.getName()+".servlet.multipart-config");
-                holder.getRegistration().setMultipartConfig(new MultipartConfigElement(multi));
-            }
-        }
-    }
-    
-    private ServletHolder getServletHolderForClass (Class clazz)
-    {
-        ServletHolder holder = null;
-        ServletHolder[] holders = _context.getServletHandler().getServlets();
-        if (holders != null)
-        {
-            for (ServletHolder h : holders)
-            {
-                if (h.getClassName().equals(clazz.getName()))
-                {
-                    holder = h;
-                }
-            }
-        }
-        return holder;
-    }
-}

jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializerListener.java

@@ -1,140 +0,0 @@
-package org.eclipse.jetty.annotations;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import org.eclipse.jetty.annotations.AnnotationConfiguration;
-import org.eclipse.jetty.plus.annotation.ContainerInitializer;
-import org.eclipse.jetty.util.MultiMap;
-import org.eclipse.jetty.webapp.WebAppContext;
-
-// ========================================================================
-// Copyright (c) 2006-2009 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-// The Eclipse Public License is available at 
-// http://www.eclipse.org/legal/epl-v10.html
-// The Apache License v2.0 is available at
-// http://www.opensource.org/licenses/apache2.0.php
-// You may elect to redistribute this code under either of these licenses. 
-// ========================================================================
-
-/**
- * ServletContainerInitializerListener
- *
- *
- */
-public class ServletContainerInitializerListener implements ServletContextListener
-{
-    WebAppContext _context = null;
-    
-    
-    public void setWebAppContext (WebAppContext context)
-    {
-        _context = context;
-    }
-
-    /** 
-     * @see javax.servlet.ServletContextListener#contextInitialized(javax.servlet.ServletContextEvent)
-     */
-    public void contextInitialized(ServletContextEvent sce)
-    {
-        List<ContainerInitializer> initializers = (List<ContainerInitializer>)_context.getAttribute(AnnotationConfiguration.CONTAINER_INITIALIZERS);
-        MultiMap classMap = (MultiMap)_context.getAttribute(AnnotationConfiguration.CLASS_INHERITANCE_MAP);
-        
-        if (initializers != null)
-        {
-            for (ContainerInitializer i : initializers)
-            {
-                //We have already found the classes that directly have an annotation that was in the HandlesTypes
-                //annotation of the ServletContainerInitializer. For each of those classes, walk the inheritance
-                //hierarchy to find classes that extend or implement them.
-                if (i.getAnnotatedTypeNames() != null)
-                {
-                    Set<String> annotatedClassNames = new HashSet<String>(i.getAnnotatedTypeNames());
-                    for (String name : annotatedClassNames)
-                    {
-                        //add the class with the annotation
-                        i.addApplicableTypeName(name);
-                        //add the classes that inherit the annotation
-                        if (classMap != null)
-                        {
-                            List<String> implementsOrExtends = (List<String>)classMap.getValues(name);
-                            if (implementsOrExtends != null && !implementsOrExtends.isEmpty())
-                                addInheritedTypes(classMap, i, implementsOrExtends);
-                        }
-                    }
-                }
-
-
-                //Now we need to look at the HandlesTypes classes that were not annotations. We need to
-                //find all classes that extend or implement them.
-                if (i.getInterestedTypes() != null)
-                {
-                    for (Class c : i.getInterestedTypes())
-                    {
-                        if (!c.isAnnotation())
-                        {
-                            //add the classes that implement or extend the class.
-                            //TODO but not including the class itself?
-                            if (classMap != null)
-                            {
-                                List<String> implementsOrExtends = (List<String>)classMap.getValues(c.getName());
-                                if (implementsOrExtends != null && !implementsOrExtends.isEmpty())
-                                    addInheritedTypes(classMap, i, implementsOrExtends);
-                            }
-                        }
-                    }
-                }
-
-                //instantiate ServletContainerInitializers, call doStart
-                try
-                {
-                    i.callStartup(_context);
-                }
-                catch (Exception e)
-                {
-                    //OK, how do I throw an exception such that it really stops the startup sequence?
-                    e.printStackTrace();
-                }
-            }
-
-            //TODO Email from Jan Luehe 18 August: after all ServletContainerInitializers have been
-            //called, need to check to see if there are any ServletRegistrations remaining
-            //that are "preliminary" and fail the deployment if so.
-        } 
-        
-    }
-
-    
-    void addInheritedTypes (MultiMap classMap, ContainerInitializer initializer, List<String> applicableTypes)
-    {
-        for (String s : applicableTypes)
-        {
-            //add the name of the class that extends or implements
-            initializer.addApplicableTypeName(s);
-            
-            //walk the hierarchy and find all types that extend or implement it
-            List<String> implementsOrExtends = (List<String>)classMap.getValues(s);
-            if (implementsOrExtends != null && !implementsOrExtends.isEmpty())
-                addInheritedTypes (classMap, initializer, implementsOrExtends);
-        }
-    }
-    
-    
-    /** 
-     * @see javax.servlet.ServletContextListener#contextDestroyed(javax.servlet.ServletContextEvent)
-     */
-    public void contextDestroyed(ServletContextEvent sce)
-    {
-        // TODO Auto-generated method stub
-        
-    }
-
-}

jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletSecurityAnnotationHandler.java

@@ -1,293 +0,0 @@
-// ========================================================================
-// Copyright (c) 2006-2009 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-// The Eclipse Public License is available at 
-// http://www.eclipse.org/legal/epl-v10.html
-// The Apache License v2.0 is available at
-// http://www.opensource.org/licenses/apache2.0.php
-// You may elect to redistribute this code under either of these licenses. 
-// ========================================================================
-
-package org.eclipse.jetty.annotations;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.annotation.HttpConstraint;
-import javax.servlet.annotation.HttpMethodConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.ServletSecurity.EmptyRoleSemantic;
-import javax.servlet.annotation.ServletSecurity.TransportGuarantee;
-
-import org.eclipse.jetty.annotations.AnnotationIntrospector.AbstractIntrospectableAnnotationHandler;
-import org.eclipse.jetty.security.ConstraintAware;
-import org.eclipse.jetty.security.ConstraintMapping;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.servlet.ServletMapping;
-import org.eclipse.jetty.util.LazyList;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
-import org.eclipse.jetty.util.security.Constraint;
-import org.eclipse.jetty.webapp.WebAppContext;
-
-/**
- * ServletSecurityAnnotationHandler
- *
- * Inspect a class to see if it has an @ServletSecurity annotation on it,
- * setting up the <security-constraint>s.
- * 
- * A servlet can be defined in:
- * <ul>
- * <li>web.xml
- * <li>web-fragment.xml
- * <li>@WebServlet annotation discovered
- * <li>ServletContext.createServlet
- * </ul>
- * 
- * The ServletSecurity annotation for a servlet should only be processed
- * iff metadata-complete == false.
- */
-public class ServletSecurityAnnotationHandler extends AbstractIntrospectableAnnotationHandler
-{
-    private static final Logger LOG = Log.getLogger(ServletSecurityAnnotationHandler.class);
-
-    private WebAppContext _context;
-    
-    public ServletSecurityAnnotationHandler(WebAppContext wac)
-    {
-        super(false);
-        _context = wac;
-    }
-    
-    /** 
-     * @see org.eclipse.jetty.annotations.AnnotationIntrospector.IntrospectableAnnotationHandler#handle(java.lang.Class)
-     */
-    public void doHandle(Class clazz)
-    {
-        if (!(_context.getSecurityHandler() instanceof ConstraintAware))
-        {
-            LOG.warn("SecurityHandler not ConstraintAware, skipping security annotation processing");
-            return;
-        }
-        
-       ServletSecurity servletSecurity = (ServletSecurity)clazz.getAnnotation(ServletSecurity.class);
-       if (servletSecurity == null)
-           return;
-       
-       //If there are already constraints defined (ie from web.xml or programmatically(?)) that match any 
-       //of the url patterns defined for this servlet, then skip the security annotation.
-      
-       List<ServletMapping> servletMappings = getServletMappings(clazz.getCanonicalName());
-       List<ConstraintMapping> constraintMappings =  ((ConstraintAware)_context.getSecurityHandler()).getConstraintMappings();
-     
-       if (constraintsExist(servletMappings, constraintMappings))
-       {
-           LOG.warn("Constraints already defined for "+clazz.getName()+", skipping ServletSecurity annotation");
-           return;
-       }
-
-       //Make a fresh list
-       constraintMappings = new ArrayList<ConstraintMapping>();
-       
-       //Get the values that form the constraints that will apply unless there are HttpMethodConstraints to augment them
-       HttpConstraint defaults = servletSecurity.value();
-
-       //Make a Constraint for the <auth-constraint> and <user-data-constraint> specified by the HttpConstraint
-       Constraint defaultConstraint = makeConstraint (clazz, 
-                                                      defaults.rolesAllowed(), 
-                                                      defaults.value(), 
-                                                      defaults.transportGuarantee());
-
-       constraintMappings.addAll(makeMethodMappings(clazz, 
-                                                    defaultConstraint, 
-                                                    servletMappings, 
-                                                    servletSecurity.httpMethodConstraints()));
-
-       //set up the security constraints produced by the annotation
-       ConstraintAware securityHandler = (ConstraintAware)_context.getSecurityHandler();
-
-       for (ConstraintMapping m:constraintMappings)
-           securityHandler.addConstraintMapping(m); 
-    }
-    
- 
-    
-    /**
-     * Make a jetty Constraint object, which represents the <auth-constraint> and
-     * <user-data-constraint> elements, based on the security annotation.
-     * @param servlet
-     * @param rolesAllowed
-     * @param permitOrDeny
-     * @param transport
-     * @return
-     */
-    protected Constraint makeConstraint (Class servlet, String[] rolesAllowed, EmptyRoleSemantic permitOrDeny, TransportGuarantee transport)
-    {  
-        Constraint constraint = new Constraint();
-        if (rolesAllowed == null || rolesAllowed.length==0)
-        {           
-           if (permitOrDeny.equals(EmptyRoleSemantic.DENY))
-           {
-               //Equivalent to <auth-constraint> with no roles
-               constraint.setName(servlet.getName()+"-Deny");
-               constraint.setAuthenticate(true);
-           }
-           else
-           {
-               //Equivalent to no <auth-constraint>
-               constraint.setAuthenticate(false);
-               constraint.setName(servlet.getName()+"-Permit");
-           }
-        }
-        else
-        {
-            //Equivalent to <auth-constraint> with list of <security-role-name>s
-            constraint.setAuthenticate(true);
-            constraint.setRoles(rolesAllowed);
-            constraint.setName(servlet.getName()+"-RolesAllowed");           
-        } 
-        
-      //Equivalent to //<user-data-constraint><transport-guarantee>CONFIDENTIAL</transport-guarantee></user-data-constraint>
-      constraint.setDataConstraint((transport.equals(TransportGuarantee.CONFIDENTIAL)?Constraint.DC_CONFIDENTIAL:Constraint.DC_NONE));
-      return constraint;
-    }
-    
-    
-    /**
-     * Make a ConstraintMapping which captures the <http-method> or <http-method-omission> elements for a particular url pattern,
-     * and relates it to a Constraint object (<auth-constraint> and <user-data-constraint>).
-     * @param constraint
-     * @param url
-     * @param method
-     * @param omissions
-     * @return
-     */
-    protected ConstraintMapping makeConstraintMapping (Constraint constraint, String url, String method, String[] omissions)
-    {
-        ConstraintMapping mapping = new ConstraintMapping();
-        mapping.setConstraint(constraint);
-        mapping.setPathSpec(url);
-        if (method != null)
-            mapping.setMethod(method);
-        if (omissions != null)
-            mapping.setMethodOmissions(omissions);
-        return mapping;
-    }
-  
-    /**
-     * Make the Jetty Constraints and ConstraintMapping objects that correspond to the HttpMethodConstraint
-     * annotations for each url pattern for the servlet.
-     * @param servlet
-     * @param defaultConstraint
-     * @param servletMappings
-     * @param annotations
-     * @return
-     */
-    protected List<ConstraintMapping> makeMethodMappings (Class servlet, Constraint defaultConstraint, List<ServletMapping> servletMappings, HttpMethodConstraint[] annotations)
-    {
-        List<ConstraintMapping> mappings = new ArrayList<ConstraintMapping>();
-        
-        //for each url-pattern existing for the servlet make a ConstraintMapping for the HttpConstraint, and ConstraintMappings for
-        //each HttpMethodConstraint
-        for (ServletMapping sm : servletMappings)
-        {
-            for (String url : sm.getPathSpecs())
-            {
-                //Make a ConstraintMapping that matches the defaultConstraint
-                ConstraintMapping defaultMapping = makeConstraintMapping(defaultConstraint, url, null, null);
-                
-                //If there are HttpMethodConstraint annotations, make a Constraint and a ConstraintMapping for it
-                if (annotations != null && annotations.length>0)
-                {    
-                    List<String> omissions = new ArrayList<String>();
-                    
-                    //for each HttpMethodConstraint annotation, make a new Constraint and ConstraintMappings for this url
-                    for (int i=0;  i < annotations.length;i++)
-                    {
-                        //Make a Constraint that captures the <auth-constraint> and <user-data-constraint> elements
-                        Constraint methodConstraint = makeConstraint(servlet, 
-                                                                     annotations[i].rolesAllowed(), 
-                                                                     annotations[i].emptyRoleSemantic(),
-                                                                     annotations[i].transportGuarantee());
-
-                        //Make ConstraintMapping that captures the <http-method> elements                        
-                        ConstraintMapping methodConstraintMapping = makeConstraintMapping (methodConstraint,
-                                                                                           url,annotations[i].value(), 
-                                                                                           null);
-                        mappings.add(methodConstraintMapping);
-                        omissions.add(annotations[i].value()); 
-                    }   
-                    defaultMapping.setMethodOmissions(omissions.toArray(new String[0]));
-                }
-
-                //add the constraint mapping containing the http-method-omissions, if there are any
-                mappings.add(defaultMapping);
-            }
-        }             
-        return mappings;
-    }
-    
-   
-    
-    /**
-     * Get the ServletMappings for the servlet's class.
-     * @param className
-     * @return
-     */
-    protected List<ServletMapping> getServletMappings(String className)
-    {
-        List<ServletMapping> results = new ArrayList<ServletMapping>();
-        ServletMapping[] mappings = _context.getServletHandler().getServletMappings();
-        for (ServletMapping mapping : mappings)
-        {
-            //Check the name of the servlet that this mapping applies to, and then find the ServletHolder for it to find it's class
-            ServletHolder holder = _context.getServletHandler().getServlet(mapping.getServletName());
-            if (holder.getClassName().equals(className))
-              results.add(mapping);
-        }
-        return results;
-    }
-    
-    
-    
-    /**
-     * Check if there are already <security-constraint> elements defined that match the url-patterns for
-     * the servlet.
-     * @param servletMappings
-     * @return
-     */
-    protected boolean constraintsExist (List<ServletMapping> servletMappings, List<ConstraintMapping> constraintMappings)
-    {
-        boolean exists = false;
-
-        //Check to see if the path spec on each constraint mapping matches a pathSpec in the servlet mappings.
-        //If it does, then we should ignore the security annotations.
-        for (ServletMapping mapping : servletMappings)
-        {  
-            //Get its url mappings
-            String[] pathSpecs = mapping.getPathSpecs();
-            if (pathSpecs == null)
-                continue;
-
-            //Check through the constraints to see if there are any whose pathSpecs (url mappings)
-            //match the servlet. If so, then we already have constraints defined for this servlet,
-            //and we will not be processing the annotation (ie web.xml or programmatic override).
-           for (int i=0; constraintMappings != null && i < constraintMappings.size() && !exists; i++)
-           {
-               for (int j=0; j < pathSpecs.length; j++)
-               {
-                   if (pathSpecs[j].equals(constraintMappings.get(i).getPathSpec()))
-                   {
-                       exists = true;
-                       break;
-                   }
-               }
-           }
-        }      
-        return exists;
-    }
-
-}

jetty-annotations/src/main/java/org/eclipse/jetty/annotations/Util.java

@@ -56,8 +56,7 @@ public class Util
                 javax.servlet.ServletRequestListener.class.isAssignableFrom(c) ||
                 javax.servlet.ServletRequestAttributeListener.class.isAssignableFrom(c) ||
                 javax.servlet.http.HttpSessionListener.class.isAssignableFrom(c) ||
-                javax.servlet.http.HttpSessionAttributeListener.class.isAssignableFrom(c) ||
+                javax.servlet.http.HttpSessionAttributeListener.class.isAssignableFrom(c))
-                javax.servlet.AsyncListener.class.isAssignableFrom(c))
 
                 isServlet=true;
         

jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebFilterAnnotation.java

@@ -1,212 +0,0 @@
-// ========================================================================
-// Copyright (c) 2010 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-// The Eclipse Public License is available at 
-// http://www.eclipse.org/legal/epl-v10.html
-// The Apache License v2.0 is available at
-// http://www.opensource.org/licenses/apache2.0.php
-// You may elect to redistribute this code under either of these licenses. 
-// ========================================================================
-
-package org.eclipse.jetty.annotations;
-
-import java.util.ArrayList;
-import java.util.EnumSet;
-
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.annotation.WebInitParam;
-
-import org.eclipse.jetty.servlet.FilterHolder;
-import org.eclipse.jetty.servlet.FilterMapping;
-import org.eclipse.jetty.servlet.Holder;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
-import org.eclipse.jetty.webapp.DiscoveredAnnotation;
-import org.eclipse.jetty.webapp.MetaData;
-import org.eclipse.jetty.webapp.WebAppContext;
-import org.eclipse.jetty.webapp.Origin;
-
-/**
- * WebFilterAnnotation
- *
- *
- */
-public class WebFilterAnnotation extends DiscoveredAnnotation
-{
-    private static final Logger LOG = Log.getLogger(WebFilterAnnotation.class);
-
-    /**
-     * @param context
-     * @param className
-     */
-    public WebFilterAnnotation(WebAppContext context, String className)
-    {
-        super(context, className);
-    }
-
-    /** 
-     * @see org.eclipse.jetty.annotations.ClassAnnotation#apply()
-     */
-    public void apply()
-    {
-        // TODO verify against rules for annotation v descriptor
-        
-        Class clazz = getTargetClass();
-        if (clazz == null)
-        {
-            LOG.warn(_className+" cannot be loaded");
-            return;
-        }
-        
-        
-        //Servlet Spec 8.1.2
-        if (!Filter.class.isAssignableFrom(clazz))
-        {
-            LOG.warn(clazz.getName()+" is not assignable from javax.servlet.Filter");
-            return;
-        }
-        MetaData metaData = _context.getMetaData();
-        
-        WebFilter filterAnnotation = (WebFilter)clazz.getAnnotation(WebFilter.class);
-
-        if (filterAnnotation.value().length > 0 && filterAnnotation.urlPatterns().length > 0)
-        {
-            LOG.warn(clazz.getName()+" defines both @WebFilter.value and @WebFilter.urlPatterns");
-            return;
-        }
-
-        String name = (filterAnnotation.filterName().equals("")?clazz.getName():filterAnnotation.filterName());
-        String[] urlPatterns = filterAnnotation.value();
-        if (urlPatterns.length == 0)
-            urlPatterns = filterAnnotation.urlPatterns();
-        
-        FilterHolder holder = _context.getServletHandler().getFilter(name);
-        if (holder == null)
-        {
-            //Filter with this name does not already exist, so add it
-            holder = _context.getServletHandler().newFilterHolder(Holder.Source.ANNOTATION);
-            holder.setName(name);
-            
-            holder.setHeldClass(clazz);
-            metaData.setOrigin(name+".filter.filter-class");
- 
-            holder.setDisplayName(filterAnnotation.displayName()); 
-            metaData.setOrigin(name+".filter.display-name");
-
-            for (WebInitParam ip:  filterAnnotation.initParams())
-            {
-                holder.setInitParameter(ip.name(), ip.value());
-                metaData.setOrigin(name+".filter.init-param."+ip.name());
-            }
-
-            FilterMapping mapping = new FilterMapping();
-            mapping.setFilterName(holder.getName());
-
-            if (urlPatterns.length > 0)
-            {
-                ArrayList paths = new ArrayList();
-                for (String s:urlPatterns)
-                {
-                    paths.add(Util.normalizePattern(s));
-                }
-                mapping.setPathSpecs((String[])paths.toArray(new String[paths.size()]));
-            }
-
-            if (filterAnnotation.servletNames().length > 0)
-            {
-                ArrayList<String> names = new ArrayList<String>();
-                for (String s : filterAnnotation.servletNames())
-                {
-                    names.add(s);
-                }
-                mapping.setServletNames((String[])names.toArray(new String[names.size()]));
-            }
-
-            EnumSet<DispatcherType> dispatcherSet = EnumSet.noneOf(DispatcherType.class);           
-            for (DispatcherType d : filterAnnotation.dispatcherTypes())
-            {
-                dispatcherSet.add(d);
-            }
-            mapping.setDispatcherTypes(dispatcherSet);
-            metaData.setOrigin(name+".filter.mappings");
-
-            holder.setAsyncSupported(filterAnnotation.asyncSupported());
-            metaData.setOrigin(name+".filter.async-supported");
-
-            _context.getServletHandler().addFilter(holder);
-            _context.getServletHandler().addFilterMapping(mapping);
-        }
-        else
-        {
-            //A Filter definition for the same name already exists from web.xml
-            //ServletSpec 3.0 p81 if the Filter is already defined and has mappings,
-            //they override the annotation. If it already has DispatcherType set, that
-            //also overrides the annotation. Init-params are additive, but web.xml overrides
-            //init-params of the same name.
-            for (WebInitParam ip:  filterAnnotation.initParams())
-            {
-                //if (holder.getInitParameter(ip.name()) == null)
-                if (metaData.getOrigin(name+".filter.init-param."+ip.name())==Origin.NotSet)
-                {
-                    holder.setInitParameter(ip.name(), ip.value());
-                    metaData.setOrigin(name+".filter.init-param."+ip.name());
-                }
-            }
-            
-            FilterMapping[] mappings = _context.getServletHandler().getFilterMappings();
-            boolean mappingExists = false;
-            if (mappings != null)
-            {
-                for (FilterMapping m:mappings)
-                {
-                    if (m.getFilterName().equals(name))
-                    {
-                        mappingExists = true;
-                        break;
-                    }
-                }
-            }
-            //if a descriptor didn't specify at least one mapping, use the mappings from the annotation and the DispatcherTypes
-            //from the annotation
-            if (!mappingExists)
-            {
-                FilterMapping mapping = new FilterMapping();
-                mapping.setFilterName(holder.getName());
-
-                if (urlPatterns.length > 0)
-                {
-                    ArrayList paths = new ArrayList();
-                    for (String s:urlPatterns)
-                    {
-                        paths.add(Util.normalizePattern(s));
-                    }
-                    mapping.setPathSpecs((String[])paths.toArray(new String[paths.size()]));
-                }
-                if (filterAnnotation.servletNames().length > 0)
-                {
-                    ArrayList<String> names = new ArrayList<String>();
-                    for (String s : filterAnnotation.servletNames())
-                    {
-                        names.add(s);
-                    }
-                    mapping.setServletNames((String[])names.toArray(new String[names.size()]));
-                }
-                
-                EnumSet<DispatcherType> dispatcherSet = EnumSet.noneOf(DispatcherType.class);           
-                for (DispatcherType d : filterAnnotation.dispatcherTypes())
-                {
-                    dispatcherSet.add(d);
-                }
-                mapping.setDispatcherTypes(dispatcherSet);
-                _context.getServletHandler().addFilterMapping(mapping);   
-                metaData.setOrigin(name+".filter.mappings");
-            }
-        }
-    }
-
-}

jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebFilterAnnotationHandler.java

@@ -1,58 +0,0 @@
-// ========================================================================
-// Copyright (c) 2009-2010 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-// The Eclipse Public License is available at 
-// http://www.eclipse.org/legal/epl-v10.html
-// The Apache License v2.0 is available at
-// http://www.opensource.org/licenses/apache2.0.php
-// You may elect to redistribute this code under either of these licenses. 
-// ========================================================================
-
-package org.eclipse.jetty.annotations;
-
-import java.util.List;
-
-import org.eclipse.jetty.annotations.AnnotationParser.DiscoverableAnnotationHandler;
-import org.eclipse.jetty.annotations.AnnotationParser.Value;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
-import org.eclipse.jetty.webapp.DiscoveredAnnotation;
-import org.eclipse.jetty.webapp.WebAppContext;
-
-/**
- * WebFilterAnnotationHandler
- *
- *
- */
-public class WebFilterAnnotationHandler extends AbstractDiscoverableAnnotationHandler
-{
-    private static final Logger LOG = Log.getLogger(WebFilterAnnotationHandler.class);
-
-    public WebFilterAnnotationHandler (WebAppContext context)
-    {
-        super(context);
-    }
-
-    public void handleClass(String className, int version, int access, String signature, String superName, String[] interfaces, String annotation,
-                            List<Value> values)
-    {
-        WebFilterAnnotation wfAnnotation = new WebFilterAnnotation(_context, className);
-        addAnnotation(wfAnnotation);
-    }
-
-    public void handleField(String className, String fieldName, int access, String fieldType, String signature, Object value, String annotation,
-                            List<Value> values)
-    {
-        LOG.warn ("@WebFilter not applicable for fields: "+className+"."+fieldName);
-    }
-
-    public void handleMethod(String className, String methodName, int access, String params, String signature, String[] exceptions, String annotation,
-                             List<Value> values)
-    {
-        LOG.warn ("@WebFilter not applicable for methods: "+className+"."+methodName+" "+signature);
-    }
-
-}

jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebListenerAnnotation.java

@@ -1,85 +0,0 @@
-// ========================================================================
-// Copyright (c) 2006-2009 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-// The Eclipse Public License is available at 
-// http://www.eclipse.org/legal/epl-v10.html
-// The Apache License v2.0 is available at
-// http://www.opensource.org/licenses/apache2.0.php
-// You may elect to redistribute this code under either of these licenses. 
-// ========================================================================
-
-package org.eclipse.jetty.annotations;
-
-import javax.servlet.ServletContextAttributeListener;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletRequestAttributeListener;
-import javax.servlet.ServletRequestListener;
-import javax.servlet.http.HttpSessionAttributeListener;
-import javax.servlet.http.HttpSessionListener;
-
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
-import org.eclipse.jetty.webapp.DiscoveredAnnotation;
-import org.eclipse.jetty.webapp.MetaData;
-import org.eclipse.jetty.webapp.WebAppContext;
-import org.eclipse.jetty.webapp.Origin;
-
-/**
- * WebListenerAnnotation
- *
- *
- */
-public class WebListenerAnnotation extends DiscoveredAnnotation
-{
-    private static final Logger LOG = Log.getLogger(WebListenerAnnotation.class);
-
-    /**
-     * @param context
-     * @param className
-     */
-    public WebListenerAnnotation(WebAppContext context, String className)
-    {
-        super(context, className);
-    }
-
-    /** 
-     * @see org.eclipse.jetty.annotations.ClassAnnotation#apply()
-     */
-    public void apply()
-    {
-        // TODO check algorithm against ordering rules for descriptors v annotations
-        
-        Class clazz = getTargetClass();
-        
-        if (clazz == null)
-        {
-            LOG.warn(_className+" cannot be loaded");
-            return;
-        }
-
-        try
-        {
-            if (ServletContextListener.class.isAssignableFrom(clazz) || 
-                    ServletContextAttributeListener.class.isAssignableFrom(clazz) ||
-                    ServletRequestListener.class.isAssignableFrom(clazz) ||
-                    ServletRequestAttributeListener.class.isAssignableFrom(clazz) ||
-                    HttpSessionListener.class.isAssignableFrom(clazz) ||
-                    HttpSessionAttributeListener.class.isAssignableFrom(clazz))
-            {
-                java.util.EventListener listener = (java.util.EventListener)clazz.newInstance();
-                MetaData metaData = _context.getMetaData();
-                if (metaData.getOrigin(clazz.getName()+".listener") == Origin.NotSet)
-                    _context.addEventListener(listener);
-            }
-            else
-                LOG.warn(clazz.getName()+" does not implement one of the servlet listener interfaces");
-        }
-        catch (Exception e)
-        {
-            LOG.warn(e);
-        }
-    }
-}

jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebListenerAnnotationHandler.java

@@ -1,53 +0,0 @@
-// ========================================================================
-// Copyright (c) 2009-2010 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-// The Eclipse Public License is available at 
-// http://www.eclipse.org/legal/epl-v10.html
-// The Apache License v2.0 is available at
-// http://www.opensource.org/licenses/apache2.0.php
-// You may elect to redistribute this code under either of these licenses. 
-// ========================================================================
-package org.eclipse.jetty.annotations;
-
-import java.util.List;
-
-import org.eclipse.jetty.annotations.AnnotationParser.Value;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
-import org.eclipse.jetty.webapp.WebAppContext;
-
-public class WebListenerAnnotationHandler extends AbstractDiscoverableAnnotationHandler
-{
-    private static final Logger LOG = Log.getLogger(WebListenerAnnotationHandler.class);
-
-    public WebListenerAnnotationHandler (WebAppContext context)
-    {
-       super(context);
-    }
-    
-    /** 
-     * @see org.eclipse.jetty.annotations.AnnotationParser.DiscoverableAnnotationHandler#handleClass(java.lang.String, int, int, java.lang.String, java.lang.String, java.lang.String[], java.lang.String, java.util.List)
-     */
-    public void handleClass(String className, int version, int access, String signature, String superName, String[] interfaces, String annotation,
-                            List<Value> values)
-    {
-        WebListenerAnnotation wlAnnotation = new WebListenerAnnotation(_context, className);
-        addAnnotation(wlAnnotation);
-    }
-
-    public void handleField(String className, String fieldName, int access, String fieldType, String signature, Object value, String annotation,
-                            List<Value> values)
-    {
-        LOG.warn ("@WebListener is not applicable to fields: "+className+"."+fieldName);
-    }
-
-    public void handleMethod(String className, String methodName, int access, String params, String signature, String[] exceptions, String annotation,
-                             List<Value> values)
-    {
-        LOG.warn ("@WebListener is not applicable to methods: "+className+"."+methodName+" "+signature);
-    }
-
-}

jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java

@@ -1,171 +0,0 @@
-// ========================================================================
-// Copyright (c) 2010 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-// The Eclipse Public License is available at 
-// http://www.eclipse.org/legal/epl-v10.html
-// The Apache License v2.0 is available at
-// http://www.opensource.org/licenses/apache2.0.php
-// You may elect to redistribute this code under either of these licenses. 
-// ========================================================================
-
-package org.eclipse.jetty.annotations;
-
-import java.util.ArrayList;
-
-import javax.servlet.annotation.WebInitParam;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-
-import org.eclipse.jetty.servlet.Holder;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.servlet.ServletMapping;
-import org.eclipse.jetty.util.LazyList;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
-import org.eclipse.jetty.webapp.DiscoveredAnnotation;
-import org.eclipse.jetty.webapp.MetaData;
-import org.eclipse.jetty.webapp.WebAppContext;
-import org.eclipse.jetty.webapp.Origin;
-
-/**
- * WebServletAnnotation
- *
- *
- */
-public class WebServletAnnotation extends DiscoveredAnnotation
-{
-    private static final Logger LOG = Log.getLogger(WebServletAnnotation.class);
-    
-    public WebServletAnnotation (WebAppContext context, String className)
-    {
-        super(context, className);
-    }
-
-    /** 
-     * @see org.eclipse.jetty.annotations.ClassAnnotation#apply()
-     */
-    public void apply()
-    {
-        //TODO check this algorithm with new rules for applying descriptors and annotations in order
-        Class clazz = getTargetClass();
-        
-        if (clazz == null)
-        {
-            LOG.warn(_className+" cannot be loaded");
-            return;
-        }
-        
-        //Servlet Spec 8.1.1
-        if (!HttpServlet.class.isAssignableFrom(clazz))
-        {
-            LOG.warn(clazz.getName()+" is not assignable from javax.servlet.http.HttpServlet");
-            return;
-        }
-        
-        WebServlet annotation = (WebServlet)clazz.getAnnotation(WebServlet.class);
-        
-        if (annotation.urlPatterns().length > 0 && annotation.value().length > 0)
-        {
-            LOG.warn(clazz.getName()+ " defines both @WebServlet.value and @WebServlet.urlPatterns");
-            return;
-        }
-        
-        String[] urlPatterns = annotation.value();
-        if (urlPatterns.length == 0)
-            urlPatterns = annotation.urlPatterns();
-        
-        if (urlPatterns.length == 0)
-        {
-            LOG.warn(clazz.getName()+ " defines neither @WebServlet.value nor @WebServlet.urlPatterns");
-            return;
-        }
-        
-        //canonicalize the patterns
-        ArrayList<String> urlPatternList = new ArrayList<String>();
-        for (String p : urlPatterns)
-            urlPatternList.add(Util.normalizePattern(p));
-        
-        String servletName = (annotation.name().equals("")?clazz.getName():annotation.name());
-        
-        MetaData metaData = _context.getMetaData();
-
-        //Find out if a <servlet>  of this type already exists with this name
-        ServletHolder[] holders = _context.getServletHandler().getServlets();
-        boolean isNew = true;
-        ServletHolder holder = null;
-        if (holders != null)
-        {
-            for (ServletHolder h : holders)
-            {
-                if (h.getClassName().equals(clazz.getName()) && h.getName().equals(servletName))
-                {
-                    holder = h;
-                    isNew = false;
-                    break;
-                }
-            }
-        }
-
-        if (isNew)
-        {
-            //No servlet of this name has already been defined, either by a descriptor
-            //or another annotation (which would be impossible).
-            holder = _context.getServletHandler().newServletHolder(Holder.Source.ANNOTATION);
-            holder.setHeldClass(clazz);   
-            metaData.setOrigin(servletName+".servlet.servlet-class");
-            
-            holder.setName(servletName);
-            holder.setDisplayName(annotation.displayName());
-            metaData.setOrigin(servletName+".servlet.display-name");
-            
-            holder.setInitOrder(annotation.loadOnStartup());
-            metaData.setOrigin(servletName+".servlet.load-on-startup");
-            
-            holder.setAsyncSupported(annotation.asyncSupported());
-            metaData.setOrigin(servletName+".servlet.async-supported");
-            
-            for (WebInitParam ip:annotation.initParams())
-            {
-                holder.setInitParameter(ip.name(), ip.value());
-                metaData.setOrigin(servletName+".servlet.init-param."+ip.name());
-            }
-          
-            _context.getServletHandler().addServlet(holder);
-            ServletMapping mapping = new ServletMapping();  
-            mapping.setServletName(holder.getName());
-            mapping.setPathSpecs( LazyList.toStringArray(urlPatternList));
-            _context.getServletHandler().addServletMapping(mapping);
-            metaData.setOrigin(servletName+".servlet.mappings");
-        }
-        else
-        {
-            //check if the existing servlet has each init-param from the annotation
-            //if not, add it
-            for (WebInitParam ip:annotation.initParams())
-            {
-              //if (holder.getInitParameter(ip.name()) == null)
-                if (metaData.getOrigin(servletName+".servlet.init-param"+ip.name())==Origin.NotSet)
-                {
-                    holder.setInitParameter(ip.name(), ip.value());
-                    metaData.setOrigin(servletName+".servlet.init-param."+ip.name());
-                }  
-            }
-            
-            //check the url-patterns, if there annotation has a new one, add it
-            ServletMapping[] mappings = _context.getServletHandler().getServletMappings();
-
-            //ServletSpec 3.0 p81 If a servlet already has url mappings from a 
-            //descriptor the annotation is ignored
-            if (mappings == null && metaData.getOriginDescriptor(servletName+".servlet.mappings") != null)
-            {
-                ServletMapping mapping = new ServletMapping();
-                mapping.setServletName(servletName);
-                mapping.setPathSpecs(LazyList.toStringArray(urlPatternList));
-                _context.getServletHandler().addServletMapping(mapping); 
-            }
-        }
-    }   
-}

jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotationHandler.java

@@ -1,68 +0,0 @@
-// ========================================================================
-// Copyright (c) 2009 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-// The Eclipse Public License is available at 
-// http://www.eclipse.org/legal/epl-v10.html
-// The Apache License v2.0 is available at
-// http://www.opensource.org/licenses/apache2.0.php
-// You may elect to redistribute this code under either of these licenses. 
-// ========================================================================
-
-package org.eclipse.jetty.annotations;
-
-import java.util.List;
-
-import org.eclipse.jetty.annotations.AnnotationParser.DiscoverableAnnotationHandler;
-import org.eclipse.jetty.annotations.AnnotationParser.Value;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
-import org.eclipse.jetty.webapp.DiscoveredAnnotation;
-import org.eclipse.jetty.webapp.WebAppContext;
-
-/**
- * WebServletAnnotationHandler
- *
- * Process a WebServlet annotation on a class.
- * 
- */
-public class WebServletAnnotationHandler extends AbstractDiscoverableAnnotationHandler
-{
-    private static final Logger LOG = Log.getLogger(WebServletAnnotationHandler.class);
-    
-    public WebServletAnnotationHandler (WebAppContext context)
-    {
-        super(context);
-    }
-    
-    
-    /** 
-     * Handle discovering a WebServlet annotation.
-     * 
-     *  
-     * @see org.eclipse.jetty.annotations.AnnotationParser.DiscoverableAnnotationHandler#handleClass(java.lang.String, int, int, java.lang.String, java.lang.String, java.lang.String[], java.lang.String, java.util.List)
-     */
-    public void handleClass(String className, int version, int access, String signature, String superName, String[] interfaces, String annotationName,
-                            List<Value> values)
-    {
-        if (!"javax.servlet.annotation.WebServlet".equals(annotationName))
-            return;    
-       
-        WebServletAnnotation annotation = new WebServletAnnotation (_context, className);
-        addAnnotation(annotation);
-    }
-
-    public void handleField(String className, String fieldName, int access, String fieldType, String signature, Object value, String annotation,
-                            List<Value> values)
-    {
-        LOG.warn ("@WebServlet annotation not supported for fields");
-    }
-
-    public void handleMethod(String className, String methodName, int access, String params, String signature, String[] exceptions, String annotation,
-                             List<Value> values)
-    {
-        LOG.warn ("@WebServlet annotation not supported for methods");
-    }    
-}

jetty-annotations/src/test/java/org/eclipse/jetty/annotations/FilterC.java

@@ -18,20 +18,16 @@ import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.annotation.Resource;
 import javax.annotation.security.RunAs;
-import javax.servlet.DispatcherType;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.annotation.WebInitParam;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-@WebFilter(filterName="CFilter", dispatcherTypes={DispatcherType.REQUEST}, urlPatterns = {"/*"}, initParams={@WebInitParam(name="a", value="99")}, asyncSupported=false)
 @RunAs("admin")
 public class FilterC implements Filter
 {

jetty-annotations/src/test/java/org/eclipse/jetty/annotations/ListenerC.java

@@ -14,9 +14,7 @@ package org.eclipse.jetty.annotations;
 
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
-import javax.servlet.annotation.WebListener;
 
-@WebListener
 public class ListenerC implements ServletContextListener
 {
 

jetty-annotations/src/test/java/org/eclipse/jetty/annotations/ServletC.java

@@ -20,12 +20,6 @@ import javax.annotation.Resource;
 import javax.annotation.security.DeclareRoles;
 import javax.annotation.security.RunAs;
 import javax.servlet.ServletException;
-import javax.servlet.annotation.HttpConstraint;
-import javax.servlet.annotation.HttpMethodConstraint;
-import javax.servlet.annotation.MultipartConfig;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.WebInitParam;
-import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -33,10 +27,7 @@ import javax.servlet.http.HttpServletResponse;
 
 
 @DeclareRoles({"alice"})
-@WebServlet(urlPatterns = { "/foo/*", "/bah/*" }, name="CServlet", initParams={@WebInitParam(name="x", value="y")}, loadOnStartup=2, asyncSupported=false)
-@MultipartConfig(fileSizeThreshold=1000, maxFileSize=2000, maxRequestSize=3000)
 @RunAs("admin")
-@ServletSecurity(value=@HttpConstraint(rolesAllowed={"fred", "bill", "dorothy"}), httpMethodConstraints={@HttpMethodConstraint(value="GET", rolesAllowed={"bob", "carol", "ted"})})
 public class ServletC extends HttpServlet
 {
     @Resource (mappedName="foo", type=Double.class)

jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationConfiguration.java

@@ -1,53 +0,0 @@
-// ========================================================================
-// Copyright (c) 2006-2009 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-// The Eclipse Public License is available at 
-// http://www.eclipse.org/legal/epl-v10.html
-// The Apache License v2.0 is available at
-// http://www.opensource.org/licenses/apache2.0.php
-// You may elect to redistribute this code under either of these licenses. 
-// ========================================================================
-
-package org.eclipse.jetty.annotations;
-
-import java.io.File;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jetty.util.resource.Resource;
-import org.eclipse.jetty.webapp.FragmentDescriptor;
-import org.eclipse.jetty.webapp.WebAppContext;
-
-/**
- * TestAnnotationConfiguration
- *
- *
- */
-public class TestAnnotationConfiguration extends TestCase
-{
-    public void testGetFragmentFromJar ()
-    throws Exception
-    {
-        String dir = System.getProperty("basedir", ".");   
-        File file = new File(dir);
-        file=new File(file.getCanonicalPath());
-        URL url=file.toURL();
-
-        Resource jar1 = Resource.newResource(url+"file.jar");
-
-        AnnotationConfiguration config = new AnnotationConfiguration();
-        WebAppContext wac = new WebAppContext();
-
-        List<FragmentDescriptor> frags = new ArrayList<FragmentDescriptor>();
-        frags.add(new FragmentDescriptor(Resource.newResource("jar:"+url+"file.jar!/fooa.props")));
-        frags.add(new FragmentDescriptor(Resource.newResource("jar:"+url+"file2.jar!/foob.props")));
-
-        assertNotNull(config.getFragmentFromJar(jar1, frags));
-    }
-}

jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationInheritance.java

@@ -13,23 +13,20 @@
 
 package org.eclipse.jetty.annotations;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
+
 import javax.naming.Context;
 import javax.naming.InitialContext;
 
 import org.eclipse.jetty.annotations.AnnotationParser.DiscoverableAnnotationHandler;
 import org.eclipse.jetty.annotations.AnnotationParser.Value;
-import org.eclipse.jetty.util.MultiMap;
 import org.junit.After;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 /**
  *
  */
@@ -189,40 +186,4 @@ public class TestAnnotationInheritance
         });
         assertEquals (1, handler.annotatedClassNames.size());
     }
-
-    @Test
-    public void testTypeInheritanceHandling() throws Exception
-    {
-        AnnotationParser parser = new AnnotationParser();
-        ClassInheritanceHandler handler = new ClassInheritanceHandler();
-        parser.registerClassHandler(handler);
-
-        class Foo implements InterfaceD
-        {
-        }
-
-        classNames.clear();
-        classNames.add(ClassA.class.getName());
-        classNames.add(ClassB.class.getName());
-        classNames.add(InterfaceD.class.getName());
-        classNames.add(Foo.class.getName());
-
-        parser.parse(classNames, null);
-
-        MultiMap map = handler.getMap();
-        assertNotNull(map);
-        assertFalse(map.isEmpty());
-        assertEquals(2, map.size());
-        Map stringArrayMap = map.toStringArrayMap();
-        assertTrue (stringArrayMap.keySet().contains("org.eclipse.jetty.annotations.ClassA"));
-        assertTrue (stringArrayMap.keySet().contains("org.eclipse.jetty.annotations.InterfaceD"));
-        String[] classes = (String[])stringArrayMap.get("org.eclipse.jetty.annotations.ClassA");
-        assertEquals(1, classes.length);
-        assertEquals ("org.eclipse.jetty.annotations.ClassB", classes[0]);
-
-        classes = (String[])stringArrayMap.get("org.eclipse.jetty.annotations.InterfaceD");
-        assertEquals(2, classes.length);
-        assertEquals ("org.eclipse.jetty.annotations.ClassB", classes[0]);
-        assertEquals(Foo.class.getName(), classes[1]);
-    }
 }

jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestSecurityAnnotationConversions.java

@@ -1,328 +0,0 @@
-// ========================================================================
-// Copyright (c) 2009 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-// The Eclipse Public License is available at 
-// http://www.eclipse.org/legal/epl-v10.html
-// The Apache License v2.0 is available at
-// http://www.opensource.org/licenses/apache2.0.php
-// You may elect to redistribute this code under either of these licenses. 
-// ========================================================================
-package org.eclipse.jetty.annotations;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.HttpConstraint;
-import javax.servlet.annotation.HttpMethodConstraint;
-import javax.servlet.annotation.ServletSecurity.TransportGuarantee;
-import javax.servlet.annotation.ServletSecurity.EmptyRoleSemantic;
-import javax.servlet.http.HttpServlet;
-
-import org.eclipse.jetty.security.ConstraintAware;
-import org.eclipse.jetty.security.ConstraintMapping;
-import org.eclipse.jetty.servlet.Holder;
-import org.eclipse.jetty.security.ConstraintSecurityHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.servlet.ServletMapping;
-import org.eclipse.jetty.util.LazyList;
-import org.eclipse.jetty.util.security.Constraint;
-import org.eclipse.jetty.webapp.WebAppContext;
-
-import junit.framework.TestCase;
-
-public class TestSecurityAnnotationConversions extends TestCase
-{
-    @ServletSecurity(value=@HttpConstraint(value=EmptyRoleSemantic.DENY)) 
-    public static class DenyServlet extends HttpServlet
-    {}
-    
-    @ServletSecurity
-    public static class PermitServlet extends HttpServlet
-    {}
-    
-    @ServletSecurity(value=@HttpConstraint(value=EmptyRoleSemantic.PERMIT, transportGuarantee=TransportGuarantee.CONFIDENTIAL, rolesAllowed={"tom", "dick", "harry"})) 
-    public static class RolesServlet extends HttpServlet
-    {}
-    
-    @ServletSecurity(value=@HttpConstraint(value=EmptyRoleSemantic.PERMIT, transportGuarantee=TransportGuarantee.CONFIDENTIAL, rolesAllowed={"tom", "dick", "harry"}),
-                     httpMethodConstraints={@HttpMethodConstraint(value="GET")}) 
-    public static class Method1Servlet extends HttpServlet
-    {}
-    
-    @ServletSecurity(value=@HttpConstraint(value=EmptyRoleSemantic.PERMIT, transportGuarantee=TransportGuarantee.CONFIDENTIAL, rolesAllowed={"tom", "dick", "harry"}),
-                     httpMethodConstraints={@HttpMethodConstraint(value="GET", transportGuarantee=TransportGuarantee.CONFIDENTIAL)}) 
-    public static class Method2Servlet extends HttpServlet
-    {}
-    
-    
-    public void setUp()
-    {
-    }
-    
-    public void testDenyAllOnClass ()
-    throws Exception
-    {
-
-        WebAppContext wac = makeWebAppContext(DenyServlet.class.getCanonicalName(), "denyServlet", new String[]{"/foo/*", "*.foo"});
-        
-        //Assume we found 1 servlet with a @HttpConstraint with value=EmptyRoleSemantic.DENY security annotation
-        ServletSecurityAnnotationHandler annotationHandler = new ServletSecurityAnnotationHandler(wac);
-        AnnotationIntrospector introspector = new AnnotationIntrospector();
-        introspector.registerHandler(annotationHandler);
-        
-        //set up the expected outcomes:
-        //1 ConstraintMapping per ServletMapping pathSpec
-        Constraint expectedConstraint = new Constraint();
-        expectedConstraint.setAuthenticate(true);
-        expectedConstraint.setDataConstraint(Constraint.DC_NONE);
-        
-        ConstraintMapping[] expectedMappings = new ConstraintMapping[2];
-        
-        expectedMappings[0] = new ConstraintMapping();
-        expectedMappings[0].setConstraint(expectedConstraint);
-        expectedMappings[0].setPathSpec("/foo/*");
-        
-        expectedMappings[1] = new ConstraintMapping();
-        expectedMappings[1].setConstraint(expectedConstraint);
-        expectedMappings[1].setPathSpec("*.foo");
-        
-        introspector.introspect(DenyServlet.class);
-       
-        compareResults(expectedMappings, ((ConstraintAware)wac.getSecurityHandler()).getConstraintMappings());   
-    }
-    
-   
-    public void testPermitAll()
-    throws Exception
-    {
-        //Assume we found 1 servlet with a @ServletSecurity security annotation
-        WebAppContext wac = makeWebAppContext(PermitServlet.class.getCanonicalName(), "permitServlet", new String[]{"/foo/*", "*.foo"});
-        
-        ServletSecurityAnnotationHandler annotationHandler = new ServletSecurityAnnotationHandler(wac);
-        AnnotationIntrospector introspector = new AnnotationIntrospector();
-        introspector.registerHandler(annotationHandler);
-        
-      
-        //set up the expected outcomes:
-        //1 ConstraintMapping per ServletMapping pathSpec
-        Constraint expectedConstraint = new Constraint();
-        expectedConstraint.setAuthenticate(false);
-        expectedConstraint.setDataConstraint(Constraint.DC_NONE);
-                     
-        ConstraintMapping[] expectedMappings = new ConstraintMapping[2];
-        expectedMappings[0] = new ConstraintMapping();
-        expectedMappings[0].setConstraint(expectedConstraint);
-        expectedMappings[0].setPathSpec("/foo/*");
-        
-        expectedMappings[1] = new ConstraintMapping();
-        expectedMappings[1].setConstraint(expectedConstraint);
-        expectedMappings[1].setPathSpec("*.foo");
-
-        introspector.introspect(PermitServlet.class);
-       
-        compareResults (expectedMappings, ((ConstraintAware)wac.getSecurityHandler()).getConstraintMappings());
-    }
-    
-    public void testRolesAllowedWithTransportGuarantee ()
-    throws Exception
-    {
-        //Assume we found 1 servlet with annotation with roles defined and 
-        //and a TransportGuarantee
-        
-        WebAppContext wac = makeWebAppContext(RolesServlet.class.getCanonicalName(), "rolesServlet", new String[]{"/foo/*", "*.foo"});
-        
-        ServletSecurityAnnotationHandler annotationHandler = new ServletSecurityAnnotationHandler(wac);
-        AnnotationIntrospector introspector = new AnnotationIntrospector();
-        introspector.registerHandler(annotationHandler);
-        
-        //set up the expected outcomes:compareResults
-        //1 ConstraintMapping per ServletMapping 
-        Constraint expectedConstraint = new Constraint();
-        expectedConstraint.setAuthenticate(true);
-        expectedConstraint.setRoles(new String[]{"tom", "dick", "harry"});
-        expectedConstraint.setDataConstraint(Constraint.DC_CONFIDENTIAL);
-        
-        ConstraintMapping[] expectedMappings = new ConstraintMapping[2];
-        expectedMappings[0] = new ConstraintMapping();
-        expectedMappings[0].setConstraint(expectedConstraint);
-        expectedMappings[0].setPathSpec("/foo/*");
-        
-        expectedMappings[1] = new ConstraintMapping();
-        expectedMappings[1].setConstraint(expectedConstraint);
-        expectedMappings[1].setPathSpec("*.foo");
-        
-        introspector.introspect(RolesServlet.class);
-        compareResults (expectedMappings, ((ConstraintAware)wac.getSecurityHandler()).getConstraintMappings());
-    }
-  
-  
-    public void testMethodAnnotation ()
-    throws Exception
-    {
-        //ServletSecurity annotation with HttpConstraint of TransportGuarantee.CONFIDENTIAL, and a list of rolesAllowed, and
-        //a HttpMethodConstraint for GET method that permits all and has TransportGuarantee.NONE (ie is default)
-        
-        WebAppContext wac = makeWebAppContext(Method1Servlet.class.getCanonicalName(), "method1Servlet",  new String[]{"/foo/*", "*.foo"});
-       
-        //set up the expected outcomes: - a Constraint for the RolesAllowed on the class
-        //with userdata constraint of DC_CONFIDENTIAL 
-        //and mappings for each of the pathSpecs
-        Constraint expectedConstraint1 = new Constraint();
-        expectedConstraint1.setAuthenticate(true);
-        expectedConstraint1.setRoles(new String[]{"tom", "dick", "harry"});
-        expectedConstraint1.setDataConstraint(Constraint.DC_CONFIDENTIAL);       
-        
-        //a Constraint for the PermitAll on the doGet method with a userdata
-        //constraint of DC_CONFIDENTIAL inherited from the class
-        Constraint expectedConstraint2 = new Constraint();  
-        expectedConstraint2.setDataConstraint(Constraint.DC_NONE);
-        
-        ConstraintMapping[] expectedMappings = new ConstraintMapping[4];
-        expectedMappings[0] = new ConstraintMapping();
-        expectedMappings[0].setConstraint(expectedConstraint1);
-        expectedMappings[0].setPathSpec("/foo/*");
-        expectedMappings[0].setMethodOmissions(new String[]{"GET"});
-        expectedMappings[1] = new ConstraintMapping();
-        expectedMappings[1].setConstraint(expectedConstraint1);
-        expectedMappings[1].setPathSpec("*.foo"); 
-        expectedMappings[1].setMethodOmissions(new String[]{"GET"});
-        
-        expectedMappings[2] = new ConstraintMapping();
-        expectedMappings[2].setConstraint(expectedConstraint2);
-        expectedMappings[2].setPathSpec("/foo/*");
-        expectedMappings[2].setMethod("GET");
-        expectedMappings[3] = new ConstraintMapping();
-        expectedMappings[3].setConstraint(expectedConstraint2);
-        expectedMappings[3].setPathSpec("*.foo");
-        expectedMappings[3].setMethod("GET");
-        
-        AnnotationIntrospector introspector = new AnnotationIntrospector();
-        ServletSecurityAnnotationHandler annotationHandler = new ServletSecurityAnnotationHandler(wac);
-        introspector.registerHandler(annotationHandler);
-        introspector.introspect(Method1Servlet.class);
-        compareResults (expectedMappings, ((ConstraintAware)wac.getSecurityHandler()).getConstraintMappings());
-    }
-
-    public void testMethodAnnotation2 ()
-    throws Exception
-    {
-        //A ServletSecurity annotation that has HttpConstraint of CONFIDENTIAL with defined roles, but a
-        //HttpMethodConstraint for GET that permits all, but also requires CONFIDENTIAL
-        WebAppContext wac = makeWebAppContext(Method2Servlet.class.getCanonicalName(), "method2Servlet",  new String[]{"/foo/*", "*.foo"});
-
-        AnnotationIntrospector introspector = new AnnotationIntrospector();
-        ServletSecurityAnnotationHandler annotationHandler = new ServletSecurityAnnotationHandler(wac);
-        introspector.registerHandler(annotationHandler);
-
-        //set up the expected outcomes: - a Constraint for the RolesAllowed on the class
-        //with userdata constraint of DC_CONFIDENTIAL
-        //and mappings for each of the pathSpecs
-        Constraint expectedConstraint1 = new Constraint();
-        expectedConstraint1.setAuthenticate(true);
-        expectedConstraint1.setRoles(new String[]{"tom", "dick", "harry"});
-        expectedConstraint1.setDataConstraint(Constraint.DC_CONFIDENTIAL);
-     
-        //a Constraint for the Permit on the GET method with a userdata
-        //constraint of DC_CONFIDENTIAL      
-        Constraint expectedConstraint2 = new Constraint();  
-        expectedConstraint2.setDataConstraint(Constraint.DC_CONFIDENTIAL);
-        
-        ConstraintMapping[] expectedMappings = new ConstraintMapping[4];
-        expectedMappings[0] = new ConstraintMapping();
-        expectedMappings[0].setConstraint(expectedConstraint1);
-        expectedMappings[0].setPathSpec("/foo/*");
-        expectedMappings[0].setMethodOmissions(new String[]{"GET"});
-        expectedMappings[1] = new ConstraintMapping();
-        expectedMappings[1].setConstraint(expectedConstraint1);
-        expectedMappings[1].setPathSpec("*.foo"); 
-        expectedMappings[1].setMethodOmissions(new String[]{"GET"});
-        
-        expectedMappings[2] = new ConstraintMapping();
-        expectedMappings[2].setConstraint(expectedConstraint2);
-        expectedMappings[2].setPathSpec("/foo/*");
-        expectedMappings[2].setMethod("GET");
-        expectedMappings[3] = new ConstraintMapping();
-        expectedMappings[3].setConstraint(expectedConstraint2);
-        expectedMappings[3].setPathSpec("*.foo");
-        expectedMappings[3].setMethod("GET");
-        
-        introspector.introspect(Method2Servlet.class);
-        compareResults (expectedMappings, ((ConstraintAware)wac.getSecurityHandler()).getConstraintMappings());
-    }
-
-    private void compareResults (ConstraintMapping[] expectedMappings, List<ConstraintMapping> actualMappings)
-    {
-        assertNotNull(actualMappings);
-        assertEquals(expectedMappings.length, actualMappings.size());
-
-        for (int k=0; k < actualMappings.size(); k++)
-        {   
-            ConstraintMapping am = actualMappings.get(k);
-            boolean matched  = false;
-          
-            for (int i=0; i< expectedMappings.length && !matched; i++)
-            {
-                ConstraintMapping em = expectedMappings[i];
-                if (em.getPathSpec().equals(am.getPathSpec()))
-                {
-                    if ((em.getMethod()==null && am.getMethod() == null) || em.getMethod() != null && em.getMethod().equals(am.getMethod()))
-                    {
-                        matched = true; 
-                      
-                        assertEquals(em.getConstraint().getAuthenticate(), am.getConstraint().getAuthenticate());
-                        assertEquals(em.getConstraint().getDataConstraint(), am.getConstraint().getDataConstraint());
-                        if (em.getMethodOmissions() == null)
-                        {
-                            assertNull(am.getMethodOmissions());
-                        }
-                        else
-                        {
-                            assertTrue(Arrays.equals(am.getMethodOmissions(), em.getMethodOmissions()));
-                        }
-                        
-                        if (em.getConstraint().getRoles() == null)
-                        {
-                            assertNull(am.getConstraint().getRoles());
-                        }
-                        else
-                        {
-                            assertTrue(Arrays.equals(em.getConstraint().getRoles(), am.getConstraint().getRoles()));
-                        }  
-                    }
-                }
-            }
-           
-            if (!matched)
-                fail("No expected ConstraintMapping matching method:"+am.getMethod()+" pathSpec: "+am.getPathSpec());
-        }
-    }
-    
-    
-    private WebAppContext makeWebAppContext (String className, String servletName, String[] paths)
-    {
-        WebAppContext wac = new WebAppContext(); 
-   
-        ServletHolder[] holders = new ServletHolder[1];
-        holders[0] = new ServletHolder();
-        holders[0].setClassName(className);
-        holders[0].setName(servletName);
-        holders[0].setServletHandler(wac.getServletHandler());
-        wac.getServletHandler().setServlets(holders);
-        wac.setSecurityHandler(new ConstraintSecurityHandler());
-        
-        ServletMapping[] servletMappings = new ServletMapping[1];
-        servletMappings[0] = new ServletMapping();
-      
-        servletMappings[0].setPathSpecs(paths);
-        servletMappings[0].setServletName(servletName);
-        wac.getServletHandler().setServletMappings(servletMappings);
-        return wac;
-    }
-}

jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestServletAnnotations.java

@@ -1,5 +1,5 @@
 // ========================================================================
-// Copyright (c) 2006-2009 Mort Bay Consulting Pty. Ltd.
+//Copyright (c) 2006-2009 Mort Bay Consulting Pty. Ltd.
 // ------------------------------------------------------------------------
 // All rights reserved. This program and the accompanying materials
 // are made available under the terms of the Eclipse Public License v1.0
@@ -13,19 +13,12 @@
 
 package org.eclipse.jetty.annotations;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.List;
 
 import org.eclipse.jetty.security.ConstraintSecurityHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.servlet.ServletMapping;
 import org.eclipse.jetty.webapp.WebAppContext;
 import org.junit.Test;
 
@@ -36,50 +29,8 @@ import org.junit.Test;
  */
 public class TestServletAnnotations
 {
+   
     @Test
-    public void testServletAnnotation() throws Exception
-    {
-        List<String> classes = new ArrayList<String>();
-        classes.add("org.eclipse.jetty.annotations.ServletC");
-        AnnotationParser parser = new AnnotationParser();
-
-        WebAppContext wac = new WebAppContext();       
-        WebServletAnnotationHandler handler = new WebServletAnnotationHandler(wac);
-        parser.registerAnnotationHandler("javax.servlet.annotation.WebServlet", handler);
-       
-        parser.parse(classes, new ClassNameResolver ()
-        {
-            public boolean isExcluded(String name)
-            {
-                return false;
-            }
-
-            public boolean shouldOverride(String name)
-            {
-                return false;
-            }
-        });
-        
-        assertEquals(1, handler.getAnnotationList().size());
-        assertTrue(handler.getAnnotationList().get(0) instanceof WebServletAnnotation);
-        
-        handler.getAnnotationList().get(0).apply();
-       
-        ServletHolder[] holders = wac.getServletHandler().getServlets();
-        assertNotNull(holders);
-        assertEquals(1, holders.length);
-        assertEquals("CServlet", holders[0].getName());
-        ServletMapping[] mappings = wac.getServletHandler().getServletMappings();
-        assertNotNull(mappings);
-        assertEquals(1, mappings.length);
-        String[] paths = mappings[0].getPathSpecs();
-        assertNotNull(paths);
-        assertEquals(2, paths.length);
-        assertEquals("y", holders[0].getInitParameter("x"));
-        assertEquals(2,holders[0].getInitOrder());
-        assertFalse(holders[0].isAsyncSupported());
-    }
-    
     public void testDeclareRoles ()
     throws Exception
     { 

jetty-client/pom.xml

@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-project</artifactId>
-        <version>8.1.0-SNAPSHOT</version>
+        <version>7.6.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

jetty-continuation/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-continuation</artifactId>
@@ -64,11 +64,11 @@
   </build>
   <dependencies>
     <dependency>
-     <groupId>${servlet.spec.groupId}</groupId>
+      <groupId>org.mortbay.jetty</groupId> 
-     <artifactId>${servlet.spec.artifactId}</artifactId>
+      <artifactId>servlet-api</artifactId>
-     <version>${servlet.spec.version}</version>
+      <version>3.0.20100224</version>
-     <scope>provided</scope>
+      <scope>provided</scope>
-    </dependency>
+    </dependency> 
     <dependency>
       <groupId>org.mortbay.jetty</groupId> 
       <artifactId>jetty-util</artifactId>

jetty-continuation/src/main/java/org/eclipse/jetty/continuation/ContinuationSupport.java

@@ -36,7 +36,7 @@ public class ContinuationSupport
     static
     {
         boolean servlet3Support=false;
-        Constructor<?>s3cc=null;
+        Constructor<? extends Continuation>s3cc=null;
         try
         {
             boolean servlet3=ServletRequest.class.getMethod("startAsync")!=null;
@@ -52,11 +52,11 @@ public class ContinuationSupport
         finally
         {
             __servlet3=servlet3Support;
-            __newServlet3Continuation=(Constructor<? extends Continuation>)s3cc;
+            __newServlet3Continuation=s3cc;
         }
         
         boolean jetty6Support=false;
-        Constructor<?>j6cc=null;
+        Constructor<? extends Continuation>j6cc=null;
         try
         {
             Class<?> jetty6ContinuationClass = ContinuationSupport.class.getClassLoader().loadClass("org.mortbay.util.ajax.Continuation");
@@ -73,7 +73,7 @@ public class ContinuationSupport
         finally
         {
             __jetty6=jetty6Support;
-            __newJetty6Continuation=(Constructor<? extends Continuation>)j6cc;
+            __newJetty6Continuation=j6cc;
         }
         
         Class<?> waiting=null;

jetty-continuation/src/main/java/org/eclipse/jetty/continuation/FauxContinuation.java

@@ -500,4 +500,4 @@ class FauxContinuation implements FilteredContinuation
         throw new IllegalStateException("!suspended");
         
     }
-}
+}

jetty-continuation/src/main/java/org/eclipse/jetty/continuation/Servlet3Continuation.java

@@ -59,7 +59,6 @@ public class Servlet3Continuation implements Continuation
             public void onTimeout(AsyncEvent event) throws IOException
             {
                 _initial=false;
-                System.err.println("Doing dispatch on timed out continuation for "+_request.getAttribute("FOO"));
                 event.getAsyncContext().dispatch();
             }
         });

jetty-deploy/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-deploy</artifactId>

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

@@ -22,7 +22,7 @@
           </Set>
           <Call name="setContextAttribute">
             <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
-            <Arg>.*/servlet-api-[^/]*\.jar$</Arg>
+            <Arg>.*/.*jsp-api-[^/]*\.jar$|.*/.*jsp-[^/]*\.jar$|.*/.*taglibs[^/]*\.jar$</Arg>
           </Call>
           
           

jetty-distribution/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
   </parent>
   <artifactId>jetty-distribution</artifactId>
   <name>Jetty :: Distribution Assemblies</name>
@@ -12,18 +12,18 @@
     <jetty-orbit-url>http://download.eclipse.org/jetty/orbit</jetty-orbit-url>
     <assembly-directory>target/distribution</assembly-directory>
     <eclipse-ecj-version>3.6</eclipse-ecj-version>
-    <orbit-javax-activation-version>${javax-activation-version}.0.v201105071233</orbit-javax-activation-version>
+    <orbit-javax-activation-version>${javax-activation-version}.0.v201005080500</orbit-javax-activation-version>
-    <orbit-javax-annotation-version>1.1.0.v201105051105</orbit-javax-annotation-version>
+    <orbit-javax-annotation-version>1.0.0.v20100513-0750</orbit-javax-annotation-version>
-    <orbit-javax-el-version>2.2.0.v201105051105</orbit-javax-el-version>
+    <orbit-javax-el-version>2.1.0.v201004190952</orbit-javax-el-version>
     <orbit-javax-mail-glassfish-version>${javax-mail-version}.v201005082020</orbit-javax-mail-glassfish-version>
-    <orbit-javax-servlet-version>3.0.0.v201103241727</orbit-javax-servlet-version>
+    <orbit-javax-servlet-version>2.5.0.v200910301333</orbit-javax-servlet-version>
-    <orbit-javax-servlet-jsp-version>2.2.0.v201103241009</orbit-javax-servlet-jsp-version>
+    <orbit-javax-servlet-jsp-version>2.1.0.v201004190952</orbit-javax-servlet-jsp-version>
     <orbit-javax-servlet-jsp-jstl-version>1.2.0.v201004190952</orbit-javax-servlet-jsp-jstl-version>
-    <orbit-com-sun-el-version>2.2.0.v201105051105</orbit-com-sun-el-version>
+    <orbit-com-sun-el-version>1.0.0.v201004190952</orbit-com-sun-el-version>
+    <orbit-org-apache-jasper-version>2.1.0.v201110031002</orbit-org-apache-jasper-version>
     <orbit-org-apache-taglibs-standard-version>1.2.0.v201004190952</orbit-org-apache-taglibs-standard-version>
-    <orbit-org-objectweb-asm-version>3.3.1.v201101071600</orbit-org-objectweb-asm-version>
+    <orbit-org-objectweb-asm-version>3.1.0.v200803061910</orbit-org-objectweb-asm-version>
     <orbit-javax-transaction-version>1.1.1.v201004190952</orbit-javax-transaction-version>
-    <orbit-org-apache-jasper-version>2.2.2.v201108011116</orbit-org-apache-jasper-version>
   </properties>
   <build>
     <plugins>
@@ -87,9 +87,8 @@
 
                 <!-- ${jetty.home}/lib/ -->
                 <mkdir dir="${assembly-directory}/lib" />
-                <copy file="${orbit-cache}/javax.servlet_${orbit-javax-servlet-version}.jar" tofile="${assembly-directory}/lib/servlet-api-3.0.jar" />
+                <copy file="${orbit-cache}/javax.servlet_${orbit-javax-servlet-version}.jar" tofile="${assembly-directory}/lib/servlet-api-2.5.jar" />
 
-               
                 <!-- ${jetty.home}/lib/annotations/ -->
                 <mkdir dir="${assembly-directory}/lib/annotations" />
                 <copy todir="${assembly-directory}/lib/annotations">
@@ -124,11 +123,12 @@
                     <include name="javax.servlet.jsp_${orbit-javax-servlet-jsp-version}.jar" />
                     <include name="javax.servlet.jsp.jstl_${orbit-javax-servlet-jsp-jstl-version}.jar" />
                     <include name="com.sun.el_${orbit-com-sun-el-version}.jar" />
-                    <include name="org.apache.jasper.glassfish_${orbit-org-apache-jasper-version}.jar" />         
+                    <include name="org.apache.jasper.glassfish_${orbit-org-apache-jasper-version}.jar" />
                     <include name="org.apache.taglibs.standard.glassfish_${orbit-org-apache-taglibs-standard-version}.jar" />
                     <include name="ecj-${eclipse-ecj-version}.jar" />
                   </fileset>
                 </copy>
+
                 <chmod dir="${assembly-directory}/bin" perm="755" includes="**/*.sh" />
               </tasks>
             </configuration>
@@ -354,11 +354,6 @@
       <artifactId>jetty-policy</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>${servlet.spec.groupId}</groupId>
-      <artifactId>${servlet.spec.artifactId}</artifactId>
-      <version>${servlet.spec.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlets</artifactId>

jetty-distribution/src/main/resources/bin/jetty-cygwin.sh

@@ -5,7 +5,7 @@
 # To get the service to restart correctly on reboot, uncomment below (3 lines):
 # ========================
 # chkconfig: 3 99 99
-# description: Jetty 8 webserver
+# description: Jetty 7 webserver
 # processname: jetty
 # ========================
 
@@ -134,8 +134,8 @@ NO_START=0
 ##################################################
 # See if there's a default configuration file
 ##################################################
-if [ -f /etc/default/jetty8 ] ; then 
+if [ -f /etc/default/jetty7 ] ; then 
-  . /etc/default/jetty8
+  . /etc/default/jetty7
 elif [ -f /etc/default/jetty ] ; then 
   . /etc/default/jetty
 fi
@@ -196,13 +196,13 @@ if [ "$JETTY_HOME" = "" ] ; then
         /home                    \
         "
   JETTY_DIR_NAMES="              \
-        jetty-8                  \
+        jetty-7                  \
-        jetty8                   \
+        jetty7                   \
-        jetty-8.*                \
+        jetty-7.*                \
         jetty                    \
-        Jetty-8                  \
+        Jetty-7                  \
-        Jetty8                   \
+        Jetty7                   \
-        Jetty-8.*                \
+        Jetty-7.*                \
         Jetty                    \
         "
         
@@ -511,7 +511,7 @@ case "$ACTION" in
         echo -n "Starting Jetty: "
 
         if [ "$NO_START" = "1" ]; then 
-	  echo "Not starting jetty - NO_START=1 in /etc/default/jetty8";
+	  echo "Not starting jetty - NO_START=1 in /etc/default/jetty7";
           exit 0;
 	fi
 

jetty-distribution/src/main/resources/bin/jetty.sh

@@ -5,7 +5,7 @@
 # To get the service to restart correctly on reboot, uncomment below (3 lines):
 # ========================
 # chkconfig: 3 99 99
-# description: Jetty 8 webserver
+# description: Jetty 7 webserver
 # processname: jetty
 # ========================
 
@@ -136,7 +136,7 @@ shift
 ##################################################
 # Read any configuration files
 ##################################################
-for CONFIG in /etc/default/jetty{,8} $HOME/.jettyrc; do
+for CONFIG in /etc/default/jetty{,7} $HOME/.jettyrc; do
   if [ -f "$CONFIG" ] ; then 
     readConfig "$CONFIG"
   fi
@@ -192,13 +192,13 @@ if [ -z "$JETTY_HOME" ] ; then
         "/home"
         )
   JETTY_DIR_NAMES=(
-        "jetty-8"
+        "jetty-7"
-        "jetty8"
+        "jetty7"
-        "jetty-8.*"
+        "jetty-7.*"
         "jetty"
-        "Jetty-8"
+        "Jetty-7"
-        "Jetty8"
+        "Jetty7"
-        "Jetty-8.*"
+        "Jetty-7.*"
         "Jetty"
         )
         

jetty-distribution/src/main/resources/start.ini

@@ -46,7 +46,7 @@
 # for a full listing do
 #   java -jar start.jar --list-options
 #-----------------------------------------------------------
-OPTIONS=Server,jsp,jmx,resources,websocket,ext,plus,annotations
+OPTIONS=Server,jsp,jmx,resources,websocket,ext
 #-----------------------------------------------------------
 
 
@@ -57,7 +57,6 @@ OPTIONS=Server,jsp,jmx,resources,websocket,ext,plus,annotations
 #-----------------------------------------------------------
 #etc/jetty-jmx.xml
 etc/jetty.xml
-etc/jetty-annotations.xml
 # etc/jetty-ssl.xml
 # etc/jetty-requestlog.xml
 etc/jetty-deploy.xml

jetty-http-spi/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-http-spi</artifactId>

jetty-http/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <artifactId>jetty-project</artifactId>
     <groupId>org.eclipse.jetty</groupId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty</groupId>
@@ -18,9 +18,8 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>${servlet.spec.groupId}</groupId>
+      <groupId>javax.servlet</groupId>
-      <artifactId>${servlet.spec.artifactId}</artifactId>
+      <artifactId>servlet-api</artifactId>
-      <version>${servlet.spec.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java

@@ -19,12 +19,10 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
-import java.util.Collection;
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -348,22 +346,6 @@ public class HttpFields
         }
     }
     
-    /* -------------------------------------------------------------- */
-    /**
-     * Get Collection of header names. 
-     */
-    public Collection<String> getFieldNamesCollection()
-    {
-        final List<String> list = new ArrayList<String>(_fields.size());
-
-	for (Field f : _fields)
-	{
-	    if (f!=null)
-	        list.add(BufferUtil.to8859_1_String(f._name));
-	}
-	return list;
-    }
-    
     /* -------------------------------------------------------------- */
     /**
      * Get enumeration of header _names. Returns an enumeration of strings representing the header
@@ -396,7 +378,7 @@ public class HttpFields
     /**
      * Get a Field by index.
      * @return A Field value or null if the Field value has not been set
-     * 
+     * for this revision of the fields.
      */
     public Field getField(int i)
     {
@@ -463,30 +445,6 @@ public class HttpFields
         return field==null?null:field._value;
     }
 
-
-    /* -------------------------------------------------------------- */
-    /**
-     * Get multi headers
-     * 
-     * @return Enumeration of the values, or null if no such header.
-     * @param name the case-insensitive field name
-     */
-    public Collection<String> getValuesCollection(String name)
-    {
-        Field field = getField(name);
-	if (field==null)
-	    return null;
-
-        final List<String> list = new ArrayList<String>();
-
-	while(field!=null)
-	{
-	    list.add(field.getValue());
-	    field=field._next;
-	}
-	return list;
-    }
-
     /* -------------------------------------------------------------- */
     /**
      * Get multi headers
@@ -1414,4 +1372,5 @@ public class HttpFields
             return ("[" + getName() + "=" + _value + (_next == null ? "" : "->") + "]");
         }
     }
+
 }

jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorClientTest.java

@@ -49,7 +49,7 @@ public class HttpGeneratorClientTest
 
         generator.completeHeader(fields,false);
 
-        generator.addContent(new ByteArrayBuffer(content),true);
+        generator.addContent(new ByteArrayBuffer(content).asMutableBuffer(),true);
         generator.flushBuffer();
         generator.complete();
         generator.flushBuffer();
@@ -74,7 +74,7 @@ public class HttpGeneratorClientTest
 
         String content = "The quick brown fox jumped over the lazy dog";
 
-        generator.addContent(new ByteArrayBuffer(content),true);
+        generator.addContent(new ByteArrayBuffer(content).asMutableBuffer(),true);
         generator.completeHeader(fields,true);
 
         generator.flushBuffer();
@@ -103,7 +103,7 @@ public class HttpGeneratorClientTest
 
         generator.completeHeader(fields,false);
 
-        generator.addContent(new ByteArrayBuffer(content),false);
+        generator.addContent(new ByteArrayBuffer(content).asMutableBuffer(),false);
         generator.flushBuffer();
         generator.complete();
         generator.flushBuffer();

jetty-io/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <artifactId>jetty-project</artifactId>
     <groupId>org.eclipse.jetty</groupId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty</groupId>

jetty-io/src/main/java/org/eclipse/jetty/io/AbstractBuffer.java

@@ -500,37 +500,43 @@ public abstract class AbstractBuffer implements Buffer
 
     public void setGetIndex(int getIndex)
     {
-        /* bounds checking
+        /* bounds checking */
-        if (isImmutable()) 
+        if (__boundsChecking)
-            throw new IllegalStateException(__IMMUTABLE);
+        {
-        if (getIndex < 0)
+            if (isImmutable()) 
-            throw new IllegalArgumentException("getIndex<0: " + getIndex + "<0");
+                throw new IllegalStateException(__IMMUTABLE);
-        if (getIndex > putIndex())
+            if (getIndex < 0)
-            throw new IllegalArgumentException("getIndex>putIndex: " + getIndex + ">" + putIndex());
+                throw new IllegalArgumentException("getIndex<0: " + getIndex + "<0");
-         */
+            if (getIndex > putIndex())
+                throw new IllegalArgumentException("getIndex>putIndex: " + getIndex + ">" + putIndex());
+        }
+        
         _get = getIndex;
         _hash=0;
     }
 
     public void setMarkIndex(int index)
     {
-        /*
+        
         if (index>=0 && isImmutable()) 
             throw new IllegalStateException(__IMMUTABLE);
-        */
+        
         _mark = index;
     }
 
     public void setPutIndex(int putIndex)
     {
-        /* bounds checking
+        if (__boundsChecking)
-        if (isImmutable()) 
+        {
-            throw new IllegalStateException(__IMMUTABLE);
+            /* bounds checking */
-        if (putIndex > capacity())
+            if (isImmutable()) 
+                throw new IllegalStateException(__IMMUTABLE);
+            if (putIndex > capacity())
                 throw new IllegalArgumentException("putIndex>capacity: " + putIndex + ">" + capacity());
-        if (getIndex() > putIndex)
+            if (getIndex() > putIndex)
                 throw new IllegalArgumentException("getIndex>putIndex: " + getIndex() + ">" + putIndex);
-         */
+        }
+
         _put = putIndex;
         _hash=0;
     }

jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayBuffer.java

@@ -352,7 +352,8 @@ public class ByteArrayBuffer extends AbstractBuffer
         throws IOException
     {
         out.write(_bytes,getIndex(),length());
-        clear();
+        if (!isImmutable())
+            clear();
     }
     
     /* ------------------------------------------------------------ */

jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java

@@ -246,7 +246,8 @@ public class ByteArrayEndPoint implements ConnectedEndPoint
             }
         }
         int len = _out.put(buffer);
-        buffer.skip(len);
+        if (!buffer.isImmutable())
+            buffer.skip(len);
         return len;
     }
 

jetty-io/src/main/java/org/eclipse/jetty/io/UncheckedIOException.java

@@ -1,43 +0,0 @@
-// ========================================================================
-// Copyright (c) 2009-2009 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-// The Eclipse Public License is available at 
-// http://www.eclipse.org/legal/epl-v10.html
-// The Apache License v2.0 is available at
-// http://www.opensource.org/licenses/apache2.0.php
-// You may elect to redistribute this code under either of these licenses. 
-// ========================================================================
-
-
-package org.eclipse.jetty.io;
-
-/* ------------------------------------------------------------ */
-/**
- * Subclass of {@link java.lang.RuntimeException} used to signal that there
- * was an {@link java.io.IOException} thrown by underlying {@link UncheckedPrintWriter}
- */
-public class UncheckedIOException extends RuntimeException
-{
-    public UncheckedIOException()
-    {
-        super();
-    }
-
-    public UncheckedIOException(String message)
-    {
-        super(message);
-    }
-
-    public UncheckedIOException(Throwable cause)
-    {
-        super(cause);
-    }
-
-    public UncheckedIOException(String message, Throwable cause)
-    {
-        super(message,cause);
-    }
-}

jetty-io/src/main/java/org/eclipse/jetty/io/bio/StreamEndPoint.java

@@ -157,7 +157,8 @@ public class StreamEndPoint implements EndPoint
         int length=buffer.length();
         if (length>0)
             buffer.writeTo(_out);
-        buffer.clear();
+        if (!buffer.isImmutable())
+            buffer.clear();
         return length;
     }
 

jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java

@@ -398,12 +398,6 @@ public class ChannelEndPoint implements EndPoint
                     }
                     finally
                     {
-                        // adjust buffer 0 and 1
-                        if (!header.isImmutable())
-                            header.setGetIndex(bbuf0.position());
-                        if (!buffer.isImmutable())
-                            buffer.setGetIndex(bbuf1.position());
-
                         bbuf0.position(0);
                         bbuf1.position(0);
                         bbuf0.limit(bbuf0.capacity());

jetty-jaspi/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-jaspi</artifactId>

jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/SimpleAuthConfig.java

@@ -65,7 +65,7 @@ public class SimpleAuthConfig implements ServerAuthConfig
         return true;
     }
 
-    public void refresh() 
+    public void refresh()
     {
     }
 }

jetty-jmx/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-jmx</artifactId>

jetty-jndi/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-jndi</artifactId>

jetty-monitor/pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-monitor</artifactId>

jetty-nested/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
   </parent>
   <artifactId>jetty-nested</artifactId>
   <name>Jetty :: Nested</name>

jetty-nested/src/main/java/org/eclipse/jetty/nested/NestedConnection.java

@@ -15,7 +15,6 @@ package org.eclipse.jetty.nested;
 import java.io.IOException;
 import java.util.Enumeration;
 
-import javax.servlet.DispatcherType;
 import javax.servlet.ServletException;
 import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
@@ -25,6 +24,7 @@ import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.http.HttpURI;
 import org.eclipse.jetty.io.Connection;
 import org.eclipse.jetty.server.AbstractHttpConnection;
+import org.eclipse.jetty.server.DispatcherType;
 
 
 public class NestedConnection extends AbstractHttpConnection

jetty-nosql/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-nosql</artifactId>
@@ -28,7 +28,7 @@
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
           <instructions>
-            <Import-Package>javax.servlet.*;version="2.5.0",org.eclipse.jetty.server.session.jmx;version="8.0.0";resolution:=optional,,org.eclipse.jetty.*;version="8.0.0",*</Import-Package>
+            <Import-Package>javax.servlet.*;version="[2.5,3.0)",org.eclipse.jetty.server.session.jmx;version="[7.5,8)";resolution:=optional,,org.eclipse.jetty.*;version="[7.5,8)",*</Import-Package>
           </instructions>
         </configuration>
         <extensions>true</extensions>

jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF

@@ -3,20 +3,34 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Jetty-OSGi-Jasper integration
 Fragment-Host: org.eclipse.jetty.osgi.boot
 Bundle-SymbolicName: org.eclipse.jetty.osgi.boot.jsp
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 7.4.1.qualifier
 Bundle-Vendor: Mort Bay Consulting
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: com.sun.el;version="2.2.0";resolution:=optional,
+Import-Package: com.sun.el;resolution:=optional,
- javax.el;version="2.2.0";resolution:=optional,
+ com.sun.el.lang;resolution:=optional,
- javax.servlet.jsp;version="2.2.0",
+ com.sun.el.parser;resolution:=optional,
- javax.servlet.jsp.el;version="2.2.0",
+ com.sun.el.util;resolution:=optional,
+ com.sun.org.apache.commons.logging;split=glassfish;version="[2.1,3)";resolution:=optional,
+ javax.el;version="1.0.0";resolution:=optional,
+ javax.servlet;version="2.5.0",
+ javax.servlet.jsp;version="2.1.0",
+ javax.servlet.jsp.el;version="2.1.0",
  javax.servlet.jsp.jstl.core;version="1.2.0";resolution:=optional,
  javax.servlet.jsp.jstl.fmt;version="1.2.0";resolution:=optional,
  javax.servlet.jsp.jstl.sql;version="1.2.0";resolution:=optional,
  javax.servlet.jsp.jstl.tlv;version="1.2.0";resolution:=optional,
- org.apache.jasper;version="2.1.0";resolution:=optional,
+ javax.servlet.jsp.resources;version="2.1.0",
- org.apache.jasper.compiler;version="2.1.0";resolution:=optional,
+ javax.servlet.jsp.tagext;version="2.1.0",
- org.apache.jasper.xmlparser;version="2.1.0";resolution:=optional,
+ javax.servlet.resources;version="2.5.0",
+ org.apache.jasper;version="2.0.0";resolution:=optional,
+ org.apache.jasper.compiler;version="2.0.0";resolution:=optional,
+ org.apache.jasper.compiler.tagplugin;version="2.0.0";resolution:=optional,
+ org.apache.jasper.runtime;version="2.0.0";resolution:=optional,
+ org.apache.jasper.security;version="2.0.0";resolution:=optional,
+ org.apache.jasper.servlet;version="2.0.0";resolution:=optional,
+ org.apache.jasper.tagplugins.jstl;version="2.0.0";resolution:=optional,
+ org.apache.jasper.util;version="2.0.0";resolution:=optional,
+ org.apache.jasper.xmlparser;version="2.0.0";resolution:=optional,
  org.apache.taglibs.standard;version="1.2.0";resolution:=optional,
  org.apache.taglibs.standard.extra.spath;version="1.2.0";resolution:=optional,
  org.apache.taglibs.standard.functions;version="1.2.0";resolution:=optional,
@@ -40,6 +54,4 @@ Import-Package: com.sun.el;version="2.2.0";resolution:=optional,
  org.apache.taglibs.standard.tag.rt.xml;version="1.2.0";resolution:=optional,
  org.apache.taglibs.standard.tei;version="1.2.0";resolution:=optional,
  org.apache.taglibs.standard.tlv;version="1.2.0";resolution:=optional,
- org.glassfish.jsp.api;version="2.2.2";resolution:=optional
+ org.eclipse.jetty.jsp;version="[7.0,8.0)";resolution:=optional
-DynamicImport-Package: org.apache.jasper.*;version="2.1.0"
-

jetty-osgi/jetty-osgi-boot-jsp/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.osgi</groupId>
     <artifactId>jetty-osgi-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -32,41 +32,19 @@
         <groupId>org.eclipse.osgi</groupId>
         <artifactId>org.eclipse.osgi.services</artifactId>
     </dependency>
-<!-- switch to 2.2 once it works in OSGi for us
-    <dependency>
-      <groupId>org.glassfish.web</groupId>
-      <artifactId>jsp-impl</artifactId>
-      <version>2.2</version>
-    </dependency> -->
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-2.1-glassfish</artifactId>
-      <version>2.1.v20100127</version>
-    </dependency>
-    <!--dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>2.2</version>
-    </dependency-->
-    <dependency>
-      <groupId>javax.el</groupId>
-      <artifactId>el-api</artifactId>
-      <version>2.2</version>
     </dependency>
     <dependency>
-     <groupId>${servlet.spec.groupId}</groupId>
+      <groupId>org.mortbay.jetty</groupId>
-     <artifactId>${servlet.spec.artifactId}</artifactId>
+      <artifactId>jsp-api-2.1-glassfish</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
     </dependency>
   </dependencies>
-  <!-- can't find the jsp-2.2 jars on maven central.
-    adding glassifish maven repo for now. -->
-  <repositories>
-    <repository>
-      <id>sun</id>
-      <url>http://download.java.net/maven/2/</url>
-    </repository>
-  </repositories>
-
 
   <build>
     <plugins>
@@ -77,7 +55,7 @@
             <phase>process-resources</phase>
             <configuration>
               <tasks>
-                <replace file="target/classes/META-INF/MANIFEST.MF" token="Bundle-Version: 8.0.0.qualifier" value="Bundle-Version: ${parsedVersion.osgiVersion}" />
+                <replace file="target/classes/META-INF/MANIFEST.MF" token="Bundle-Version: 7.4.1.qualifier" value="Bundle-Version: ${parsedVersion.osgiVersion}" />
               </tasks>
             </configuration>
             <goals>

jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/WebappRegistrationCustomizerImpl.java

@@ -122,6 +122,7 @@ public class WebappRegistrationCustomizerImpl implements WebappRegistrationCusto
      */
     public URL[] getJarsWithTlds(OSGiAppProvider provider, BundleFileLocatorHelper locatorHelper) throws Exception
     {
+    	
     	HashSet<Class<?>> classesToAddToTheTldBundles = new HashSet<Class<?>>();
 
     	//Look for the jstl bundle

jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java

@@ -36,7 +36,7 @@ public class FragmentActivator implements BundleActivator
      * 
      */
     public void start(BundleContext context) throws Exception {
-    	System.setProperty("org.apache.jasper.compiler.disablejsr199", Boolean.TRUE.toString());
+        System.setProperty("org.apache.jasper.compiler.disablejsr199", Boolean.TRUE.toString());
         WebBundleDeployerHelper.JSP_REGISTRATION_HELPERS.add(new WebappRegistrationCustomizerImpl());
         WebBundleDeployerHelper.JSP_REGISTRATION_HELPERS.add(new PluggableWebAppRegistrationCustomizerImpl());
     }

jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF

@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Jetty-OSGi-Logback integration
+Fragment-Host: org.eclipse.jetty.osgi.boot
+Bundle-SymbolicName: org.eclipse.jetty.osgi.boot.logback;singleton:=true
+Bundle-Version: 7.3.0.qualifier
+Bundle-Vendor: Mort Bay Consulting
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: ch.qos.logback.classic,
+ ch.qos.logback.classic.joran,
+ ch.qos.logback.core,
+ ch.qos.logback.core.joran,
+ ch.qos.logback.core.joran.spi,
+ ch.qos.logback.core.spi,
+ ch.qos.logback.core.util,
+ ch.qos.logback.access.jetty.v7;resolution:=optional,
+ org.apache.commons.logging;resolution:=optional,
+ org.apache.log4j;resolution:=optional,
+ org.osgi.framework,
+ org.slf4j

jetty-osgi/jetty-osgi-boot-logback/META-INF/readme.txt

@@ -0,0 +1,12 @@
+This bundle is made to inject the logback dependencies along with the slf4j dependencies to support log4j and commons-logging.
+It will read the configuration in the jettyhome/resources/logback-test.xml or jettyhome/resources/logback.xml folder. 
+
+
+It was tested with these bundles:
+#this provides lg4j and commons-logging via slf4j
+SLF4J = group("com.springsource.slf4j.api", "com.springsource.slf4j.org.apache.log4j", "com.springsource.slf4j.org.apache.commons.logging",
+          :under=>"org.slf4j", :version=>"1.5.6")
+
+#logback is not exporting enough packages for us to be able to configure logback classic programatically.. on the springsource version they are fine...
+LOGBACK = group("com.springsource.ch.qos.logback.core", "com.springsource.ch.qos.logback.classic",
+          :under=>"ch.qos.logback", :version=>"0.9.15")

jetty-osgi/jetty-osgi-boot-logback/build.properties

@@ -0,0 +1,5 @@
+source.. = src/main/java/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .
+src.includes = META-INF/

jetty-osgi/jetty-osgi-boot-logback/pom.xml

@@ -0,0 +1,109 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.eclipse.jetty.osgi</groupId>
+    <artifactId>jetty-osgi-project</artifactId>
+    <version>7.6.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.eclipse.jetty.osgi</groupId>
+  <artifactId>jetty-osgi-boot-logback</artifactId>
+  <name>Jetty :: OSGi :: Boot Logback</name>
+  <description>Jetty OSGi Boot Logback bundle</description>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.boot.logback</bundle-symbolic-name>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty.osgi</groupId>
+      <artifactId>jetty-osgi-boot</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+    	<groupId>org.eclipse.osgi</groupId>
+    	<artifactId>org.eclipse.osgi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-webapp</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.eclipse.osgi</groupId>
+        <artifactId>org.eclipse.osgi.services</artifactId>
+    </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jcl-over-slf4j</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>log4j-over-slf4j</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-core</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-classic</artifactId>
+      </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>process-resources</phase>
+            <configuration>
+              <tasks>
+                <replace file="target/classes/META-INF/MANIFEST.MF" token="Bundle-Version: 7.3.0.qualifier" value="Bundle-Version: ${parsedVersion.osgiVersion}" />
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>artifact-jar</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>test-jar</id>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <archive>
+            <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <configuration>
+          <onlyAnalyze>org.eclipse.jetty.osgi.boot.logback.*</onlyAnalyze>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+
+</project>

jetty-osgi/jetty-osgi-boot-logback/src/main/java/org/eclipse/jetty/osgi/boot/logback/FragmentActivator.java

@@ -0,0 +1,86 @@
+// ========================================================================
+// Copyright (c) 2009 Intalio, Inc.
+// ------------------------------------------------------------------------
+// All rights reserved. This program and the accompanying materials
+// are made available under the terms of the Eclipse Public License v1.0
+// and Apache License v2.0 which accompanies this distribution.
+// The Eclipse Public License is available at 
+// http://www.eclipse.org/legal/epl-v10.html
+// The Apache License v2.0 is available at
+// http://www.opensource.org/licenses/apache2.0.php
+// You may elect to redistribute this code under either of these licenses. 
+// ========================================================================
+package org.eclipse.jetty.osgi.boot.logback;
+
+import java.io.File;
+import java.util.Map;
+
+import org.eclipse.jetty.osgi.boot.internal.webapp.LibExtClassLoaderHelper;
+import org.eclipse.jetty.osgi.boot.internal.webapp.OSGiWebappClassLoader;
+import org.eclipse.jetty.osgi.boot.internal.webapp.LibExtClassLoaderHelper.IFilesInJettyHomeResourcesProcessor;
+import org.eclipse.jetty.osgi.boot.logback.internal.LogbackInitializer;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+
+/**
+ * Pseudo fragment activator.
+ * Called by the main org.eclipse.jetty.osgi.boot bundle.
+ * Please note: this is not a real BundleActivator. Simply something called back by
+ * the host bundle.
+ * The fragment is in charge of placing a hook to configure logback
+ * when the files inside jettyhome/resources are parsed.
+ */
+public class FragmentActivator implements BundleActivator, IFilesInJettyHomeResourcesProcessor
+{
+    /**
+     * 
+     */
+    public void start(BundleContext context) throws Exception
+    {
+        LibExtClassLoaderHelper.registeredFilesInJettyHomeResourcesProcessors.add(this);
+        
+        //now let's make sure no log4j, no slf4j and no commons.logging
+        //get inserted as a library that is not an osgi library
+        OSGiWebappClassLoader.addClassThatIdentifiesAJarThatMustBeRejected("org.apache.commons.logging.Log");
+        OSGiWebappClassLoader.addClassThatIdentifiesAJarThatMustBeRejected("org.apache.log4j.Logger");
+        OSGiWebappClassLoader.addClassThatIdentifiesAJarThatMustBeRejected("org.slf4j.Logger");
+        //OSGiWebappClassLoader.addClassThatIdentifiesAJarThatMustBeRejected(java.util.logging.Logger.class);
+        
+    }
+
+    /**
+     * Called when this bundle is stopped so the Framework can perform the
+     * bundle-specific activities necessary to stop the bundle. In general, this
+     * method should undo the work that the <code>BundleActivator.start</code>
+     * method started. There should be no active threads that were started by
+     * this bundle when this bundle returns. A stopped bundle must not call any
+     * Framework objects.
+     * 
+     * <p>
+     * This method must complete and return to its caller in a timely manner.
+     * 
+     * @param context The execution context of the bundle being stopped.
+     * @throws Exception If this method throws an exception, the
+     *         bundle is still marked as stopped, and the Framework will remove
+     *         the bundle's listeners, unregister all services registered by the
+     *         bundle, and release all services used by the bundle.
+     */
+    public void stop(BundleContext context) throws Exception
+    {
+    	LibExtClassLoaderHelper.registeredFilesInJettyHomeResourcesProcessors.remove(this);
+    }
+    
+    public void processFilesInResourcesFolder(File jettyHome, Map<String,File> files)
+    {
+    	try
+    	{
+    		LogbackInitializer.processFilesInResourcesFolder(jettyHome, files);
+    	}
+    	catch (Throwable t)
+    	{
+    		t.printStackTrace();
+    	}
+    }
+    
+}

jetty-osgi/jetty-osgi-boot-logback/src/main/java/org/eclipse/jetty/osgi/boot/logback/internal/LogbackInitializer.java

@@ -0,0 +1,98 @@
+// ========================================================================
+// Copyright (c) 2009 Intalio, Inc.
+// ------------------------------------------------------------------------
+// All rights reserved. This program and the accompanying materials
+// are made available under the terms of the Eclipse Public License v1.0
+// and Apache License v2.0 which accompanies this distribution.
+// The Eclipse Public License is available at 
+// http://www.eclipse.org/legal/epl-v10.html
+// The Apache License v2.0 is available at
+// http://www.opensource.org/licenses/apache2.0.php
+// You may elect to redistribute this code under either of these licenses. 
+// Contributors:
+//    Hugues Malphettes - initial API and implementation
+// ========================================================================
+package org.eclipse.jetty.osgi.boot.logback.internal;
+
+import java.io.File;
+import java.util.Map;
+
+import org.slf4j.LoggerFactory;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.joran.JoranConfigurator;
+import ch.qos.logback.core.joran.JoranConfiguratorBase;
+import ch.qos.logback.core.joran.spi.JoranException;
+import ch.qos.logback.core.util.StatusPrinter;
+
+/**
+ * Setup logback eventually located in the config file inside jettyhome/resources
+ * All logback related code is done in this separate class for better debug
+ * and isolation when it does not load.
+ */
+public class LogbackInitializer {
+
+    /**
+     * @return true when we are currently being run by the pde in development mode.
+     */
+    private static boolean isPDEDevelopment()
+    {
+        String eclipseCommands = System.getProperty("eclipse.commands");
+        // detect if we are being run from the pde: ie during development.
+        return eclipseCommands != null && eclipseCommands.indexOf("-dev") != -1
+                && (eclipseCommands.indexOf("-dev\n") != -1
+                        || eclipseCommands.indexOf("-dev\r") != -1
+                        || eclipseCommands.indexOf("-dev ") != -1);
+    }
+
+    
+    /**
+     * Follow the configuration for logback.
+     * unless the system propery was set in which case it
+     * was assume it was already setup.
+     */
+    public static void processFilesInResourcesFolder(File jettyHome, Map<String,File> files)
+    {
+    	String logbackConf = System.getProperty("logback.configurationFile");
+    	if (logbackConf != null)
+    	{
+    		File confFile = new File(logbackConf);
+    		if (confFile.exists())
+    		{
+    			//assume logback was configured by this one?
+    			return;
+    		}
+    	}
+    	
+    	File logConf = isPDEDevelopment() ? files.get("logback-dev.xml") : null;
+	    if (logConf == null)
+	    {
+	        logConf = files.get("logback-test.xml");
+	    }
+	    if (logConf == null)
+	    {
+	        logConf = files.get("logback.xml");
+	    }
+	    if (logConf == null)
+	    {
+	        return;
+	    }
+	 // assume SLF4J is bound to logback in the current environment
+	    LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
+	    
+	    try
+	    {
+	      JoranConfiguratorBase configurator = new JoranConfigurator();
+	      configurator.setContext(lc);
+	      lc.reset(); 
+	      configurator.doConfigure(logConf.getAbsoluteFile().getAbsolutePath());
+	    }
+	    catch (JoranException je)
+	    {
+	       je.printStackTrace();
+	    }
+	    StatusPrinter.printIfErrorsOccured(lc);
+	    
+    }
+
+}

jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF

@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Support for rfc66 war url scheme
 Bundle-SymbolicName: org.eclipse.jetty.osgi.boot.warurl;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 7.3.0.qualifier
 Bundle-Activator: org.eclipse.jetty.osgi.boot.warurl.WarUrlActivator
 Bundle-Vendor: Mort Bay Consulting
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.eclipse.jetty.util,
  org.osgi.framework,
  org.osgi.service.url

jetty-osgi/jetty-osgi-boot-warurl/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.osgi</groupId>
     <artifactId>jetty-osgi-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -33,7 +33,7 @@
             <phase>process-resources</phase>
             <configuration>
               <tasks>
-                <replace file="target/classes/META-INF/MANIFEST.MF" token="Bundle-Version: 8.0.0.qualifier" value="Bundle-Version: ${parsedVersion.osgiVersion}" />
+                <replace file="target/classes/META-INF/MANIFEST.MF" token="Bundle-Version: 7.3.0.qualifier" value="Bundle-Version: ${parsedVersion.osgiVersion}" />
               </tasks>
             </configuration>
             <goals>

jetty-osgi/jetty-osgi-boot-warurl/pom.xml.tycho

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>jetty-osgi</artifactId>
+    <version>7.0.1-SNAPSHOT</version>
+    <groupId>org.eclipse.jetty.osgi</groupId>
+  </parent>
+  <groupId>org.eclipse.jetty.osgi</groupId>
+  <artifactId>org.eclipse.jetty.osgi.boot.warurl</artifactId>
+  <version>7.0.1.qualifier</version>
+  <packaging>eclipse-plugin</packaging>
+</project>

jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF

@@ -1,34 +1,32 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Jetty OSGi bootstrap
-Bundle-SymbolicName: org.eclipse.jetty.osgi.boot
+Bundle-SymbolicName: org.eclipse.jetty.osgi.boot;singleton:=true
 Bundle-Vendor: Mort Bay Consulting
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 7.4.3.qualifier
 Bundle-Activator: org.eclipse.jetty.osgi.boot.JettyBootstrapActivator
 Import-Package: javax.mail;version="1.4.0";resolution:=optional,
  javax.mail.event;version="1.4.0";resolution:=optional,
  javax.mail.internet;version="1.4.0";resolution:=optional,
  javax.mail.search;version="1.4.0";resolution:=optional,
  javax.mail.util;version="1.4.0";resolution:=optional,
- javax.servlet;version="3.0",
+ javax.servlet;version="2.5.0",
- javax.servlet.http;version="3.0",
+ javax.servlet.http;version="2.5.0",
  javax.transaction;version="1.1.0";resolution:=optional,
  javax.transaction.xa;version="1.1.0";resolution:=optional,
- org.eclipse.jetty.nested;version="8.0.0";resolution:=optional,
+ org.eclipse.jetty.deploy;version="7.4.0",
- org.eclipse.jetty.annotations;version="8.0.0";resolution:=optional,
+ org.eclipse.jetty.deploy.providers;version="7.4.0",
- org.eclipse.jetty.deploy;version="8.0.0",
+ org.eclipse.jetty.http;version="7.4.0",
- org.eclipse.jetty.deploy.providers;version="8.0.0",
+ org.eclipse.jetty.nested;version="7.4.0";resolution:=optional,
- org.eclipse.jetty.http;version="8.0.0",
+ org.eclipse.jetty.server;version="7.4.0",
- org.eclipse.jetty.nested;version="8.0.0";resolution:=optional,
+ org.eclipse.jetty.server.handler;version="7.4.0",
- org.eclipse.jetty.server;version="8.0.0",
+ org.eclipse.jetty.servlet;version="7.4.0",
- org.eclipse.jetty.server.handler;version="8.0.0",
+ org.eclipse.jetty.util;version="7.4.0",
- org.eclipse.jetty.servlet;version="8.0.0",
+ org.eclipse.jetty.util.component;version="7.4.0",
- org.eclipse.jetty.util;version="8.0.0",
+ org.eclipse.jetty.util.log;version="7.4.0",
- org.eclipse.jetty.util.component;version="8.0.0",
+ org.eclipse.jetty.util.resource;version="7.4.0",
- org.eclipse.jetty.util.log;version="8.0.0",
+ org.eclipse.jetty.webapp;version="7.4.1.v20110513",
- org.eclipse.jetty.util.resource;version="8.0.0",
+ org.eclipse.jetty.xml;version="7.4.0",
- org.eclipse.jetty.webapp;version="8.0.0",
- org.eclipse.jetty.xml;version="8.0.0",
  org.osgi.framework,
  org.osgi.service.cm;version="1.2.0",
  org.osgi.service.packageadmin,
@@ -40,10 +38,9 @@ Import-Package: javax.mail;version="1.4.0";resolution:=optional,
  org.slf4j.spi;resolution:=optional,
  org.xml.sax,
  org.xml.sax.helpers
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Classpath: .
-Export-Package: org.eclipse.jetty.osgi.boot;version="8.0.0",
+Export-Package: org.eclipse.jetty.osgi.boot;version="7.4.0",
- org.eclipse.jetty.osgi.nested;version="8.0.0",
+ org.eclipse.jetty.osgi.nested;version="7.4.0",
- org.eclipse.jetty.osgi.boot.utils;version="8.0.0",
+ org.eclipse.jetty.osgi.boot.utils;version="7.4.0"
- org.eclipse.jetty.osgi.annotations;version="8.0.0"
+DynamicImport-Package: org.eclipse.jetty.*;version="[7.3,8)"
-DynamicImport-Package: org.eclipse.jetty.*;version="[8.0,9)"

jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-osgi-default.xml

@@ -123,6 +123,7 @@
               </New>
             </Arg>
           </Call>
+          
         </New>
       </Arg>
     </Call>

jetty-osgi/jetty-osgi-boot/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.osgi</groupId>
     <artifactId>jetty-osgi-project</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>7.6.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -14,10 +14,6 @@
     <bundle-symbolic-name>${project.groupId}.boot</bundle-symbolic-name>
   </properties>
   <dependencies>
-      <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-annotations</artifactId>
-      </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-webapp</artifactId>
@@ -121,8 +117,6 @@
  javax.servlet.http;version="2.5.0",
  javax.transaction;version="1.1.0";resolution:=optional,
  javax.transaction.xa;version="1.1.0";resolution:=optional,
- org.eclipse.jetty.nested;version="8.0.0";resolution:=optional,
- org.eclipse.jetty.annotations;version="8.0.0";resolution:=optional,
  org.osgi.framework,
  org.osgi.service.cm;version="1.2.0",
  org.osgi.service.packageadmin,
@@ -134,11 +128,12 @@
  org.slf4j.helpers;resolution:=optional,
  org.xml.sax,
  org.xml.sax.helpers,
+ org.eclipse.jetty.nested;resolution:=optional,
  *
                         </Import-Package>
-                        <DynamicImport-Package>org.eclipse.jetty.*;version="[8.0.0,9.0.0)"</DynamicImport-Package>
+                        <DynamicImport-Package>org.eclipse.jetty.*;version="[7.3,8)"</DynamicImport-Package>
                         <!--Require-Bundle/-->
-                        <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment> 
+                        <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment> 
                     </instructions>
                 </configuration>
             </plugin>

jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationConfiguration.java

@@ -1,197 +0,0 @@
-// ========================================================================
-// Copyright (c) 2006-2011 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-// The Eclipse Public License is available at 
-// http://www.eclipse.org/legal/epl-v10.html
-// The Apache License v2.0 is available at
-// http://www.opensource.org/licenses/apache2.0.php
-// You may elect to redistribute this code under either of these licenses. 
-// ========================================================================
-package org.eclipse.jetty.osgi.annotations;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jetty.annotations.ClassNameResolver;
-import org.eclipse.jetty.osgi.boot.OSGiWebappConstants;
-import org.eclipse.jetty.osgi.boot.utils.internal.PackageAdminServiceTracker;
-import org.eclipse.jetty.util.resource.Resource;
-import org.eclipse.jetty.webapp.DiscoveredAnnotation;
-import org.eclipse.jetty.webapp.WebAppContext;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Constants;
-
-/**
- * Extend the AnnotationConfiguration to support OSGi:
- * Look for annotations inside WEB-INF/lib and also in the fragments and required bundles.
- * Discover them using a scanner adapted to OSGi instead of the jarscanner. 
- */
-public class AnnotationConfiguration extends org.eclipse.jetty.annotations.AnnotationConfiguration
-{
-
-    /**
-     * This parser scans the bundles using the OSGi APIs instead of assuming a jar.
-     */
-    @Override
-    protected org.eclipse.jetty.annotations.AnnotationParser createAnnotationParser()
-    {
-        return new AnnotationParser();
-    }
-    
-    /**
-     * Here is the order in which jars and osgi artifacts are scanned for discoverable annotations.
-     * <ol>
-     * <li>The container jars are scanned.</li>
-     * <li>The WEB-INF/classes are scanned</li>
-     * <li>The osgi fragment to the web bundle are parsed.</li>
-     * <li>The WEB-INF/lib are scanned</li>
-     * <li>The required bundles are parsed</li>
-     * </ol>
-     */
-    @Override
-    public void parseWebInfLib (WebAppContext context, org.eclipse.jetty.annotations.AnnotationParser parser)
-    throws Exception
-    {
-        AnnotationParser oparser = (AnnotationParser)parser;
-        
-        Bundle webbundle = (Bundle) context.getAttribute(OSGiWebappConstants.JETTY_OSGI_BUNDLE);
-        Bundle[] fragAndRequiredBundles = PackageAdminServiceTracker.INSTANCE.getFragmentsAndRequiredBundles(webbundle);
-        if (fragAndRequiredBundles != null)
-        {
-            //index:
-            for (Bundle bundle : fragAndRequiredBundles)
-            {
-                Resource bundleRes = oparser.indexBundle(bundle);
-                if (!context.getMetaData().getWebInfJars().contains(bundleRes))
-                {
-                    context.getMetaData().addWebInfJar(bundleRes);
-                }
-            }
-        
-            //scan the fragments
-            for (Bundle fragmentBundle : fragAndRequiredBundles)
-            {
-                if (fragmentBundle.getHeaders().get(Constants.FRAGMENT_HOST) != null)
-                {
-                    //a fragment indeed:
-                    parseFragmentBundle(context,oparser,webbundle,fragmentBundle);
-                }
-            }
-        }
-        //scan ourselves
-        parseWebBundle(context,oparser,webbundle);
-        
-        //scan the WEB-INF/lib
-        super.parseWebInfLib(context,parser);
-        if (fragAndRequiredBundles != null)
-        {
-            //scan the required bundles
-            for (Bundle requiredBundle : fragAndRequiredBundles)
-            {
-                if (requiredBundle.getHeaders().get(Constants.FRAGMENT_HOST) == null)
-                {
-                    //a bundle indeed:
-                    parseRequiredBundle(context,oparser,webbundle,requiredBundle);
-                }
-            }
-        }
-    }
-    
-    /**
-     * Scan a fragment bundle for servlet annotations
-     * @param context The webapp context
-     * @param parser The parser
-     * @param webbundle The current webbundle
-     * @param fragmentBundle The OSGi fragment bundle to scan
-     * @throws Exception
-     */
-    protected void parseFragmentBundle(WebAppContext context, AnnotationParser parser,
-            Bundle webbundle, Bundle fragmentBundle) throws Exception
-    {
-        parseBundle(context,parser,webbundle,fragmentBundle);
-    }
-    
-    /**
-     * Scan a bundle required by the webbundle for servlet annotations
-     * @param context The webapp context
-     * @param parser The parser
-     * @param webbundle The current webbundle
-     * @param fragmentBundle The OSGi required bundle to scan
-     * @throws Exception
-     */
-    protected void parseWebBundle(WebAppContext context, AnnotationParser parser, Bundle webbundle)
-    throws Exception
-    {
-        parseBundle(context,parser,webbundle,webbundle);
-    }
-    
-    /**
-     * Scan a bundle required by the webbundle for servlet annotations
-     * @param context The webapp context
-     * @param parser The parser
-     * @param webbundle The current webbundle
-     * @param fragmentBundle The OSGi required bundle to scan
-     * @throws Exception
-     */
-    protected void parseRequiredBundle(WebAppContext context, AnnotationParser parser,
-            Bundle webbundle, Bundle requiredBundle) throws Exception
-    {
-        parseBundle(context,parser,webbundle,requiredBundle);
-    }
-    
-    protected void parseBundle(WebAppContext context, AnnotationParser parser,
-            Bundle webbundle, Bundle bundle) throws Exception
-    {
-        Resource bundleRes = parser.getResource(bundle);
-        parser.parse(bundle,createClassNameResolver(context));
-        List<DiscoveredAnnotation> annotations = new ArrayList<DiscoveredAnnotation>();
-        gatherAnnotations(annotations, parser.getAnnotationHandlers());
-        if (webbundle == bundle)
-        {
-            //just like the super with its question about annotations in WEB-INF/classes:
-            //"TODO - where to set the annotations discovered from WEB-INF/classes?"
-            context.getMetaData().addDiscoveredAnnotations(annotations);
-        }
-        else
-        {
-            context.getMetaData().addDiscoveredAnnotations(bundleRes, annotations);
-        }
-    }
-    
-    /**
-     * Returns the same classname resolver than for the webInfjar scanner
-     * @param context
-     * @return
-     */
-    protected ClassNameResolver createClassNameResolver(final WebAppContext context)
-    {
-        return createClassNameResolver(context,true,false,false,false);
-    }
-    
-    protected ClassNameResolver createClassNameResolver(final WebAppContext context,
-            final boolean excludeSysClass, final boolean excludeServerClass, final boolean excludeEverythingElse,
-            final boolean overrideIsParenLoaderIsPriority)
-    {
-        return new ClassNameResolver ()
-        {
-            public boolean isExcluded (String name)
-            {
-                if (context.isSystemClass(name)) return excludeSysClass;
-                if (context.isServerClass(name)) return excludeServerClass;
-                return excludeEverythingElse;
-            }
-
-            public boolean shouldOverride (String name)
-            { 
-                //looking at system classpath
-                if (context.isParentLoaderPriority())
-                    return overrideIsParenLoaderIsPriority;
-                return !overrideIsParenLoaderIsPriority;
-            }
-        };
-    }
-
-}

jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java

@@ -1,192 +0,0 @@
-// ========================================================================
-// Copyright (c) 2006-2009 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-// The Eclipse Public License is available at 
-// http://www.eclipse.org/legal/epl-v10.html
-// The Apache License v2.0 is available at
-// http://www.opensource.org/licenses/apache2.0.php
-// You may elect to redistribute this code under either of these licenses. 
-// ========================================================================
-
-package org.eclipse.jetty.osgi.annotations;
-
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.TreeSet;
-
-import org.eclipse.jetty.annotations.ClassNameResolver;
-import org.eclipse.jetty.osgi.boot.utils.BundleFileLocatorHelper;
-import org.eclipse.jetty.util.resource.Resource;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Constants;
-
-/**
- * 
- */
-public class AnnotationParser extends org.eclipse.jetty.annotations.AnnotationParser
-{
-    private Set<URI> _alreadyParsed = new HashSet<URI>();
-    
-    private Map<URI,Bundle> _uriToBundle = new HashMap<URI, Bundle>();
-    private Map<Bundle,Resource> _resourceToBundle = new HashMap<Bundle,Resource>();
-    private Map<Bundle,URI> _bundleToUri = new HashMap<Bundle, URI>();
-    
-    /**
-     * Keep track of a jetty URI Resource and its associated OSGi bundle.
-     * @param uri
-     * @param bundle
-     * @throws Exception 
-     */
-    protected Resource indexBundle(Bundle bundle) throws Exception
-    {
-        File bundleFile = BundleFileLocatorHelper.DEFAULT.getBundleInstallLocation(bundle);
-        Resource resource = Resource.newResource(bundleFile.toURI());
-        URI uri = resource.getURI();
-        _uriToBundle.put(uri,bundle);
-        _bundleToUri.put(bundle,uri);
-        _resourceToBundle.put(bundle,resource);
-        return resource;
-    }
-    protected URI getURI(Bundle bundle)
-    {
-        return _bundleToUri.get(bundle);
-    }
-    protected Resource getResource(Bundle bundle)
-    {
-        return _resourceToBundle.get(bundle);
-    }
-    /**
-     * 
-     */
-    @Override
-    public void parse (URI[] uris, ClassNameResolver resolver)
-    throws Exception
-    {
-        for (URI uri : uris)
-        {
-            Bundle associatedBundle = _uriToBundle.get(uri);
-            if (associatedBundle == null)
-            {
-                if (!_alreadyParsed.add(uri))
-                {
-                    continue;
-                }
-                //a jar in WEB-INF/lib or the WEB-INF/classes
-                //use the behavior of the super class for a standard jar.
-                super.parse(new URI[] {uri},resolver);
-            }
-            else
-            {
-                parse(associatedBundle,resolver);
-            }
-        }
-    }
-    
-    protected void parse(Bundle bundle, ClassNameResolver resolver)
-    throws Exception
-    {
-        URI uri = _bundleToUri.get(bundle);
-        if (!_alreadyParsed.add(uri))
-        {
-            return;
-        }
-        
-        String bundleClasspath = (String)bundle.getHeaders().get(Constants.BUNDLE_CLASSPATH);
-        if (bundleClasspath == null)
-        {
-            bundleClasspath = ".";
-        }
-        //order the paths first by the number of tokens in the path second alphabetically.
-        TreeSet<String> paths = new TreeSet<String>(
-                new Comparator<String>()
-                {
-                    public int compare(String o1, String o2)
-                    {
-                        int paths1 = new StringTokenizer(o1,"/",false).countTokens();
-                        int paths2 = new StringTokenizer(o2,"/",false).countTokens();
-                        if (paths1 == paths2)
-                        {
-                            return o1.compareTo(o2);
-                        }
-                        return paths2 - paths1;
-                    }
-                });
-        boolean hasDotPath = false;
-        StringTokenizer tokenizer = new StringTokenizer(bundleClasspath, ",;", false);
-        while (tokenizer.hasMoreTokens())
-        {
-            String token = tokenizer.nextToken().trim();
-            if (!token.startsWith("/"))
-            {
-                token = "/" + token;
-            }
-            if (token.equals("/."))
-            {
-                hasDotPath = true;
-            }
-            else if (!token.endsWith(".jar") && !token.endsWith("/"))
-            {
-                paths.add(token+"/");
-            }
-            else
-            {
-                paths.add(token);
-            }
-        }
-        //support the development environment: maybe the classes are inside bin or target/classes
-        //this is certainly not useful in production.
-        //however it makes our life so much easier during development.
-        if (bundle.getEntry("/.classpath") != null)
-        {
-            if (bundle.getEntry("/bin/") != null)
-            {
-                paths.add("/bin/");
-            }
-            else if (bundle.getEntry("/target/classes/") != null)
-            {
-                paths.add("/target/classes/");
-            }
-        }
-        Enumeration classes = bundle.findEntries("/","*.class",true);
-        if (classes == null)
-        {
-            return;
-        }
-        while (classes.hasMoreElements())
-        {
-            URL classUrl = (URL) classes.nextElement();
-            String path = classUrl.getPath();
-            //remove the longest path possible:
-            String name = null;
-            for (String prefixPath : paths)
-            {
-                if (path.startsWith(prefixPath))
-                {
-                    name = path.substring(prefixPath.length());
-                    break;
-                }
-            }
-            if (name == null && hasDotPath)
-            {
-                //remove the starting '/'
-                name = path.substring(1);
-            }
-            //transform into a classname to pass to the resolver
-            String shortName =  name.replace('/', '.').substring(0,name.length()-6);
-            if ((resolver == null)|| (!resolver.isExcluded(shortName) && (!isParsed(shortName) || resolver.shouldOverride(shortName))))
-                scanClass(classUrl.openStream());
-        }
-    }
-    
-}

jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java

@@ -69,6 +69,7 @@ public class OSGiAppProvider extends ScanningAppProvider implements AppProvider
     private String _defaultsDescriptor;
     private String _tldBundles;
     private String[] _configurationClasses;
+    
     private boolean _autoInstallOSGiBundles = true;
     
     //Keep track of the bundles that were installed and that are waiting for the