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

315744 Fixed STOP.PORT and STOP.KEY in start.jar 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1918 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2010-06-04 10:05:32 +00:00
parent a74286d92c
commit 78587f820c
2 changed files with 5 additions and 4 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.1.4-SNAPSHOT
+ 314581 Implement the Sec-Websocket handshake
+ 315190 CrossOriginFilter adds headers not understood by Chrome 5 WebSocket implementation
+ 315715 Improved Cookie version handling. Server.setMaxCookieVersion
+ 315744 Fixed STOP.PORT and STOP.KEY in start.jar
jetty-7.1.3.v20100526
+ 296567 HttpClient RedirectListener handles new HttpDestination

8
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
View File

@ -128,8 +128,8 @@ public class Main
if ("--stop".equals(arg))
{
int port = Integer.parseInt(_config.getProperty("STOP.KEY",System.getProperty("STOP.PORT","-1")));
String key = _config.getProperty("STOP.KETY",System.getProperty("STOP.KEY",null));
int port = Integer.parseInt(_config.getProperty("STOP.PORT",System.getProperty("STOP.PORT","-1")));
String key = _config.getProperty("STOP.KEY",System.getProperty("STOP.KEY",null));
stop(port,key);
return;
}
@ -1044,8 +1044,8 @@ public class Main
private void startMonitor()
{
int port = Integer.parseInt(System.getProperty("STOP.PORT","-1"));
String key = System.getProperty("STOP.KEY",null);
int port = Integer.parseInt(_config.getProperty("STOP.PORT",System.getProperty("STOP.PORT","-1")));
String key = _config.getProperty("STOP.KEY",System.getProperty("STOP.KEY",null));
Monitor.monitor(port,key);
}