From 2f226e662a15aae1e6038c8234b2d6bf9f1cb871 Mon Sep 17 00:00:00 2001
From: Chris Fraire <cfraire@me.com>
Date: Sat, 1 Dec 2018 09:52:01 -0600
Subject: [PATCH] Add jetty-jspc. Fix opensearch.jsp exposed error.

- Use mergeFragment=false with jetty-jspc so
  pre-compiled JSP classes are not included in
  the WAR.

Also:
- use skipTests not maven.test.skip w.r.t. the
  short-circuiting the setting up of testdata.
---
 opengrok-indexer/pom.xml                    |  2 +-
 opengrok-web/pom.xml                        | 40 +++++++++++++++++++++
 opengrok-web/src/main/webapp/opensearch.jsp |  3 +-
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/opengrok-indexer/pom.xml b/opengrok-indexer/pom.xml
index f453613dc49..968be0c2d13 100644
--- a/opengrok-indexer/pom.xml
+++ b/opengrok-indexer/pom.xml
@@ -400,7 +400,7 @@ Portions Copyright (c) 2017-2018, Chris Fraire <cfraire@me.com>.
                             <goal>run</goal>
                         </goals>
                         <configuration>
-                            <target unless="maven.test.skip">
+                            <target unless="skipTests">
                                 <ant target="-post-compile-test"/>
                             </target>
                         </configuration>
diff --git a/opengrok-web/pom.xml b/opengrok-web/pom.xml
index e97d1a758dd..2489b13b0f8 100644
--- a/opengrok-web/pom.xml
+++ b/opengrok-web/pom.xml
@@ -1,4 +1,27 @@
 <?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) 2018, Oracle and/or its affiliates. All rights reserved.
+Portions Copyright (c) 2018, Chris Fraire <cfraire@me.com>.
+
+-->
 <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>
 
@@ -117,6 +140,23 @@
         <finalName>source</finalName>
 
         <plugins>
+            <plugin>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-jspc-maven-plugin</artifactId>
+                <version>9.4.14.v20181114</version>
+                <executions>
+                    <execution>
+                        <id>jspc</id>
+                        <goals>
+                            <goal>jspc</goal>
+                        </goals>
+                        <configuration>
+                            <mergeFragment>false</mergeFragment>
+                            <generatedClasses>${project.build.directory}/jspc</generatedClasses>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
diff --git a/opengrok-web/src/main/webapp/opensearch.jsp b/opengrok-web/src/main/webapp/opensearch.jsp
index 376545173d7..2055189c0af 100644
--- a/opengrok-web/src/main/webapp/opensearch.jsp
+++ b/opengrok-web/src/main/webapp/opensearch.jsp
@@ -19,12 +19,13 @@ information: Portions Copyright [yyyy] [name of copyright owner]
 CDDL HEADER END
 
 Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
-
 Portions Copyright 2011 Jens Elkner.
+Portions Copyright (c) 2018, Chris Fraire <cfraire@me.com>.
 
 --%><%@page  session="false" errorPage="error.jsp" import="
 java.util.Set,
 
+org.opengrok.indexer.web.Prefix,
 org.opengrok.indexer.web.Util"
 %>
 <%