From 74fab1c53fd3850bf0fd075c93622f14ad8dbe30 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Wed, 06 Jan 2021 23:03:51 +0000
Subject: [PATCH] null pruefung hinzugefuegt

---
 src/java/de/uhilger/filecms/api/CompileService.java |   92 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 91 insertions(+), 1 deletions(-)

diff --git a/src/java/de/uhilger/filecms/api/CompileService.java b/src/java/de/uhilger/filecms/api/CompileService.java
index 2aaf5aa..5fc167e 100644
--- a/src/java/de/uhilger/filecms/api/CompileService.java
+++ b/src/java/de/uhilger/filecms/api/CompileService.java
@@ -18,9 +18,11 @@
 package de.uhilger.filecms.api;
 
 import de.uhilger.filecms.data.CompilerIssue;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
+import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -35,6 +37,9 @@
 import javax.tools.StandardJavaFileManager;
 import javax.tools.ToolProvider;
 import org.apache.commons.io.FileUtils;
+import org.apache.tomcat.util.log.SystemLogHandler;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.ProjectHelper;
 
 /**
  *
@@ -42,6 +47,91 @@
 public class CompileService extends Api {
   
   private static final Logger logger = Logger.getLogger(CompileService.class.getName());
+  
+  public String antBuild(String relPath) {
+    
+    // Create a stream to hold the output
+    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    PrintStream ps = new PrintStream(baos);
+    // IMPORTANT: Save the old System.out!
+    PrintStream old = System.out;
+    PrintStream err = System.err;
+    // Tell Java to use your special stream
+    System.setOut(ps);    
+    System.setErr(ps);
+    
+    File targetDir = getTargetDir(relPath); // App-Ordner
+    StringBuilder sb = new StringBuilder();
+    sb.append("Ant build ist noch nicht implementiert.");
+
+    sb.append("<br/>");
+    sb.append("targetDir: ");
+    sb.append(targetDir.getAbsolutePath());
+    
+    File buildFile = new File(targetDir, "build.xml");
+    Project p = new Project();
+    //p.setName("FileCms Build");
+    FileCmsBuildListener listener = new FileCmsBuildListener();
+    p.addBuildListener(listener);
+    p.setUserProperty("ant.file", buildFile.getAbsolutePath());
+    p.init();
+    ProjectHelper helper = ProjectHelper.getProjectHelper();
+    p.addReference("ant.projectHelper", helper);
+    helper.parse(p, buildFile);
+    p.executeTarget(p.getDefaultTarget());  
+    sb.append("<br/>");
+    sb.append(listener.getOutput());
+    
+    
+    // Print some output: goes to your special stream
+    //System.out.println("Foofoofoo!");
+    // Put things back
+    System.out.flush();
+    System.err.flush();
+    System.setOut(old);
+    System.setErr(err);
+    // Show what happened
+    //System.out.println("Here: " + baos.toString());    
+    
+    sb.append("<br/>");
+    sb.append(baos.toString());
+    
+    
+    return sb.toString();
+  }
+  
+  
+  /**
+   * Annahme: relPath zeigt auf einen Ordner, in dem ein build-Ordner die 
+   * fertigen Klassen und ein web-Ordner die Struktur mit WEB-INF 
+   * enthaelt.
+   * 
+   * @param relPath  der relative Pfad, der auf den App-Ordner verweist
+   * @return 
+   */
+  public String buildApp(String relPath) {
+    String result = "ok";
+    try {
+      File targetDir = getTargetDir(relPath); // App-Ordner
+      File classesDir = new File(targetDir, "web/WEB-INF/classes");
+      if(classesDir.exists()) {
+        FileUtils.deleteDirectory(classesDir);
+      }
+      classesDir.mkdirs();
+      File buildDir = new File(targetDir, "build/");
+      File[] files = buildDir.listFiles();
+      for(int i = 0; i < files.length; i++) {
+        if(files[i].isDirectory()) {
+          FileUtils.copyDirectoryToDirectory(files[i], classesDir);
+        } else {
+          FileUtils.copyFileToDirectory(files[i], classesDir);   
+        }
+      }
+    } catch(Exception ex) {
+      logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
+    }
+    return result;
+  }
     
   public List<CompilerIssue> compileAll(String relPath) {
     logger.fine(relPath);
@@ -164,7 +254,7 @@
   }
 
   private final Iterable<String> buildOptions(File targetDir) {
-      String cbase = getCatalinaBase();
+      String cbase = getCatalinaBase(getServletContext());
       File lib = new File(cbase, "lib");
       String cp = "";
       cp = buildCPFromDir(cp, lib);

--
Gitblit v1.9.3