jdk8 , fix ctag definitions to work on solaris too

Author: tarzanek

.travis.yml

@@ -1,6 +1,6 @@
 language: java
 jdk:
-  - oraclejdk7
+  - oraclejdk8
 before_install:
  - sudo apt-get update -qq
  - sudo apt-get install -qq exuberant-ctags cvs git mercurial cssc bzr subversion

README.txt

@@ -35,9 +35,9 @@ Offical page of the project is on:
 2. Requirements
 ---------------
 
-    * Latest Java (At least 1.7, 1.8 is supported)
+    * Latest Java (At least 1.8)
       http://www.oracle.com/technetwork/java/
-    * A servlet container like Tomcat (7.x or later)
+    * A servlet container like Tomcat (8.x or later)
       supporting Servlet 2.4 and JSP 2.0
       http://tomcat.apache.org/
     * Exuberant Ctags
@@ -439,7 +439,7 @@ Solaris 11:
 
 Debian/Ubuntu:
 
-  # apt-get install sun-java6-javadb
+  # apt-get install sun-java8-javadb
 
 Other:
 
@@ -638,13 +638,8 @@ being executed on) under the dist/ directory.
 Note: For full coverage report your system has to provide proper junit test 
 environment, that would mean:
 
-  - you have to use Ant 1.7 and above
-  - at least junit-4.10.jar has to be in ant's classpath (e.g. in ./lib)
-    - Example install in the top of the opengrok repository:
-
-      $ cd lib
-      $ wget http://.../junit-4.10.jar
-      $ jar -xf junit-4.10.jar
+  - you have to use Ant 1.9 and above
+  - at least junit-4.12.jar has to be in ant's classpath (e.g. in ./lib)    
 
   - install derby.jar to ant's classpath so that Java DB tests can be run
   - your PATH must contain directory with exuberant ctags binary
@@ -696,53 +691,18 @@ under the lib directory):
 There is also a findbugs-xml ant target that can be used to generate XML files
 that can later be parsed, e.g. by Jenkins.
 
-9.3 Using Emma
+9.3 Using Jacoco
 --------------
 
-If you want to check test coverage on OpenGrok, download Emma from
-http://emma.sourceforge.net/. Place emma.jar and emma-ant.jar in the
-opengrok/trunk/lib directory, or ~/.ant/lib.
-
-Now you can instrument your classes, and create a jar file:
-
-  $ ant emma-instrument
-
-If you are using NetBeans, select File - "opengrok" Properties 
-- libraries - Compile tab. Press the "Add JAR/Folder" and select
-lib/emma.jar and lib/emma_ant.jar
-
-If you are not using netbeans, you have to edit the file 
-nbproject/project.properties, and add "lib/emma.jar" and 
-"lib/emma_ant.jar" to the javac.classpath inside it.
-
-Now you can put the classes into jars and generate distributable:
-
-  $ ant dist
-
-The classes inside opengrok.jar should now be instrumented.
-If you use opengrok.jar for your own set of tests, you need 
-emma.jar in the classpath.If you want to specify where to store 
-the run time analysis, use these properties:
-
-   emma.coverage.out.file=path/coverage.ec
-   emma.coverage.out.merge=true
-
-The coverage.ec file should be placed in the opengrok/trunk/coverage
-directory for easy analyze.
-
-If you want to test the coverage of the unit tests, you can
-run the tests:
-
-   $ ant test   
-   
-Alternatively press Alt+F6 in NetBeans to achieve the same.
+If you want to check test coverage on OpenGrok, download jacoco from
+http://www.eclemma.org/jacoco/. Place jacocoagent.jar and jacocoant.jar in the
+opengrok/lib ~/.ant/lib or into classpath (-lib option of ant).
 
-Now you should get some output saying that Emma is placing runtime 
-coverage data into coverage.ec.
+Now you can instrument your classes and test them run:
 
-To generate reports, run ant again:
+  $ ant -Djacoco=true -Djacoco.home=/<path_to>/jacoco jacoco-code-coverage
 
-  $ ant emma-report
+Now you should get output data in .
 
 Look at coverage/coverage.txt, coverage/coverage.xml and 
 coverage/coverage.html to see how complete your tests are.
@@ -857,6 +817,7 @@ e.g. using bash:
 9.8 Using Travis CI
 -------------------
 
+Travis depends on updated and working maven build.
 Please see .travis.yml, if your branch has this file,
 you should be able to connect your Github to Travis CI.
 OpenGroks Travis is here: https://travis-ci.org/OpenGrok/OpenGrok

build.xml

@@ -625,32 +625,7 @@ Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
         </jacoco:report>
     </target>
 
-    <target name="-check_emma" description="Check that emma jar files are present">
-        <available file="emma.jar" type="file" property="emma.jar.present">
-            <filepath refid="lib.search.path"/>
-        </available>
-        <fail unless="emma.jar.present" message="Please install emma.jar in lib-directory  (or in ant classpath) to run Emma, see README."/>
-
-        <available file="emma_ant.jar" type="file" property="emma_ant.jar.present">
-            <filepath refid="lib.search.path"/>
-        </available>
-        <fail unless="emma_ant.jar.present" message="Please install emma_ant.jar in lib-directory  (or in ant classpath) to run Emma, see README."/>
-    </target>
-
-    <target name="emma-instrument" depends="compile, -check_emma" description="Instruments the source code for Emma code coverage analysis">
-        <taskdef resource="emma_ant.properties"/>
-        <mkdir dir="${coverage.dir}" />
-        <emma enabled="true">
-            <instr instrpath="build/classes"
-                       metadatafile="${coverage.dir}/coverage.em"
-                       mode="overwrite"
-                       filter="+org.opensolaris.*,-org.opensolaris.opengrok.management.client.*"/>
-        </emma>
-    </target>
-
-    <target name="-pre-compile-test"><!-- depends="-set-jacocoagent"> -->
-        <property name="test-sys-prop.emma.coverage.out.file" value="${coverage.dir}/coverage.ec"/>
-        <property name="test-sys-prop.emma.coverage.out.merge" value="true"/>
+    <target name="-pre-compile-test"><!-- depends="-set-jacocoagent"> -->        
     </target>
 
     <!-- <target name="-pre-compile-test-single" depends="-set-jacocoagent"/> -->
@@ -791,21 +766,6 @@ Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
         <delete file="${test.cvs.repo}/CVS/Root"/>
     </target>
 
-    <target name="emma-report" description="Analyze" depends="-check_emma">
-        <taskdef resource="emma_ant.properties"/>
-        <emma enabled="true" >
-            <report sourcepath="${src.dir},${src.generatedsrc.dir}">
-                <!-- collect all EMMA data dumps (metadata and runtime): -->
-                <infileset dir="${coverage.dir}" includes="*.em, *.ec"/>
-                <txt outfile="${coverage.dir}/coverage.txt"/>
-                <xml outfile="${coverage.dir}/coverage.xml"/>
-                <html  outfile="${coverage.dir}/index.html"/>
-            </report>
-        </emma>
-    </target>
-
-    <target name="emma-code-coverage" depends="clean, emma-instrument, test, emma-report" description="Make test code coverage reports based on the OpenGrok unit tests"/>
-
     <target name="jdepend" depends="compile" description="Run JDepend dependency checking">
         <mkdir dir="jdepend"/>
         <java classname="jdepend.xmlui.JDepend" failonerror="true" fork="true">

nbproject/project.properties

@@ -76,8 +76,8 @@ javac.compilerargs=-Xlint:unchecked
 javac.deprecation=true
 javac.processorpath=\
     ${javac.classpath}
-javac.source=1.7
-javac.target=1.7
+javac.source=1.8
+javac.target=1.8
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
@@ -115,7 +115,7 @@ run.classpath=\
 # Space-separated list of JVM arguments used when running the project
 # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
 # or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=-XX:-UseSplitVerifier -ea -enableassertions:org.opensolaris.opengrok...
+run.jvmargs=-ea -enableassertions:org.opensolaris.opengrok...
 #-javaagent:lib/jacocoagent.jar=destfile=jacoco.exec 
 run.test.classpath=\
     ${javac.test.classpath}:\

opengrok-web-nbproject/nbproject/project.properties

@@ -76,8 +76,8 @@ javac.debug=true
 javac.deprecation=true
 javac.processorpath=\
     ${javac.classpath}
-javac.source=1.7
-javac.target=1.7
+javac.source=1.8
+javac.target=1.8
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\

platform/solaris/ips/create.sh

@@ -224,7 +224,7 @@ done
 PKG pkgsend add file dist/opengrok.1 mode=0444 owner=root group=bin path=/usr/opengrok/man/man1/opengrok.1
 
 # install default configuration
-PKG pkgsend add depend fmri=pkg:/runtime/java/jre-7 type=require
+PKG pkgsend add depend fmri=pkg:/runtime/java/jre-8 type=require
 PKG pkgsend add depend fmri=pkg:/web/java-servlet/tomcat type=require
 
 # Following line gets commented by that the developer/tool/exuberant-ctags has been removed from IPS

pom.xml

@@ -1,4 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+CDDL HEADER START
+
+The contents of this file are subject to the terms of the
+Common Development and Distribution License (the "License").
+You may not use this file except in compliance with the License.
+
+See LICENSE.txt included in this distribution for the specific
+language governing permissions and limitations under the License.
+
+When distributing Covered Code, include this CDDL HEADER in each
+file and include the License file at LICENSE.txt.
+If applicable, add the following below this CDDL HEADER, with the
+fields enclosed by brackets "[]" replaced with your own identifying
+information: Portions Copyright [yyyy] [name of copyright owner]
+
+CDDL HEADER END
+
+Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -37,8 +59,8 @@
     <properties>
 	<lucene.version>5.0.0</lucene.version>
 	<mavenjavadocplugin.version>2.9.1</mavenjavadocplugin.version>
-        <compileSource>1.7</compileSource>
-        <compileTarget>1.7</compileTarget>
+        <compileSource>1.8</compileSource>
+        <compileTarget>1.8</compileTarget>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -127,10 +149,9 @@
                 <version>2.16</version>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>emma-maven-plugin</artifactId>
-                <version>1.0-alpha-3</version>
-                <inherited>true</inherited>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.7.4</version>                
             </plugin>
 	    <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

src/org/opensolaris/opengrok/analysis/Ctags.java

@@ -94,29 +94,31 @@ private void initialize() throws IOException {
             command.add("--langmap=sql:+.pld"); // RFE #19208
             command.add("--langmap=sql:+.pks"); // RFE #19208 ?
 
+            //Ideally all below should be in ctags, or in outside config file, 
+            //we might run out of command line SOON
             command.add("--langdef=scala"); // below is bug 61 to get full scala support
             command.add("--langmap=scala:.scala");
-            command.add("--regex-scala=/^\\s*((abstract|final|sealed|implicit|lazy)\\s*)*(private|protected)?\\s*class\\s+([a-zA-Z0-9_]+)/\\4/c,classes/");
-            command.add("--regex-scala=/^\\s*((abstract|final|sealed|implicit|lazy)\\s*)*(private|protected)?\\s*object\\s+([a-zA-Z0-9_]+)/\\4/c,objects/");
-            command.add("--regex-scala=/^\\s*((abstract|final|sealed|implicit|lazy)\\s*)*(private|protected)?\\s*case class\\s+([a-zA-Z0-9_]+)/\\4/c,case classes/");
-            command.add("--regex-scala=/^\\s*((abstract|final|sealed|implicit|lazy)\\s*)*(private|protected)?\\s*case object\\s+([a-zA-Z0-9_]+)/\\4/c,case objects/");
-            command.add("--regex-scala=/^\\s*((abstract|final|sealed|implicit|lazy)\\s*)*(private|protected)?\\s*trait\\s+([a-zA-Z0-9_]+)/\\4/t,traits/");
-            command.add("--regex-scala=/^\\s*type\\s+([a-zA-Z0-9_]+)/\\1/T,types/");
-            command.add("--regex-scala=/^\\s*((abstract|final|sealed|implicit|lazy)\\s*)*def\\s+([a-zA-Z0-9_]+)/\\3/m,methods/");
-            command.add("--regex-scala=/^\\s*((abstract|final|sealed|implicit|lazy)\\s*)*val\\s+([a-zA-Z0-9_]+)/\\3/l,constants/");
-            command.add("--regex-scala=/^\\s*((abstract|final|sealed|implicit|lazy)\\s*)*var\\s+([a-zA-Z0-9_]+)/\\3/l,variables/");
-            command.add("--regex-scala=/^\\s*package\\s+([a-zA-Z0-9_.]+)/\\1/p,packages/");
-
-            command.add("--langdef=haskell");
+            command.add("--regex-scala=/^[[:space:]]*((abstract|final|sealed|implicit|lazy)[[:space:]]*)*(private|protected)?[[:space:]]*class[[:space:]]+([a-zA-Z0-9_]+)/\\4/c,classes/");
+            command.add("--regex-scala=/^[[:space:]]*((abstract|final|sealed|implicit|lazy)[[:space:]]*)*(private|protected)?[[:space:]]*object[[:space:]]+([a-zA-Z0-9_]+)/\\4/c,objects/");
+            command.add("--regex-scala=/^[[:space:]]*((abstract|final|sealed|implicit|lazy)[[:space:]]*)*(private|protected)?[[:space:]]*case class[[:space:]]+([a-zA-Z0-9_]+)/\\4/c,case classes/");
+            command.add("--regex-scala=/^[[:space:]]*((abstract|final|sealed|implicit|lazy)[[:space:]]*)*(private|protected)?[[:space:]]*case object[[:space:]]+([a-zA-Z0-9_]+)/\\4/c,case objects/");
+            command.add("--regex-scala=/^[[:space:]]*((abstract|final|sealed|implicit|lazy)[[:space:]]*)*(private|protected)?[[:space:]]*trait[[:space:]]+([a-zA-Z0-9_]+)/\\4/t,traits/");
+            command.add("--regex-scala=/^[[:space:]]*type[[:space:]]+([a-zA-Z0-9_]+)/\\1/T,types/");
+            command.add("--regex-scala=/^[[:space:]]*((abstract|final|sealed|implicit|lazy)[[:space:]]*)*def[[:space:]]+([a-zA-Z0-9_]+)/\\3/m,methods/");
+            command.add("--regex-scala=/^[[:space:]]*((abstract|final|sealed|implicit|lazy)[[:space:]]*)*val[[:space:]]+([a-zA-Z0-9_]+)/\\3/l,constants/");
+            command.add("--regex-scala=/^[[:space:]]*((abstract|final|sealed|implicit|lazy)[[:space:]]*)*var[[:space:]]+([a-zA-Z0-9_]+)/\\3/l,variables/");
+            command.add("--regex-scala=/^[[:space:]]*package[[:space:]]+([a-zA-Z0-9_.]+)/\\1/p,packages/");
+            
+            command.add("--langdef=haskell"); // below was added with #912
             command.add("--langmap=haskell:.hs.hsc");
-            command.add("--regex-haskell=/^\\s*class\\s+([a-zA-Z0-9_]+)/\\1/c,classes/");
-            command.add("--regex-haskell=/^\\s*data\\s+([a-zA-Z0-9_]+)/\\1/t,types/");
-            command.add("--regex-haskell=/^\\s*newtype\\s+([a-zA-Z0-9_]+)/\\1/t,types/");
-            command.add("--regex-haskell=/^\\s*type\\s+([a-zA-Z0-9_]+)/\\1/t,types/");
-            command.add("--regex-haskell=/^([a-zA-Z0-9_]+).*\\s+={1}\\s+/\\1/f,functions/");
-            command.add("--regex-haskell=/\\s+([a-zA-Z0-9_]+).*\\s+={1}\\s+/\\1/f,functions/");
-            command.add("--regex-haskell=/^(let|where)\\s+([a-zA-Z0-9_]+).*\\s+={1}\\s+/\\2/f,functions/");
-            command.add("--regex-haskell=/\\s+(let|where)\\s+([a-zA-Z0-9_]+).*\\s+={1}\\s+/\\2/f,functions/");
+            command.add("--regex-haskell=/^[[:space:]]*class[[:space:]]+([a-zA-Z0-9_]+)/\\1/c,classes/");
+            command.add("--regex-haskell=/^[[:space:]]*data[[:space:]]+([a-zA-Z0-9_]+)/\\1/t,types/");
+            command.add("--regex-haskell=/^[[:space:]]*newtype[[:space:]]+([a-zA-Z0-9_]+)/\\1/t,types/");
+            command.add("--regex-haskell=/^[[:space:]]*type[[:space:]]+([a-zA-Z0-9_]+)/\\1/t,types/");
+            command.add("--regex-haskell=/^([a-zA-Z0-9_]+).*[[:space:]]+={1}[[:space:]]+/\\1/f,functions/");
+            command.add("--regex-haskell=/[[:space:]]+([a-zA-Z0-9_]+).*[[:space:]]+={1}[[:space:]]+/\\1/f,functions/");
+            command.add("--regex-haskell=/^(let|where)[[:space:]]+([a-zA-Z0-9_]+).*[[:space:]]+={1}[[:space:]]+/\\2/f,functions/");
+            command.add("--regex-haskell=/[[:space:]]+(let|where)[[:space:]]+([a-zA-Z0-9_]+).*[[:space:]]+={1}[[:space:]]+/\\2/f,functions/");
 
             /* Add extra command line options for ctags. */
             if (CTagsExtraOptionsFile != null) {