From 4038e3ec26a646f660130697ba70d40168926493 Mon Sep 17 00:00:00 2001
From: Ben Culkin <scorpress@gmail.com>
Date: Wed, 20 May 2020 19:11:21 -0400
Subject: Futz around with site config

Messed around with the site configuration a bit, got the coverage to
start showing up in the side bar, along with the generated reports/other
information
---
 pom.xml           | 46 ++++++++++++++++------------------------------
 src/site/site.xml |  9 ++++++++-
 2 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/pom.xml b/pom.xml
index f5ff769..1db36fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.github.bculkin2442</groupId>
@@ -28,6 +29,8 @@
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<!-- github server corresponds to entry in ~/.m2/settings.xml -->
 		<github.global.server>github</github.global.server>
+		<jacoco.reportPath>${main.basedir}/target/jacoco-ut.exec</jacoco.reportPath>
+	    <jacoco.itReportPath>${main.basedir}/target/jacoco-it.exec</jacoco.itReportPath>
 	</properties>
 	<licenses>
 		<license>
@@ -62,8 +65,7 @@
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>2.22.1</version>
 				<configuration>
-					<!-- Sets the VM argument line used
-					when unit tests are run. -->
+					<!-- Sets the VM argument line used when unit tests are run. -->
 					<argLine>${surefireArgLine}</argLine>
 				</configuration>
 			</plugin>
@@ -114,20 +116,10 @@
 				<artifactId>exec-maven-plugin</artifactId>
 				<version>1.6.0</version>
 				<executions>
-					<!-- <execution>
-						<!- Run source tagging (i.e ctags) ->
-						<id>Source Tagging</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-						<configuration>
-							<executable>ctags</executable>
-							<arguments>
-								<argument>-R</argument>
-							</arguments>
-						</configuration>
-					</execution> -->
+					<!-- <execution> <!- Run source tagging (i.e ctags) -> <id>Source Tagging</id> 
+						<phase>generate-sources</phase> <goals> <goal>exec</goal> </goals> <configuration> 
+						<executable>ctags</executable> <arguments> <argument>-R</argument> </arguments> 
+						</configuration> </execution> -->
 					<execution>
 						<!-- Copy site for gh pages deploy -->
 						<id>Site Copy</id>
@@ -142,7 +134,7 @@
 								<argument>--delete</argument>
 								<argument>target/site/</argument>
 								<argument>docs/</argument>
-							</arguments>	
+							</arguments>
 						</configuration>
 					</execution>
 				</executions>
@@ -152,10 +144,8 @@
 				<artifactId>jacoco-maven-plugin</artifactId>
 				<version>0.8.2</version>
 				<executions>
-					<!--
-					Prepares the property pointing to the JaCoCo runtime agent which
-					is passed as VM argument when Maven the Surefire plugin is executed.
-					-->
+					<!-- Prepares the property pointing to the JaCoCo runtime agent which 
+						is passed as VM argument when Maven the Surefire plugin is executed. -->
 					<execution>
 						<id>pre-unit-test</id>
 						<goals>
@@ -164,17 +154,13 @@
 						<configuration>
 							<!-- Sets the path to the file which contains the execution data. -->
 							<destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
-							<!--
-							Sets the name of the property containing the settings
-							for JaCoCo runtime agent.
-							-->
+							<!-- Sets the name of the property containing the settings for JaCoCo 
+								runtime agent. -->
 							<propertyName>surefireArgLine</propertyName>
 						</configuration>
 					</execution>
-					<!--
-					Ensures that the code coverage report for unit tests is created after
-					unit tests have been run.
-					-->
+					<!-- Ensures that the code coverage report for unit tests is created 
+						after unit tests have been run. -->
 					<execution>
 						<id>post-unit-test</id>
 						<phase>test</phase>
diff --git a/src/site/site.xml b/src/site/site.xml
index d41fea2..954e3c2 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,2 +1,9 @@
 <project>
-</project>
+	<body>
+		<menu ref="reports" />
+		
+		<menu name="Overview">
+			<item name="Coverage" href="jacoco-ut/index.html" />
+		</menu>
+	</body>
+</project>
\ No newline at end of file
-- 
cgit v1.2.3