From 95cdbc95d6769f49a4b9247e949a0aedca7f4f42 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <greg@webtide.com>
Date: Wed, 22 Apr 2009 08:18:31 +0000
Subject: [PATCH] tweaks to fix names after move

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@179 7e9141cc-0065-0410-87d8-b60c137991c4
---
 jetty-server/src/main/config/etc/jetty-proxy.xml             | 2 +-
 .../org/eclipse/jetty/server/handler/ContextHandler.java     | 2 +-
 .../src/main/resources/org/eclipse/jetty/start/start.config  | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/jetty-server/src/main/config/etc/jetty-proxy.xml b/jetty-server/src/main/config/etc/jetty-proxy.xml
index c6ca5d8119b..9fe82f14298 100644
--- a/jetty-server/src/main/config/etc/jetty-proxy.xml
+++ b/jetty-server/src/main/config/etc/jetty-proxy.xml
@@ -47,7 +47,7 @@
     <Set name="handler">
       <New id="Servlets" class="org.eclipse.jetty.servlet.ServletHandler">
         <Call name="addServletWithMapping">
-	  <Arg>org.eclipse.jetty.servlets.AsyncProxyServlet</Arg>
+	  <Arg>org.eclipse.jetty.servlets.ProxyServlet</Arg>
 	  <Arg>/</Arg>
 	</Call>
       </New>
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
index bb1726877b2..68a50f0af13 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
@@ -362,7 +362,7 @@ public class ContextHandler extends HandlerWrapper implements Attributes, Server
             {
                 Resource resource = newResource(urls[i]);
                 File file=resource.getFile();
-                if (file.exists())
+                if (file!=null && file.exists())
                 {
                     if (classpath.length()>0)
                         classpath.append(File.pathSeparatorChar);
diff --git a/jetty-start/src/main/resources/org/eclipse/jetty/start/start.config b/jetty-start/src/main/resources/org/eclipse/jetty/start/start.config
index 4d17691bd96..691fbe19573 100644
--- a/jetty-start/src/main/resources/org/eclipse/jetty/start/start.config
+++ b/jetty-start/src/main/resources/org/eclipse/jetty/start/start.config
@@ -108,7 +108,10 @@ $(jetty.home)/lib/jetty-rewrite-$(version).jar
 
 [All,jmx]
 $(jetty.home)/lib/jetty-jmx-$(version).jar                                              ! available org.eclipse.jetty.jmx.MBeanContainer
-                 
+                  
+[All,ajp]
+$(jetty.home)/lib/jetty-ajp-$(version).jar                                              ! available org.eclipse.jetty.ajp.Ajp13Connection      
+                   
 [All,slf4j]
 $(jetty.home)/lib/slf4j/**                                                              exists $(jetty.home)/lib/slf4j