svn commit: r1656165 - in /cocoon/branches/BRANCH_2_1_X: lib/ lib/core/ misc/notes/ src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/

Author: ilgrosso
Date: Sat Jan 31 05:20:53 2015
New Revision: 1656165

URL: http://svn.apache.org/r1656165
Log:
[COCOON-2344] Applying the provided patch

Added:
    cocoon/branches/BRANCH_2_1_X/lib/core/org.eclipse.jdt.core_3.10.0.v20140902-0626.jar   (with props)
Removed:
    cocoon/branches/BRANCH_2_1_X/lib/core/jdtcore-3.1.0.jar
Modified:
    cocoon/branches/BRANCH_2_1_X/lib/jars.xml
    cocoon/branches/BRANCH_2_1_X/misc/notes/review-jars.txt
    cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/EclipseJavaCompiler.java

Added: cocoon/branches/BRANCH_2_1_X/lib/core/org.eclipse.jdt.core_3.10.0.v20140902-0626.jar
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/lib/core/org.eclipse.jdt.core_3.10.0.v20140902-0626.jar?rev=1656165&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/branches/BRANCH_2_1_X/lib/core/org.eclipse.jdt.core_3.10.0.v20140902-0626.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: cocoon/branches/BRANCH_2_1_X/lib/jars.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/lib/jars.xml?rev=1656165&r1=1656164&r2=1656165&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/lib/jars.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/lib/jars.xml Sat Jan 31 05:20:53 2015
@@ -705,7 +705,7 @@
     <title>Eclipse Java Development Tools Core</title>
     <description>Eclipse Java Compiler</description>
     <used-by>XSP</used-by>
-    <lib>core/jdtcore-3.1.0.jar</lib>
+    <lib>core/org.eclipse.jdt.core_3.10.0.v20140902-0626.jar</lib>
     <homepage>http://www.eclipse.org/jdt/</homepage>
   </file>
 

Modified: cocoon/branches/BRANCH_2_1_X/misc/notes/review-jars.txt
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/misc/notes/review-jars.txt?rev=1656165&r1=1656164&r2=1656165&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/misc/notes/review-jars.txt (original)
+++ cocoon/branches/BRANCH_2_1_X/misc/notes/review-jars.txt Sat Jan 31 05:20:53 2015
@@ -94,7 +94,7 @@ L: lib/core/jcs-1.2.5-dev-20050313.jar
 F: C:
 R:
 
-L: lib/core/jdtcore-3.1.0.jar
+L: lib/core/org.eclipse.jdt.core_3.10.0.v20140902-0626.jar
 F: C:
 R:
 

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/EclipseJavaCompiler.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/EclipseJavaCompiler.java?rev=1656165&r1=1656164&r2=1656165&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/EclipseJavaCompiler.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/EclipseJavaCompiler.java Sat Jan 31 05:20:53 2015
@@ -215,8 +215,11 @@ public class EclipseJavaCompiler impleme
                 }
                 return result;
             }
-        }
 
+            public boolean ignoreOptionalProblems() {
+                return false;
+            }
+        }
 
         final INameEnvironment env = new INameEnvironment() {
 
@@ -336,6 +339,18 @@ public class EclipseJavaCompiler impleme
         }
         // Set the sourceCodeVersion
         switch (this.compilerComplianceLevel) {
+            case 180:
+                settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_8);
+                settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_8);
+                break;
+            case 170:
+                settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_7);
+                settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_7);
+                break;
+            case 160:
+                settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);
+                settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_6);
+                break;
             case 150:
                 settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
                 settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
@@ -348,6 +363,15 @@ public class EclipseJavaCompiler impleme
         }
         // Set the target platform
         switch (SystemUtils.JAVA_VERSION_INT) {
+            case 180:
+                settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_8);
+                break;
+            case 170:
+                settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_7);
+                break;
+            case 160:
+                settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6);
+                break;
             case 150:
                 settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
                 break;