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

fix up the --secure option 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@713 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Jesse McConnell 2009-08-13 19:19:01 +00:00
parent ffcf3070d6
commit b33d2298ad
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -394,7 +394,7 @@ public class Main
}
catch (ClassNotFoundException e)
{
//ignored
e.printStackTrace();
}
if (Config.isDebug() || invoked_class == null)
@ -419,7 +419,6 @@ public class Main
Method main = invoked_class.getDeclaredMethod("main",method_param_types);
Object[] method_params = new Object[]
{ argArray };
main.invoke(null,method_params);
}
@ -481,7 +480,7 @@ public class Main
// Add mandatory options for secure mode
if (_secure)
{
_config.addActiveOption("secure");
_config.addActiveOption("policy");
_config.addActiveOption("security");
}
@ -830,6 +829,7 @@ public class Main
{
Policy.setPolicy(_config.getPolicyInstance(cl));
System.setSecurityManager(new SecurityManager());
// Policy.getPolicy().refresh();
}
else
{

4
jetty-start/src/main/resources/org/eclipse/jetty/start/start.config
View File

@ -132,8 +132,8 @@ $(jetty.home)/lib/jetty-annotations-$(version).jar
$(jetty.home)/lib/annotations/** exists $(jetty.home)/lib/jndi
[All,policy]
$(jetty.home)/lib/jetty-policy-$(version).jar ! available org.eclipse.jetty.annotations.AnnotationFinder
$(jetty.home)/lib/policy/** exists $(jetty.home)/lib/jndi
$(jetty.home)/lib/jetty-policy-$(version).jar ! available org.eclipse.jetty.policy.JettyPolicy
$(jetty.home)/lib/security/jetty.policy
[All,client]
$(jetty.home)/lib/jetty-http-$(version).jar ! available org.eclipse.jetty.http.HttpParser