Merge branch 'master' into scopes

Author: mrate

.classpath

@@ -5,7 +5,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="generatedsrc"/>
 	<classpathentry kind="src" path="build/src/jsp"/>
-	<classpathentry kind="lib" path="lib/bcel-5.2.jar"/>
+	<classpathentry kind="lib" path="lib/bcel-6.0-20150726.222224-123.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Jasper GF3"/>
 	<classpathentry kind="lib" path="build/jrcs"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>

.mvn/wrapper/maven-wrapper.jar

@@ -0,0 +1 @@
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.3/apache-maven-3.3.3-bin.zip

.mvn/wrapper/maven-wrapper.properties

@@ -1,6 +1,9 @@
 language: java
 jdk:
   - oraclejdk8
+cache:
+  directories:
+  - $HOME/.m2
 before_install:
  - sudo apt-get update -qq
  - sudo apt-get install -qq exuberant-ctags cvs git mercurial cssc bzr subversion monotone rcs
@@ -16,5 +19,5 @@ addons:
     project:
       name: "OpenGrok/OpenGrok"
       description: "Build submitted via Travis CI"
-    build_command_prepend: "mvn clean"
-    build_command:   "mvn -DskipTests=true compile"
+      #    build_command_prepend: "mvn clean"
+    build_command:   "mvn -DskipTests=true -Dmaven.javadoc.skip=false -B -V compile"

.travis.yml

@@ -1,3 +1,9 @@
+2017 release 0.13
+-------------------------------------------------
+
+TBD
+
+
 May 2014 update 0.12.1
 -------------------------------------------------
 

CHANGES.txt

@@ -30,14 +30,16 @@
 #   - JAVA_OPTS                   Java options (e.g. for JVM memory increase
 #                                 or enabling server JDK)
 #                                 JAVA_OPTS=-Xmx2048m is the default!
-#   - OPENGROK_APP_SERVER         Application Server ("Tomcat" or "Glassfish")
+#   - OPENGROK_APP_SERVER         Application Server ("Tomcat", "Glassfish" or "Resin")
 #   - OPENGROK_WAR_TARGET_TOMCAT  Tomcat Specific WAR Target Directory
 #   - OPENGROK_WAR_TARGET_GLASSFISH Glassfish Specific WAR Target Directory
+#   - OPENGROK_WAR_TARGET_RESIN   Resin Specific WAR Target Directory
 #   - OPENGROK_WAR_TARGET         Fallback WAR Target Directory
 #   - OPENGROK_TOMCAT_BASE        Base Directory for Tomcat (contains webapps)
 #   - OPENGROK_GLASSFISH_BASE     Base Directory for Glassfish
 #                                 (contains domains)
 #   - OPENGROK_GLASSFISH_DOMAIN   Preferred Glassfish Domain Name
+#   - OPENGROK_RESIN_BASE         Base Directory for Resin (contains webapps)
 #   - OPENGROK_VERBOSE            Enable Verbose Mode in opengrok.jar (*)
 #   - OPENGROK_PROGRESS           Shows progress in %(percentage) of working
 #                                 through project, it's good to have Verbose
@@ -52,6 +54,9 @@
 #                                                 directory
 #                                   local	- for local repos only
 #                                   uionly	- enabled for UI only
+#   - OPENGROK_ENABLE_PROJECTS    Enable projects (set it to true or false)
+#                                 Every directory in SRC_ROOT is
+#                                   considered a separate project
 #   - OPENGROK_SCAN_REPOS         Disable Scan for repositories (*)
 #   - OPENGROK_SCAN_DEPTH         how deep should scanning for repos go
 #                                 (by default 3 directories from SRC_ROOT)
@@ -89,7 +94,7 @@
 #
 
 #
-# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 #
 # Print usage to stdout and exit.
@@ -252,7 +257,12 @@ DefaultInstanceConfiguration()
 
     # OPTIONAL: Enable Projects
     #           (Every directory in SRC_ROOT is considered a separate project)
-    ENABLE_PROJECTS="-P"
+    OPENGROK_ENABLE_PROJECTS="${OPENGROK_ENABLE_PROJECTS:-true}"
+    case $OPENGROK_ENABLE_PROJECTS in
+        true) ENABLE_PROJECTS="-P" ;;
+        false) ENABLE_PROJECTS="" ;;
+        *) ENABLE_PROJECTS="-P" ;;
+    esac
 
     # OPTIONAL: Scanning Options (for Mercurial repositories)
     SCAN_FOR_REPOSITORY="-S"
@@ -268,6 +278,11 @@ DefaultInstanceConfiguration()
         GENERATE_HISTORY="-r ${OPENGROK_GENERATE_HISTORY}"
     fi
 
+    if [ "$OPENGROK_GENERATE_HISTORY" != "off" ]
+    then
+        GENERATE_HISTORY="${GENERATE_HISTORY} -H"
+    fi
+
     # OPTIONAL: override depth of scanning for repositories
     if [ -n "${OPENGROK_SCAN_DEPTH}" ]
     then
@@ -548,9 +563,7 @@ FindApplicationServerType()
     # Maybe a better implementation would be to call Application
     # Server specific WAR Directory and see if they exist.
 
-    if [    -d "/var/tomcat6/webapps"        \
-         -o -d "/var/lib/tomcat6/webapps"    \
-         -o -d "/var/lib/tomcat7/webapps"    \
+    if [    -d "/var/tomcat8/webapps"        \
          -o -d "/var/lib/tomcat8/webapps"    \
        ]
     then
@@ -564,6 +577,12 @@ FindApplicationServerType()
         return
     fi
 
+    if [ -d "/etc/resin" -o -d "/usr/local/share/resin" ]
+    then
+        echo "Resin"
+        return
+    fi
+
     # Assume Tomcat
     echo "Tomcat"
 }
@@ -582,10 +601,8 @@ DetermineWarDirectoryTomcat()
 
     for prefix in               \
         ${OPENGROK_TOMCAT_BASE} \
-        /var/tomcat6            \
-        /var/lib/tomcat6        \
-        /var/lib/tomcat7        \
-        /var/lib/tomcat8
+        /var/lib/tomcat8	\
+        /var/tomcat8
     do
         if [ -d "${prefix}/webapps" ]
         then
@@ -653,6 +670,31 @@ DetermineWarDirectoryGlassfish()
     echo "${domainDirectory}/${firstDomain}/autodeploy"
 }
 
+DetermineWarDirectoryResin()
+{
+    if [ -n "${OPENGROK_WAR_TARGET_RESIN}" ]
+    then
+        echo "${OPENGROK_WAR_TARGET_RESIN}"
+        return
+    elif [ -n "${OPENGROK_WAR_TARGET}" ]
+    then
+        echo "${OPENGROK_WAR_TARGET}"
+        return
+    fi
+
+    for prefix in               \
+        ${OPENGROK_RESIN_BASE} \
+        /var/resin	\
+        /opt/resin
+    do
+        if [ -d "${prefix}/webapps" ]
+        then
+            echo "${prefix}/webapps"
+            return
+        fi
+    done
+}
+
 #
 # Implementation
 #
@@ -719,11 +761,11 @@ ValidateConfiguration()
     then
         if [ "`uname -s`" = "SunOS" -a -d /opt/SUNWjavadb -a -d /usr/opengrok ];
 	then
-	    if [ -d "/var/tomcat6" -a \
-	        ! -r "/var/tomcat6/webapps/source/WEB-INF/lib/derbyclient.jar" ];
+	    if [ -d "/var/tomcat8" -a \
+	        ! -r "/var/tomcat8/webapps/source/WEB-INF/lib/derbyclient.jar" ];
 	    then
 	        FatalError "JavaDB on but no derbyclient.jar under" \
-		    "/var/tomcat6/webapps/source/WEB-INF/lib"
+		    "/var/tomcat8/webapps/source/WEB-INF/lib"
 	    fi
 	    if [ ! -r "/usr/opengrok/lib/derbyclient.jar" ]; then
 	        FatalError "JavaDB on but no derbyclient.jar under" \
@@ -839,7 +881,7 @@ StdInvocation()
 
 UpdateGeneratedData()
 {
-    StdInvocation -H
+    StdInvocation
 }
 
 UpdateDataPartial()
@@ -880,6 +922,7 @@ DeployWar()
 
         Tomcat)    warTarget="`DetermineWarDirectoryTomcat`"    ;;
         Glassfish) warTarget="`DetermineWarDirectoryGlassfish`" ;;
+        Resin)     warTarget="`DetermineWarDirectoryResin`" ;;
 
         *) FatalError "Unsupported Application Server ${applicationServer}" ;;