From 59584163af6e9d4e6ba668e74c596a08bf5bd3fd Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Wed, 29 Mar 2017 15:49:29 +0000
Subject: [PATCH] weitere Verschiebungen zwischen wbx-lib und WebKontext, Api, usw.
---
src/de/uhilger/wbx/api/ApiBase.java | 33 +++++++++------------------------
1 files changed, 9 insertions(+), 24 deletions(-)
diff --git a/src/de/uhilger/wbx/api/ApiBase.java b/src/de/uhilger/wbx/api/ApiBase.java
index cc3d64a..0fa48fb 100644
--- a/src/de/uhilger/wbx/api/ApiBase.java
+++ b/src/de/uhilger/wbx/api/ApiBase.java
@@ -30,12 +30,9 @@
/**
*
*/
-public abstract class ApiBase implements WebKontext, RequestKontext {
+public abstract class ApiBase implements RequestKontext {
private static final Logger logger = Logger.getLogger(ApiBase.class.getName());
-
- /** Zeiger zum Servlet-Kontext dieser Anwendung */
- protected ServletContext ctx;
/** Zeiger zum Request, der zur Ausfuehrung fuehrte */
protected HttpServletRequest request;
@@ -45,9 +42,9 @@
* Das Datenverzeichnis der WebBox ermitteln
* @return Ordner $wbx/daten
*/
- protected File getFileBase() {
+ protected File getFileBase(ServletContext ctx) {
File file = null;
- Object o = getServletContext().getAttribute(Initialiser.FILE_BASE);
+ Object o = ctx.getAttribute(Initialiser.FILE_BASE);
if(o instanceof String) {
String baseStr = (String) o;
logger.fine(baseStr);
@@ -61,8 +58,8 @@
* Tomcat-Doku als CATALINA_BASE der WebBox gilt
* @return absoluter Pfad zu $wbx/sys/base
*/
- protected String getCatalinaBase() {
- String path = getServletContext().getRealPath("/");
+ protected String getCatalinaBase(ServletContext ctx) {
+ String path = ctx.getRealPath("/");
logger.fine("getRealPath: " + path); // file-cms in webapps
File file = new File(path);
file = file.getParentFile().getParentFile();
@@ -73,16 +70,16 @@
* Den absoluten Pfad zum Datenverzeichnis der WebBox ermitteln
* @return absoluter Pfad zu $wbx/daten
*/
- protected String getWbxDataDir() {
- return getFileBase().getAbsolutePath();
+ protected String getWbxDataDir(ServletContext ctx) {
+ return getFileBase(ctx).getAbsolutePath();
}
/**
* Das Verzeichnis ermitteln, in dem die WebBox laeuft
* @return der Ordner $wbx
*/
- protected File getWbxDir() {
- String path = getServletContext().getRealPath("/");
+ protected File getWbxDir(ServletContext ctx) {
+ String path = ctx.getRealPath("/");
logger.fine("getRealPath: " + path);
File file = new File(path);
file = file.getParentFile().getParentFile().getParentFile().getParentFile();
@@ -103,18 +100,6 @@
return userName;
}
- /* ------------- Implementierung WebKontext ------------- */
-
- @Override
- public ServletContext getServletContext() {
- return ctx;
- }
-
- @Override
- public void setServletContext(ServletContext servletContext) {
- this.ctx = servletContext;
- }
-
/* ------------- Implementierung RequestKontext ------------- */
@Override
--
Gitblit v1.9.3