incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1591909 - in /sling/trunk/bundles/scripting/jsp: pom.xml src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JDTCompiler.java
Date Fri, 02 May 2014 13:54:45 GMT
Author: cziegeler
Date: Fri May  2 13:54:45 2014
New Revision: 1591909

URL: http://svn.apache.org/r1591909
Log:
SLING-3405 : SLING2094Test and ServerSideScriptsTest fail with java 8: JSP compiler does not
find java.util.Arrays or java.lang.CharSequence

Modified:
    sling/trunk/bundles/scripting/jsp/pom.xml
    sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JDTCompiler.java

Modified: sling/trunk/bundles/scripting/jsp/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/pom.xml?rev=1591909&r1=1591908&r2=1591909&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp/pom.xml (original)
+++ sling/trunk/bundles/scripting/jsp/pom.xml Fri May  2 13:54:45 2014
@@ -65,16 +65,16 @@
                             org.apache.juli.logging
                         </Private-Package>
 
-                        <Import-Package>
-                            !org.eclipse.*, *
-                        </Import-Package>
-                        
                         <ScriptEngine-Name>${project.name}</ScriptEngine-Name>
                         <ScriptEngine-Version>${project.version}</ScriptEngine-Version>
 
+                        <Import-Package>
+                            !org.eclipse.*,
+                            !org.apache.tools.*,*
+                        </Import-Package>
                         <!-- Embed Jasper completely -->
                         <Embed-Dependency>
-                            jasper*,
+                            jasper-el,ecj,
                             el-api,
                             jsp-api,
                             org.apache.sling.commons.osgi;inline="org/apache/sling/commons/osgi/PropertiesUtil.*"
@@ -147,12 +147,12 @@
             <artifactId>jasper-el</artifactId>
             <version>6.0.14</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>jasper-jdt</artifactId>
-            <version>6.0.14</version>
-        </dependency>
-        <dependency>
+ <dependency>
+      <groupId>org.eclipse.jdt.core.compiler</groupId>
+      <artifactId>ecj</artifactId>
+      <version>P20140317-1600</version>
+    </dependency>
+            <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>el-api</artifactId>
             <version>6.0.14</version>

Modified: sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JDTCompiler.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JDTCompiler.java?rev=1591909&r1=1591908&r2=1591909&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JDTCompiler.java
(original)
+++ sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JDTCompiler.java
Fri May  2 13:54:45 2014
@@ -65,6 +65,7 @@ public class JDTCompiler extends org.apa
     /**
      * Compile the servlet from .java file to .class file
      */
+    @Override
     protected void generateClass(String[] smap)
         throws FileNotFoundException, JasperException, Exception {
 
@@ -147,6 +148,10 @@ public class JDTCompiler extends org.apa
                 }
                 return result;
             }
+
+            public boolean ignoreOptionalProblems() {
+                return false;
+            }
         }
 
         final INameEnvironment env = new INameEnvironment() {



Mime
View raw message