From 931544ee14d9ee76f47f8a3065676dd4a098a78a Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Mon, 20 Jan 2020 06:35:31 +0000
Subject: [PATCH] Umbenennen von Bilddateien schliesst alle Varianten ein
---
src/java/de/uhilger/filecms/api/CompileService.java | 131 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 116 insertions(+), 15 deletions(-)
diff --git a/src/java/de/uhilger/filecms/api/CompileService.java b/src/java/de/uhilger/filecms/api/CompileService.java
index ceb507e..c12c1c7 100644
--- a/src/java/de/uhilger/filecms/api/CompileService.java
+++ b/src/java/de/uhilger/filecms/api/CompileService.java
@@ -34,6 +34,7 @@
import javax.tools.JavaFileObject;
import javax.tools.StandardJavaFileManager;
import javax.tools.ToolProvider;
+import org.apache.commons.io.FileUtils;
/**
*
@@ -41,6 +42,38 @@
public class CompileService extends Api {
private static final Logger logger = Logger.getLogger(CompileService.class.getName());
+
+ /**
+ * 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);
@@ -53,16 +86,20 @@
DiagnosticCollector<JavaFileObject> diagnostics = new DiagnosticCollector();
StandardJavaFileManager fileManager = compiler.getStandardFileManager(diagnostics, null, null);
Iterable<? extends JavaFileObject> compilationUnits = fileManager.getJavaFileObjectsFromFiles(files);
- compiler.getTask(null, null, diagnostics, null, null, compilationUnits).call();
+
+
+ final Iterable<String> options = buildOptions(targetDir);
+
+ compiler.getTask(null, null, diagnostics, options, null, compilationUnits).call();
fileManager.close();
- collectResults(diagnostics, compilerIssues);
+ collectResults(diagnostics, compilerIssues, relPath);
} catch(Exception ex) {
logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
}
return compilerIssues;
}
- private void collectResults(DiagnosticCollector<JavaFileObject> diagnostics, List<CompilerIssue> compilerIssues) {
+ private void collectResults(DiagnosticCollector<JavaFileObject> diagnostics, List<CompilerIssue> compilerIssues, String relPath) {
List compileResults = diagnostics.getDiagnostics();
Iterator i = compileResults.iterator();
while (i.hasNext()) {
@@ -74,7 +111,13 @@
issue.setKind(err.getKind().name());
issue.setLineNumber(err.getLineNumber());
issue.setMessage(err.getMessage(Locale.GERMANY));
- issue.setSoureName(err.getSource().getName());
+
+ String srcName = err.getSource().getName().replace("\\", "/");
+ String cleanRelPath = relPath.replace(HOME_DIR_NAME + "/", "").replace(PUB_DIR_NAME + "/", "");
+ int pos = srcName.indexOf(cleanRelPath);
+ String className = srcName.substring(pos + cleanRelPath.length());
+ issue.setSourceName(className.replace("/", ".").substring(1));
+ //issue.setSourceName(srcName + "\r\n" + relPath);
compilerIssues.add(issue);
}
}
@@ -99,6 +142,19 @@
public boolean accept(File pathname) {
boolean doAccept = false;
if(pathname.getName().endsWith(".java") || pathname.isDirectory()) {
+ doAccept = true;
+ }
+ return doAccept;
+ }
+
+ }
+
+ public class JarFileFilter implements FileFilter {
+
+ @Override
+ public boolean accept(File pathname) {
+ boolean doAccept = false;
+ if(pathname.getName().endsWith(".jar")) {
doAccept = true;
}
return doAccept;
@@ -131,24 +187,69 @@
DiagnosticCollector<JavaFileObject> diagnostics = new DiagnosticCollector();
StandardJavaFileManager fileManager = compiler.getStandardFileManager(diagnostics, null, null);
Iterable<? extends JavaFileObject> compilationUnits1 = fileManager.getJavaFileObjectsFromFiles(files);
- if( mode.equals("1")) {
- final Iterable<String> options = Arrays.asList(new String[]{"-Xlint",
- /*"-cp", project.getClassPath(),*/
- "-d", targetDir.getAbsolutePath()
- });
- compiler.getTask(null, fileManager, diagnostics, options, null, compilationUnits1).call();
- } else {
- compiler.getTask(null, null, diagnostics, null, null, compilationUnits1).call();
- }
+ final Iterable<String> options = buildOptions(targetDir);
+ compiler.getTask(null, fileManager, diagnostics, options, null, compilationUnits1).call();
fileManager.close();
List<CompilerIssue> compilerIssues = new ArrayList();
- collectResults(diagnostics, compilerIssues);
+ collectResults(diagnostics, compilerIssues, relPath);
return compilerIssues;
}
-
+
+ private final Iterable<String> buildOptions(File targetDir) {
+ String cbase = getCatalinaBase(getServletContext());
+ File lib = new File(cbase, "lib");
+ String cp = "";
+ cp = buildCPFromDir(cp, lib);
+ logger.fine(lib.getAbsolutePath());
+ logger.fine(cp);
+ /*
+ wegen dieser Funktion MUSS alles in 'src' liegen
+ */
+ File srcDir = targetDir;
+ while(!srcDir.getName().endsWith("src")) {
+ srcDir = srcDir.getParentFile();
+ }
+ File appDir = srcDir.getParentFile();
+ File appLibDir = new File(appDir, "web/WEB-INF/lib");
+ cp = buildCPFromDir(cp, appLibDir);
+ logger.fine(cp);
+ /*
+ ausgehend von src eins hoeher, dann nach build
+ */
+ File buildDir = new File(appDir, "build");
+ final Iterable<String> options = Arrays.asList(new String[]{"-Xlint",
+ "-cp", cp,
+ "-d", buildDir.getAbsolutePath()
+ });
+ try {
+ FileUtils.deleteDirectory(buildDir);
+ buildDir.mkdir();
+ } catch (IOException ex) {
+ logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
+ }
+ return options;
+ }
+ /*
+ -classpath $JLIB/jettison-1.3.3.jar:$JLIB/xstream-1.4.7.jar
+ */
+ private String buildCPFromDir(String cp, File dir) {
+ StringBuffer buf = new StringBuffer(cp);
+ File[] files = dir.listFiles(new JarFileFilter());
+ for(int i = 0; i < files.length; i++) {
+ if(buf.length() > 0) {
+ buf.append(File.pathSeparatorChar);
+ }
+ //buf.append("\"");
+ buf.append(files[i].getAbsolutePath());
+ //buf.append("\"");
+ }
+
+ return buf.toString();
+ }
}
+
/*
Beispeil fuer einen dynamischen Compiler-Aufruf
--
Gitblit v1.9.3