Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[BUG 292642] 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1007 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Athena Yao 2009-10-19 07:54:33 +00:00
parent 75c80264c2
commit c92a35af5d
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
VERSION.txt
View File

@ -9,6 +9,7 @@ jetty-7.0.1-SNAPSHOT
+ 291340 Race condition in onException() notifications
+ 291543 make bin/*.sh scripts executable in distribution
+ 291589 Update jetty-rewrite demo
+ 292642 Fix errors in embedded Jetty examples
+ JETTY-937 More JVM bug work arounds. Insert pause if all else fails
+ JETTY-983 Send content-length with multipart ranges
+ JETTY-1114 unsynchronised WebAppClassloader.getResource(String)

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

@ -39,7 +39,7 @@ public class LikeJettyXml
{
public static void main(String[] args) throws Exception
{
String jetty_home = System.getProperty("jetty.home","..");
String jetty_home = System.getProperty("jetty.home","../jetty-distribution/target/distribution");
System.setProperty("jetty.home",jetty_home);
Server server = new Server();

4
example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/MinimalServlets.java
View File

@ -23,7 +23,9 @@ import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.bio.SocketConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHandler;
import org.eclipse.jetty.servlet.ServletHolder;
public class MinimalServlets
{
@ -38,7 +40,7 @@ public class MinimalServlets
ServletHandler handler = new ServletHandler();
server.setHandler(handler);
handler.addServletWithMapping("org.eclipse.jetty.server.example.MinimalServlets$HelloServlet","/");
handler.addServletWithMapping("org.eclipse.jetty.embedded.MinimalServlets$HelloServlet","/");
server.start();
server.join();

4
example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/OneWebApp.java
View File

@ -22,7 +22,7 @@ public class OneWebApp
{
public static void main(String[] args) throws Exception
{
String jetty_home = System.getProperty("jetty.home","..");
String jetty_home = System.getProperty("jetty.home","../jetty-distribution/target/distribution");
Server server = new Server();
@ -31,7 +31,7 @@ public class OneWebApp
server.setConnectors(new Connector[]
{ connector });
String war = args.length > 0?args[0]:jetty_home + "/test-jetty-webapp/target/test-jetty-webapp-" + Server.getVersion();
String war = args.length > 0?args[0]: "../test-jetty-webapp/target/test-jetty-webapp-" + Server.getVersion();
String path = args.length > 1?args[1]:"/";
System.err.println(war + " " + path);

9
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
View File

@ -124,9 +124,12 @@ public class ProxyServlet implements Servlet
_client.start();
_context.setAttribute("org.eclipse.jetty.servlets."+_name+".Logger",_log);
_context.setAttribute("org.eclipse.jetty.servlets."+_name+".ThreadPool",_client.getThreadPool());
_context.setAttribute("org.eclipse.jetty.servlets."+_name+".HttpClient",_client);
if (_context!=null)
{
_context.setAttribute("org.eclipse.jetty.servlets."+_name+".Logger",_log);
_context.setAttribute("org.eclipse.jetty.servlets."+_name+".ThreadPool",_client.getThreadPool());
_context.setAttribute("org.eclipse.jetty.servlets."+_name+".HttpClient",_client);
}
}
catch (Exception e)
{