Changes:

- Fix: Old H2-library removed from DB folder
- Log4j2: Better env-variable in configuration
- Logging context name (servlet-name) for log4j2 in servlet-context
- Files Upload/Download example template: URL fixes (+language)

cfg/logging-web.xml

@@ -7,7 +7,7 @@
 
 <Configuration status="error" name="BeetRootConfig">
 	<Properties>
-		<Property name="basePath">${env:CATALINA_BASE}/logs</Property>
+		<Property name="basePath">${sys:catalina.base}/logs</Property>
 	</Properties>
 	<Appenders>
 		<Console name="console" target="SYSTEM_OUT">

src/main/java/ch/autumo/beetroot/AbstractBeetRootServlet.java

@@ -64,15 +64,18 @@ public void init(ServletConfig config) throws ServletException {
 		} catch (Exception e) {
 			LOG.error("Configuration initialization failed !", e);
 			throw new ServletException("Configuration initialization failed !", e);
-		}		
+		}
+
+
 
 		// 2. Logging configuration
 		final String servletContainer = config.getInitParameter("servletContainer");
 		if (servletContainer == null || !servletContainer.equals("jetty")) {
-			// configure logging
+			// Configure logging
 			final String logCfgFile = config.getInitParameter("beetRootLogConfig");
 			try {
-				LoggingFactory.getInstance().initialize(webAppRoot + logCfgFile);
+				// For environments such as WebLogic, it is important that a logging context has a unique name!
+				LoggingFactory.getInstance().initialize(webAppRoot + logCfgFile, configMan.getServletName());
 			} catch (Exception ioex) {
 				throw new ServletException("Logging configuration initialization failed !", ioex);
 			}

web/html/files/add.html

@@ -2,7 +2,7 @@
 </nav>
 <div class="fileupload index large-10 medium-8 columns content">
     <div class="fileupload form content">
-        <form enctype="multipart/form-data" action="/files/add" method="post">
+        <form enctype="multipart/form-data" action="/{$lang}/files/add" method="post">
             <fieldset>
                 <legend>
                     {$l.files.add.1}

web/html/files/view.html

@@ -7,7 +7,7 @@ <h3>
         </h3>
         <p>
             {$l.files.view.2}
-			<a href="/files/view?download=web/img/ifaceX-back.png">
+			<a href="/{$lang}/files/view?download=web/img/ifaceX-back.png">
 				{$l.files.view.3}
 			</a>
         </p>