From 35de3899b6599edfc5eb7ed75807a24ad2a1a74f Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 12 Jul 2016 17:49:11 -0700 Subject: [PATCH] Issue #706 - Removing org.apache.jasper.compiler.disablejsr199 references --- .../org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java | 3 --- jetty-server/src/main/config/modules/jvm.mod | 1 - jetty-start/src/test/resources/dist-home/modules/jvm.mod | 1 - 3 files changed, 5 deletions(-) diff --git a/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java b/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java index 7fa33011d18..edba14979dc 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java +++ b/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java @@ -47,9 +47,6 @@ public class FragmentActivator implements BundleActivator */ public void start(BundleContext context) throws Exception { - //jsr199 compilation does not work in osgi - System.setProperty("org.apache.jasper.compiler.disablejsr199", Boolean.TRUE.toString()); - //set up some classes that will look for bundles with tlds that must be converted //to urls and treated as if they are on the Jetty container's classpath so that //jasper can deal with them diff --git a/jetty-server/src/main/config/modules/jvm.mod b/jetty-server/src/main/config/modules/jvm.mod index 195521c57f5..c1b6381fb25 100644 --- a/jetty-server/src/main/config/modules/jvm.mod +++ b/jetty-server/src/main/config/modules/jvm.mod @@ -20,4 +20,3 @@ # -XX:+PrintTenuringDistribution # -XX:+PrintCommandLineFlags # -XX:+DisableExplicitGC -# -Dorg.apache.jasper.compiler.disablejsr199=true diff --git a/jetty-start/src/test/resources/dist-home/modules/jvm.mod b/jetty-start/src/test/resources/dist-home/modules/jvm.mod index 195521c57f5..c1b6381fb25 100644 --- a/jetty-start/src/test/resources/dist-home/modules/jvm.mod +++ b/jetty-start/src/test/resources/dist-home/modules/jvm.mod @@ -20,4 +20,3 @@ # -XX:+PrintTenuringDistribution # -XX:+PrintCommandLineFlags # -XX:+DisableExplicitGC -# -Dorg.apache.jasper.compiler.disablejsr199=true