Revert "Support Java 8."

Revert [#1800] Update compiler for support to java 8

This reverts commit 3d60405.
This reverts commit 3d3c3fe
This reverts commit e9d8094
This reverts commit 4521b80
This reverts commit 021d275
This reverts commit 3b7d7be

framework/dependencies.yml

@@ -9,7 +9,7 @@ transitiveDependencies: false
 require:    &allDependencies
     - antlr 2.7.7
     - c3p0 0.9.1.2
-    - cglib -> cglib-nodep 3.1
+    - cglib -> cglib-nodep 2.2
     - com.google.code.gson -> gson 2.2 
     - com.jamonapi -> jamon 2.7
     - com.ning -> async-http-client 1.7.8
@@ -42,14 +42,14 @@ require:    &allDependencies
     - org.apache.ivy -> ivy 2.2.0
     - org.bouncycastle -> bcprov-jdk15 1.45
     - org.codehaus.groovy -> groovy-all 1.8.6
-    - org.eclipse.jdt.core 3.9.50.v20140317-1741
+    - org.eclipse.jdt.core 3.7.1.v_B76_R37x 
     - org.hibernate -> hibernate-core 3.6.10.Final
     - org.hibernate -> hibernate-commons-annotations 3.2.0.Final
     - org.hibernate -> hibernate-entitymanager 3.6.10.Final
     - org.hibernate -> hibernate-validator 4.1.0.Final
     - org.hibernate -> jboss-transaction-api_1.1_spec 1.0.0.Final
     - org.hibernate.javax.persistence -> hibernate-jpa-2.0-api 1.0.1.Final
-    - org.javassist -> javassist 3.18.1-GA
+    - org.javassist -> javassist 3.9.0.GA
     - org.jboss.netty -> netty 3.5.11.Final
     - org.postgresql -> postgresql 9.0
     - org.slf4j -> slf4j-api 1.6.1
@@ -85,12 +85,6 @@ repositories:
         artifact:   "${play.path}/modules/secure"
         contains:
             - play -> secure $version
-
-    - playCoreDocviewer:
-        type:       local
-        artifact:   "${play.path}/modules/docviewer"
-        contains:
-            - play -> docviewer $version
 
     - playModules:  
         type:       chain

framework/pym/play/application.py

@@ -1,6 +1,5 @@
 import sys
-import os
-import os.path
+import os, os.path
 import re
 import shutil
 import socket
@@ -262,14 +261,8 @@ def java_cmd(self, java_args, cp_args=None, className='play.server.Server', args
 
         if application_mode == 'prod':
             java_args.append('-server')
-
-        javaVersion = getJavaVersion()
-        if javaVersion == "1.7":
-            # JDK 7 compat
-            java_args.append('-XX:-UseSplitVerifier')
-        elif javaVersion == "1.8":
-            java_args.append('-noverify')
-
+        # JDK 7 compat
+        java_args.append('-XX:-UseSplitVerifier')
         java_policy = self.readConf('java.policy')
         if java_policy != '':
             policyFile = os.path.join(self.path, 'conf', java_policy)

framework/pym/play/commands/eclipse.py

@@ -27,15 +27,6 @@ def execute(**kargs):
     # if this is a module, we infer the name from the path
     application_name = app.readConf('application.name')
     vm_arguments = app.readConf('jvm.memory')
-
-    javaVersion = getJavaVersion()
-    if javaVersion == "1.7":
-        # JDK 7 compat
-        vm_arguments = vm_arguments +' -XX:-UseSplitVerifier'
-    elif javaVersion == "1.8":
-        # JDK 8 compatible
-        vm_arguments = vm_arguments +' -noverify'
-
     if application_name:
         application_name = application_name.replace("/", " ")
     else:

framework/pym/play/commands/javadoc.py

@@ -1,14 +1,11 @@
 import os, os.path
 import shutil
 import subprocess
-import re
 
 from play.utils import *
 
 COMMANDS = ['javadoc', 'jd']
 
-DEFAULT_API_VERSION = "1.3.0"
-
 HELP = {
     'javadoc': 'Generate your application Javadoc'
 }
@@ -25,77 +22,30 @@ def execute(**kargs):
         javadoc_path = os.path.normpath("%s/bin/javadoc" % os.environ['JAVA_HOME'])
 
     outdir = os.path.join(app.path, 'javadoc')
-    # Clean current javadoc directory
-    if (os.path.isdir(outdir)):
-        shutil.rmtree(outdir)
     sout = open(os.path.join(app.log_path(), 'javadoc.log'), 'w')
     serr = open(os.path.join(app.log_path(), 'javadoc.err'), 'w')
-
-    # Create Javadoc directory    
-    if not os.path.exists(outdir):
-        os.makedirs(outdir)      
+    if (os.path.isdir(outdir)):
+        shutil.rmtree(outdir)
+
     defineJavadocOptions(app, outdir, args)
-    defineJavadocFiles(app, outdir)
-    javadoc_cmd = [javadoc_path, '@'+os.path.join('javadoc','javadocOptions'), '@'+os.path.join('javadoc','javadocFiles')]
+    defineJavadocFiles(app)
+    javadoc_cmd = [javadoc_path, '@javadocOptions', '@javadocFiles']
 
     print "Generating Javadoc in " + outdir + "..."
     subprocess.call(javadoc_cmd, env=os.environ, stdout=sout, stderr=serr)
     print "Done! You can open " + os.path.join(outdir, 'overview-tree.html') + " in your browser."
-    # Remove configuration file
-    os.remove(os.path.join(outdir , 'javadocOptions'))
-    os.remove(os.path.join(outdir , 'javadocFiles'))
-
 
 
 def defineJavadocOptions(app, outdir, args):
-    f = open(os.path.join(outdir , 'javadocOptions'), 'w')
+    f = open('javadocOptions', 'w')
     f.write(' '.join(['-classpath', app.cp_args(), '-d', outdir, '-encoding', 'UTF-8', '-charset', 'UTF-8']))
-
-    # Add some default options
-    if args.count('-doctitle') == 0:
-        f.write(' -doctitle "' + app.readConf('application.name')  + '"' )
-
-    if args.count('-header') == 0:    
-        f.write(' -header "<b>' +  app.readConf('application.name') + '</b>"')
-
-    if args.count('-footer') == 0:    
-        f.write(' -footer "<b>' +  app.readConf('application.name') + '</b>"')
-
-    if args.count('--links'):
-        print "~ Build project Javadoc with links to :"
-        args.remove('--links')
-        # Add link to JavaDoc of JAVA
-
-        javaVersion = getJavaVersion()
-        if javaVersion == "1.5":
-            print "~    Java(TM) Platform, Platform Standard Edition 5.0"        
-            print "~    Java(TM) EE 5 Specification APIs"
-            f.write(' -link http://docs.oracle.com/javase/1.5.0/docs/api/')
-            f.write(' -link http://docs.oracle.com/javaee/5/api/')   
-        else:
-            urlVersion = javaVersion[2:]
-            print "~    Java(TM) Platform, Standard Edition " + urlVersion + " API Specification"        
-            print "~    Java(TM) EE " + urlVersion + "Specification APIs"
-            f.write(' -link http://docs.oracle.com/javase/' + urlVersion + '/docs/api/')
-            f.write(' -link http://docs.oracle.com/javaee/' + urlVersion + '/api/')         
-
-
-        # Add link to JavaDoc of Play Framework
-        playVersion = app.play_env['version']
-        if "localbuild" in playVersion:
-            print "~    API documentation to Play! Framework V" + playVersion + " doesn't exist => link to V" + DEFAULT_API_VERSION
-            playVersion = DEFAULT_API_VERSION
-
-        print "~    Play Framework V" + playVersion + " API documentation"     
-        f.write(' -link http://www.playframework.com/documentation/' + playVersion + '/api/')
-
-
+
     argsCmd = ' '.join(args)
     if (argsCmd != ''):
         f.write(' ' + ' '.join(args))        
     f.close()
 
-def defineJavadocFiles(app, outdir):
+def defineJavadocFiles(app):
     fileList = []
     def add_java_files(path):
         for root, subFolders, files in os.walk(path):	
@@ -113,7 +63,7 @@ def add_java_files(path):
 	    add_java_files(os.path.normpath(os.path.join(module, "src")))
 
     #Write files list in files    
-    f = open(os.path.join(outdir, 'javadocFiles'), 'w')
+    f = open('javadocFiles', 'w')
     f.write(' '.join(fileList)) 
     f.close()
-
+     

framework/pym/play/utils.py

@@ -6,7 +6,6 @@
 import getopt
 import shutil
 import zipfile
-import subprocess
 
 def playVersion(play_env):
     play_version_file = os.path.join(play_env["basedir"], 'framework', 'src', 'play', 'version')
@@ -240,17 +239,3 @@ def copy_directory(source, target, exclude = None):
 
 def isTestFrameworkId( framework_id ):
     return (framework_id == 'test' or (framework_id.startswith('test-') and framework_id.__len__() >= 6 ))
-
-def getJavaVersion():
-    sp = subprocess.Popen(["java", "-version"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    javaVersion = sp.communicate()
-    javaVersion =  str( javaVersion)
-
-    if re.compile('1.5').search(javaVersion) is not None:
-        return "1.5"  
-    elif re.compile('1.6').search(javaVersion) is not None:
-        return "1.6" 
-    elif re.compile('1.7').search(javaVersion) is not None:
-        return "1.7" 
-    else:
-        return "1.8"

framework/src/play/classloading/ApplicationCompiler.java

@@ -55,17 +55,13 @@ public ApplicationCompiler(ApplicationClasses applicationClasses) {
             javaVersion = CompilerOptions.VERSION_1_6;
         } else if (System.getProperty("java.version").startsWith("1.7")) {
             javaVersion = CompilerOptions.VERSION_1_7;
-        } else if (System.getProperty("java.version").startsWith("1.8")) {
-            javaVersion = CompilerOptions.VERSION_1_8;
         }
         if("1.5".equals(Play.configuration.get("java.source"))) {
             javaVersion = CompilerOptions.VERSION_1_5;
         } else if("1.6".equals(Play.configuration.get("java.source"))) {
             javaVersion = CompilerOptions.VERSION_1_6;
         } else if("1.7".equals(Play.configuration.get("java.source"))) {
             javaVersion = CompilerOptions.VERSION_1_7;
-        }else if("1.8".equals(Play.configuration.get("java.source"))) {
-            javaVersion = CompilerOptions.VERSION_1_8;
         }
         this.settings.put(CompilerOptions.OPTION_Source, javaVersion);
         this.settings.put(CompilerOptions.OPTION_TargetPlatform, javaVersion);
@@ -117,12 +113,6 @@ public ApplicationCompiler(ApplicationClasses applicationClasses) {
         public char[][] getPackageName() {
             return packageName;
         }
-
-        @Override
-        public boolean ignoreOptionalProblems() {
-            // TODO Auto-generated method stub
-            return false;
-        }
     }
 
     /**

resources/application-skel/conf/application.conf

@@ -62,7 +62,7 @@ date.format=yyyy-MM-dd
 # Define which port is used by JPDA when application is in debug mode (default is set to 8000)
 # jpda.port=8000
 #
-# Java source level => 1.5, 1.6,1.7 or 1.8 (experimental)
+# Java source level => 1.5, 1.6 or 1.7 (experimental)
 # java.source=1.5
 
 # Log level