Pull request #5: MISPDEV-31 directory structure maven style

Merge in X-ROAD/misp2-web-app from MISPDEV-31_directory_structure_maven_style to develop

* commit '72266fa9ab478428d0735e05c5ba288a1f5a7f1a':
  MISPDEV-31 fix paths in web.xml
  MISPDEV-28 war name is misp2.war - no version
  MISPDEV-28 StrutsJunit testing discontinued for a while
  MISPDEV-28 return of .cfg-files
  MISPDEV-28 mvn dir restruture - test / java & resources
  MISPDEV-28 package*.properties to resources
  MISPDEV-28 mvn dir restruture - webcontent -> webapp, root-> resources
  MISPDEV-28 mvn dir restruture - java source

Author: teemukin65

.project

@@ -51,4 +51,15 @@
 		<nature>ch.acanda.eclipse.pmd.builder.PMDNature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1604491927361</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

.settings/org.eclipse.core.resources.prefs

@@ -138,6 +138,23 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.struts</groupId>
+			<artifactId>struts2-junit-plugin</artifactId>
+			<version>${struts.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.1.0</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet.jsp</groupId>
+			<artifactId>javax.servlet.jsp-api</artifactId>
+			<version>2.3.3</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.struts</groupId>
 			<artifactId>struts2-sitemesh-plugin</artifactId>
@@ -280,7 +297,7 @@
 	      <artifactId>esteidtestcerts</artifactId>
 	      <version>3.7.2.652</version>
 	      <scope>system</scope>
-		  <systemPath>${project.basedir}/WebContent/WEB-INF/lib/esteidtestcerts.jar</systemPath>
+		  <systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/esteidtestcerts.jar</systemPath>
 	    </dependency>
 
 		<dependency>
@@ -298,28 +315,28 @@
 			<artifactId>orbeon</artifactId>
 			<scope>system</scope>
 			<version>1.0</version>
-			<systemPath>${project.basedir}/WebContent/WEB-INF/lib/orbeon-xforms-filter.jar</systemPath>
+			<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/orbeon-xforms-filter.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>core-renderer</groupId>
 			<artifactId>core-renderer</artifactId>
 			<scope>system</scope>
 			<version>1.0</version>
-			<systemPath>${project.basedir}/WebContent/WEB-INF/lib/core-renderer.jar</systemPath>
+			<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/core-renderer.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>iaikPkcs11Wrapper</groupId>
 			<artifactId>iaikPkcs11Wrapper</artifactId>
 			<scope>system</scope>
 			<version>1.0</version>
-			<systemPath>${project.basedir}/WebContent/WEB-INF/lib/iaikPkcs11Wrapper.jar</systemPath>
+			<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/iaikPkcs11Wrapper.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>iText</groupId>
 			<artifactId>iText</artifactId>
 			<scope>system</scope>
 			<version>2.1.7</version>
-			<systemPath>${project.basedir}/WebContent/WEB-INF/lib/iText-2.1.7.jar</systemPath>
+			<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/iText-2.1.7.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
@@ -381,81 +398,40 @@
 
 	<build>
 		<plugins>
-			<plugin>
+            <plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
+				<version>2.2</version>
 				<configuration>
-					<webappDirectory>${project.build.directory}/misp2</webappDirectory>
 					<warName>misp2</warName>
-					<webXml>WebContent/WEB-INF/web.xml</webXml>
-					<webResources>
-						<resource>
-							<directory>WebContent</directory>
-							<filtering>false</filtering>
-						</resource>
-						<resource>
-							<directory>src/</directory>
-							<targetPath>WEB-INF/classes</targetPath>
-							<excludes>
-								<exclude>**/*.java</exclude>
-							</excludes>
-						</resource>
-					</webResources>
 				</configuration>
-			</plugin>
+            </plugin>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.1</version>
 				<configuration>
 					<source>1.8</source>
 					<target>1.8</target>
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.8.5</version>
 				<executions>
-					<!-- Add source directory -->
 					<execution>
-						<id>add-source-directory</id>
-						<phase>generate-sources</phase>
+						<id>default-prepare-agent</id>
 						<goals>
-							<goal>add-source</goal>
+							<goal>prepare-agent</goal>
 						</goals>
-						<configuration>
-							<sources>
-								<source>src/</source>
-							</sources>
-						</configuration>
 					</execution>
-					<!-- Add test source directory -->
 					<execution>
-						<id>add-test-source</id>
-						<phase>generate-test-sources</phase>
+						<id>default-report</id>
 						<goals>
-							<goal>add-test-source</goal>
+							<goal>report</goal>
 						</goals>
-						<configuration>
-							<sources>
-								<source>test/</source>
-							</sources>
-						</configuration>
-					</execution> 
-					<!-- Add /test directory also as resource directory,
-					     meaning resource files can be read from it as well -->
-					<execution>
-						<id>add-test-resource</id>
-						<phase>generate-test-sources</phase>
-						<goals>
-							<goal>add-test-resource</goal>
-						</goals>
-						<configuration>
-							<resources>
-								<resource>
-									<directory>test</directory>
-								</resource>
-							</resources>
-						</configuration>
-					</execution> 
+					</execution>
 				</executions>
 			</plugin>
 		</plugins>

LICENSE

@@ -87,7 +87,7 @@ public String execute() throws FileNotFoundException {
 
     private String getUserGuideFilePath(String lang, String targetDemographic, ServletContext servletContext) {
         return servletContext.getRealPath(
-                "/pages/user_guide/" + targetDemographic + "/" + lang + "/kasutusjuhend.pdf");
+                "/../src/main/webapp/pages/user_guide/" + targetDemographic + "/" + lang + "/kasutusjuhend.pdf");
     }
 
     /**

src/LICENSE.txt renamed to LICENSE.txt

@@ -640,7 +640,7 @@ public String executeXforms() throws Exception {
                         setQueryUUID(UUID.randomUUID().toString());
                         setQueryId(getQueryUUID());
                         File runXForms = new File(ServletActionContext.getServletContext().getRealPath("/")
-                                + "/xforms-jsp/runq_" + getQuery().getName() + "_" + getQueryId() + ".xhtml");
+                                + "/../src/main/webapp/xforms-jsp/runq_" + getQuery().getName() + "_" + getQueryId() + ".xhtml");
                         // create temporary file for xforms
                         if (runXForms.exists()) {
                             runXForms.delete();

pom.xml

@@ -107,8 +107,8 @@ private static Properties getPomProperties() throws IOException {
 
         String rootPath;
          // in case deployed in external Tomcat server
-        if (classPath.contains("/WEB-INF/")) {
-            rootPath = getBeforeLast(classPath, "/WEB-INF/") + "/";
+        if (classPath.contains("/../src/main/webapp/WEB-INF/")) {
+            rootPath = getBeforeLast(classPath, "/../src/main/webapp/WEB-INF/") + "/";
         }
         // in case deployed internally in Eclipse
         else if (classPath.contains("/classes/")) {

src/ee/aktors/misp2/ExternallyConfigured.java renamed to src/main/java/ee/aktors/misp2/ExternallyConfigured.java

@@ -264,7 +264,7 @@ public String saveUserAdmin() throws Exception {
                 }
             }
             t3.getT3sec().setUserTo(person.getSsn());
-            t3.getT3sec().setUserFrom("admin");
+            t3.getT3sec().setUserFrom("../src/main/webapp/admin");
 
             if (!log(t3)) {
                 addActionError(getText("text.fail.save.log"));
@@ -296,7 +296,7 @@ public String saveUserAdmin() throws Exception {
         // --- Log portal manager setting
         T3SecWrapper t3 = initT3(LogQuery.MANAGER_SETTING);
         t3.getT3sec().setUserTo(person.getSsn());
-        t3.getT3sec().setUserFrom("admin");
+        t3.getT3sec().setUserFrom("../src/main/webapp/admin");
         if (!log(t3)) {
             addActionError(getText("text.fail.save.log"));
             LOGGER.warn("Setting manager failed because of logging problems.");
@@ -358,7 +358,7 @@ public String deleteManager() throws Exception {
         // --- Log portal manager setting
         T3SecWrapper t3 = initT3(LogQuery.MANAGER_DELETE);
         t3.getT3sec().setUserTo(orgPerson.getPersonId().getSsn());
-        t3.getT3sec().setUserFrom("admin");
+        t3.getT3sec().setUserFrom("../src/main/webapp/admin");
         if (!log(t3)) {
             addActionError(getText("text.fail.delete.log"));
             LOGGER.warn("Deleting manager failed because of logging problems.");

src/ee/aktors/misp2/_testing/XPathTest.java renamed to src/main/java/ee/aktors/misp2/_testing/XPathTest.java

@@ -63,7 +63,7 @@ public void doFilter(ServletRequest req, ServletResponse resp, FilterChain filte
         HttpServletRequest request = (HttpServletRequest)req;
         HttpServletResponse response = (HttpServletResponse)resp;
         String servletPath = request.getServletPath();
-        if (servletPath.startsWith("/xforms-jsp")
+        if (servletPath.startsWith("/../src/main/webapp/xforms-jsp")
             || servletPath.startsWith("/orbeon")) {
             HttpSession session = request.getSession();
 

src/ee/aktors/misp2/action/BaseAction.java renamed to src/main/java/ee/aktors/misp2/action/BaseAction.java

@@ -74,7 +74,7 @@ public void updateTimeStamps() {
         if (session != null && getUsername() == null) {
             Person p = (Person) session.get(Const.SESSION_USER_HANDLE);
             if (p != null)
-                setUsername(p.getSsn() == null ? "admin" : p.getSsn());
+                setUsername(p.getSsn() == null ? "../src/main/webapp/admin" : p.getSsn());
         } else if (session == null && getUsername() == null) {
             LogManager.getLogger(BaseService.class).warn("Session is null. Username not set.");
         }

src/ee/aktors/misp2/action/BaseActionInterface.java renamed to src/main/java/ee/aktors/misp2/action/BaseActionInterface.java

@@ -119,19 +119,7 @@ protected static String getCurrentClassPath() {
         return className;
     }
 
-    /**
-     * Get file input stream from /src/ directory NB! Only for use in unit-tests.
-     * 
-     * @param fileName
-     *            file path from /src/ folder.
-     * @return file path from given directory
-     */
-    public static String getConfigPathForTest(String fileName) {
-        String currentPath = getCurrentClassPath();
-        String configPath = currentPath.split("target")[0] + "src/" + fileName;
-        LOGGER.trace("Config path: " + configPath);
-        return configPath;
-    }
+
 
     /**
      * Get file name with the following format