From 6e1a290ebaddb441ff2a4fe911f1cdfc62070519 Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Wed, 29 Mar 2017 15:48:49 +0000
Subject: [PATCH] weitere Verschiebungen zwischen wbx-lib und WebKontext, Api, usw.

---
 src/java/de/uhilger/filecms/api/Api.java |   67 ++++++---------------------------
 1 files changed, 12 insertions(+), 55 deletions(-)

diff --git a/src/java/de/uhilger/filecms/api/Api.java b/src/java/de/uhilger/filecms/api/Api.java
index e5196f5..e9c8a4f 100644
--- a/src/java/de/uhilger/filecms/api/Api.java
+++ b/src/java/de/uhilger/filecms/api/Api.java
@@ -20,20 +20,19 @@
 
 package de.uhilger.filecms.api;
 
-import de.uhilger.filecms.data.FileRef;
-import de.uhilger.transit.web.RequestKontext;
 import de.uhilger.transit.web.WebKontext;
-import de.uhilger.wbx.web.Initialiser;
+import de.uhilger.wbx.api.ApiBase;
+import de.uhilger.wbx.data.FileRef;
 import java.io.File;
-import java.security.Principal;
 import java.util.logging.Logger;
 import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
 
 /**
  *
  */
-public abstract class Api implements WebKontext, RequestKontext {
+public abstract class Api extends ApiBase implements WebKontext {
+  
+  protected ServletContext ctx;  
   
   private static final Logger logger = Logger.getLogger(Api.class.getName());
 
@@ -47,14 +46,7 @@
   
   public static final String WBX_BASE = "$basis";
   public static final String WBX_DATA = "$daten";
-  
-  /** Zeiger zum Servlet-Kontext dieser Anwendung */
-  private ServletContext ctx;
-  
-  /** Zeiger zum Request, der zur Ausfuehrung fuehrte */
-  private HttpServletRequest request;  
-  
-  
+    
   /**
    * Einen relativen Pfad in einen absoluten Pfad der WebBox 
    * aufloesen.
@@ -83,10 +75,10 @@
       logger.fine("in admin role");
       if(relPath.startsWith(WBX_BASE)) {
         logger.fine("is base");
-        targetPath = getCatalinaBase();
+        targetPath = getCatalinaBase(ctx);
         targetDir = new File(targetPath, relPath.substring(WBX_BASE.length()));
       } else if(relPath.startsWith(WBX_DATA)) {
-        targetPath = getWbxDataDir();
+        targetPath = getWbxDataDir(ctx);
         logger.fine("is data, combine " + targetPath + ' ' + relPath.substring(WBX_DATA.length()));
         targetDir = new File(targetPath, relPath.substring(WBX_DATA.length()));
       } else {
@@ -108,38 +100,15 @@
   
   protected FileRef getBase() {
     FileRef base = null;
-    Object o = getServletContext().getAttribute(Initialiser.FILE_BASE);
-    if(o instanceof String) {
-      String baseStr = (String) o;
-      logger.fine(baseStr);
-      File file = new File(baseStr);
+    Object o = getFileBase(ctx);
+    if(o instanceof File) {
+      File file = (File) o;
       base = new FileRef(file.getAbsolutePath(), file.isDirectory());
     }
     return base;
   }
+
   
-  protected String getUserName() {
-    String userName = null;
-    Object p = getRequest().getUserPrincipal();
-    if(p instanceof Principal) {
-      userName = ((Principal) p).getName();
-    }
-    return userName;
-  }    
-  
-  protected String getCatalinaBase() {
-    String path = getServletContext().getRealPath("/");
-    logger.fine("getRealPath: " + path); // file-cms in webapps
-    File file = new File(path);
-    file = file.getParentFile().getParentFile();
-    return file.getAbsolutePath();
-  }
-  
-  protected String getWbxDataDir() {
-    String wbxBase = getBase().getAbsolutePath();
-    File file = new File(wbxBase);
-    return file.getAbsolutePath();
-  }
   /* ------------- Implementierung WebKontext ------------- */
 
   @Override
@@ -150,18 +119,6 @@
   @Override
   public void setServletContext(ServletContext servletContext) {
     this.ctx = servletContext;
-  }
-  
-  /* ------------- Implementierung RequestKontext ------------- */
-
-  @Override
-  public HttpServletRequest getRequest() {
-    return request;
-  }
-
-  @Override
-  public void setRequest(HttpServletRequest r) {
-    this.request = r;
   }
   
 }

--
Gitblit v1.9.3