add stylesheets versions to info and better logging of requests

Author: anneferger

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>pl.psnc.dl.ege</groupId>
   <artifactId>ege-framework</artifactId>
-  <version>0.5.4</version>
+  <version>0.5.5</version>
   <name>EGE Framework</name>
   <properties>
 

src/main/java/pl/psnc/dl/ege/configuration/EGEConstants.java

@@ -42,7 +42,8 @@ public final class  EGEConstants {
         public static final String TEIROOT = oxgProps.getProperty("TEI","/usr/share/xml/tei/");
         public static final String OpenOfficeConfig = oxgProps.getProperty("OpenOfficeConfig","/usr/lib/libreoffice/");
         public static final String DEFAULT_LOCALE = oxgProps.getProperty("defaultLocale","en"); 
-        public static final String DEFAULT_PROFILE = oxgProps.getProperty("defaultProfile","default"); 	
+        public static final String DEFAULT_PROFILE = oxgProps.getProperty("defaultProfile","default");
+		public static final String MEIROOT = oxgProps.getProperty("MEI","/usr/share/xml/mei/");
 	// name for document family consisting of text documents
 	public static final String TEXTFAMILY = "Documents";
 	public static final String TEXTFAMILYCODE = "text";

src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Conversion.java

@@ -83,6 +83,7 @@ public class Conversion {
      * of possible conversions paths.
      */
     public static void doGetHelper(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        LOGGER.debug("REQUEST: " + request.getRequestURL() + " " + request.getContextPath() + " " + request.toString());
         try {
             RequestResolver rr = new ConversionRequestResolver(request,
                     Method.GET);
@@ -238,6 +239,7 @@ protected static void printConversionPossibilities(HttpServletResponse response,
     public static void doPostHelper(
             HttpServletRequest request,
             HttpServletResponse response) throws ServletException, IOException {
+        LOGGER.debug("REQUEST: " + request.getRequestURL() + " " + request.getContextPath());
         try {
             ConversionRequestResolver rr = new ConversionRequestResolver(
                     request, Method.POST);

src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Customization.java

@@ -40,7 +40,7 @@ public class Customization {
     public void doGetHelper(
             HttpServletRequest request,
             HttpServletResponse response) throws ServletException, IOException {
-
+        LOGGER.debug("REQUEST: " + request.getRequestURL() + " " + request.getContextPath() + " " + request.toString());
         try {
             //resolve request and catch any errors
             RequestResolver rr = new CustomizationRequestResolver(request,
@@ -112,6 +112,7 @@ private void printAvailableCustomizationSettings(HttpServletResponse response,
     public void doPostHelper(
             HttpServletRequest request,
             HttpServletResponse response) throws ServletException, IOException {
+            LOGGER.debug("REQUEST: " + request.getRequestURL() + " " + request.getContextPath());
         try {
             RequestResolver rr = new CustomizationRequestResolver(request,
                     Method.POST);
@@ -141,7 +142,7 @@ private void performCustomization(String[] csString, RequestResolver rr,
         String usedCustomization = csString[2];
         String usedOutputFormat = csString[3];
 
-        LOGGER.warn("performCustomization(usedCS: " + usedCS
+        LOGGER.debug("performCustomization(usedCS: " + usedCS
                 + ", usedSource" + usedSource
                 + ", usedCustomization" + usedCustomization
                 + ", usedOutputFormat" + usedOutputFormat + ")");
@@ -211,7 +212,7 @@ private void performCustomization(String[] csString, RequestResolver rr,
             fileextension = ".xml";
         }
         response.setHeader("Content-Disposition", "attachment;filename=\"" + filename + fileextension + "\"");
-        LOGGER.warn("Going to perform customization");
+        LOGGER.debug("Going to perform customization");
 
         ((EGEImpl) ege).performCustomization(cs, source, customization,
                 usedOutputFormat, response.getOutputStream(),

src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Info.java

@@ -1,7 +1,12 @@
 package pl.psnc.dl.ege.webapp.servlethelpers;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.json.JSONException;
 import org.json.JSONObject;
+import pl.psnc.dl.ege.EGE;
+import pl.psnc.dl.ege.EGEImpl;
+import pl.psnc.dl.ege.configuration.EGEConstants;
 import pl.psnc.dl.ege.webapp.request.InfoRequestResolver;
 import pl.psnc.dl.ege.webapp.request.Method;
 import pl.psnc.dl.ege.webapp.request.RequestResolver;
@@ -11,16 +16,24 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.Properties;
 
+
 public class Info extends HttpServlet {
     HttpServlet servlet;
+    private static final Logger LOGGER = LogManager
+            .getLogger(Info.class);
 
     public void doGetHelper(HttpServletRequest request, HttpServletResponse response, HttpServlet httpservlet)
             throws IOException, ServletException {
+        LOGGER.debug("REQUEST: " + request.getRequestURL() + " " + request.getContextPath() + " " + request.toString());
         servlet = httpservlet;
         //String serverInfo = servlet.getServletContext().getServerInfo();
         try {
@@ -30,10 +43,22 @@ public void doGetHelper(HttpServletRequest request, HttpServletResponse response
             //json_info.put("server-version", serverInfo);
             //json_info.put("os-info", System.getProperty("os.name") + " " + System.getProperty("os.version"));
             json_info.put("java-version", Runtime.version().toString());
+            EGE ege = new EGEImpl();
+            //get info from each converter
+            //add info which sources are used /usr/share/xml/tei/odd/VERSION
+            //TEIROOT default is /usr/share/xml/tei/
+            String versionodd = Files.readString(Paths.get(EGEConstants.TEIROOT + "odd/VERSION"), StandardCharsets.UTF_8);
+            String versionstylesheets = Files.readString(Paths.get(EGEConstants.TEIROOT + "stylesheet/VERSION"), StandardCharsets.UTF_8);
+            json_info.put("tei-odd-version", versionodd);
+            json_info.put("tei-stylesheet-version", versionstylesheets);
+            //add info which MEI sources are used
+            //To do: /usr/share/xml/mei/music-encoding/mei401...
             //resolve request and catch any errors
             RequestResolver rr = new InfoRequestResolver(request,
                     Method.GET);
             //print available info
+            //EGE ege = new EGEImpl();
+            //List<ConversionsPath> paths = ege.findConversionPaths(idt);
             printInfo(response, rr, json_info);
         }
         catch (RequestResolvingException ex) {

src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Validation.java

@@ -40,6 +40,7 @@ public void doGetHelper(HttpServletRequest request,
 					  HttpServletResponse response)
 		throws ServletException, IOException
 	{
+		LOGGER.debug("REQUEST: " + request.getRequestURL() + " " + request.getContextPath() + " " + request.toString());
 		try {
 			//resolve request and catch any errors
 			RequestResolver rr = new ValidationRequestResolver(request,