From 21589e19b92d63e36e5f73d8c01394de6f69b9a4 Mon Sep 17 00:00:00 2001
From: ulrich <not disclosed>
Date: Sat, 08 Apr 2017 09:13:30 +0000
Subject: [PATCH] Initialiser und HtmlExportService berichtigt
---
src/java/de/uhilger/filecms/web/Initialiser.java | 16 +++++++++++++++-
web/WEB-INF/web.xml | 2 +-
src/java/de/uhilger/filecms/api/HtmlExportService.java | 9 +++++++--
3 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/java/de/uhilger/filecms/api/HtmlExportService.java b/src/java/de/uhilger/filecms/api/HtmlExportService.java
index c668e47..497e948 100644
--- a/src/java/de/uhilger/filecms/api/HtmlExportService.java
+++ b/src/java/de/uhilger/filecms/api/HtmlExportService.java
@@ -83,12 +83,17 @@
BufferedReader br = null;
try {
File out = new File(outDir, stripExt(files[i].getName()) + ".html");
+ if(!out.exists()) {
+ logger.fine(out.getAbsolutePath() + " existiert nicht, erzeuge Datei..");
+ out.getParentFile().mkdirs();
+ out.createNewFile();
+ }
PrintWriter w = new PrintWriter(out);
printHeader(w);
br = new BufferedReader(new FileReader(files[i]));
String line = br.readLine();
while(line != null) {
- w.print(line);
+ w.print(line.replace("htmi", "html"));
line = br.readLine();
}
printFooter(w);
@@ -121,11 +126,11 @@
if(stile.exists()) {
FileUtils.copyFile(stile, new File(outDir, "stile.css"), true);
}
+ result = "Export nach HTML ausgefuehrt.";
} catch (IOException ex) {
result = ex.getLocalizedMessage();
logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
}
-
return result;
}
diff --git a/src/java/de/uhilger/filecms/web/Initialiser.java b/src/java/de/uhilger/filecms/web/Initialiser.java
index ea52033..eece13c 100644
--- a/src/java/de/uhilger/filecms/web/Initialiser.java
+++ b/src/java/de/uhilger/filecms/web/Initialiser.java
@@ -21,11 +21,13 @@
import java.io.File;
import java.util.logging.Logger;
import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
/**
* Initialisieren der Dateiverwaltung
*/
-public class Initialiser {
+public class Initialiser implements ServletContextListener {
private static final Logger logger = Logger.getLogger(Initialiser.class.getName());
@@ -97,5 +99,17 @@
ctx.setAttribute(FILE_BASE, getWbxDataDir(ctx).getAbsolutePath());
}
}
+
+ @Override
+ public void contextInitialized(ServletContextEvent sce) {
+ ServletContext ctx = sce.getServletContext();
+ ablageErmitteln(ctx);
+ }
+
+ @Override
+ public void contextDestroyed(ServletContextEvent sce) {
+ ServletContext ctx = sce.getServletContext();
+ ctx.removeAttribute(FILE_BASE);
+ }
}
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index 9670d51..eb03881 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -11,7 +11,7 @@
</context-param>
<listener>
<description>Der Initialiser setzt globale Variable fuer die Dateiverwaltung</description>
- <listener-class>de.uhilger.wbx.web.Initialiser</listener-class>
+ <listener-class>de.uhilger.filecms.web.Initialiser</listener-class>
</listener>
<servlet>
<servlet-name>TransitRS</servlet-name>
--
Gitblit v1.9.3