Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project

This commit is contained in:
Greg Wilkins 2011-10-03 15:08:02 +11:00
commit c668f8b82d
2 changed files with 2 additions and 0 deletions

View File

@ -1,6 +1,7 @@
jetty-7.5.2-SNAPSHOT jetty-7.5.2-SNAPSHOT
+ 358121 Implement new UTF8 Algorithm to UTF8Appendable.java + 358121 Implement new UTF8 Algorithm to UTF8Appendable.java
+ 353839 ajp component error when upload file + 353839 ajp component error when upload file
+ JETTY-1378 new system property to for the use of the JDTCompiler when using the latest jsp-impl
jetty-7.5.1.v20110908 - 08 September 2011 jetty-7.5.1.v20110908 - 08 September 2011
+ 350634 Added Resource.newResource(File) + 350634 Added Resource.newResource(File)

View File

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