Changeset 6095

Timestamp:

12/09/11 18:30:40 (6 months ago)

Author:

mtld

Message:

added experimental support for parallel target generation, added full support for depend.xml reloading, optimized logging

Location:

trunk

Files:

• pustefix-core/src/main/java/de/schlund/pfixxml/IncludePartsInfoFactory.java (modified) (1 diff)
• pustefix-core/src/main/java/de/schlund/pfixxml/targets/AuxDependencyManager.java (modified) (6 diffs)
• pustefix-core/src/main/java/de/schlund/pfixxml/targets/LeafTarget.java (modified) (3 diffs)
• pustefix-core/src/main/java/de/schlund/pfixxml/targets/TargetDependencyRelation.java (modified) (2 diffs)
• pustefix-core/src/main/java/de/schlund/pfixxml/targets/TargetGenerationReport.java (modified) (2 diffs)
• pustefix-core/src/main/java/de/schlund/pfixxml/targets/TargetGenerator.java (modified) (12 diffs)
• pustefix-core/src/main/java/de/schlund/pfixxml/targets/TargetGeneratorListener.java (modified) (1 diff)
• pustefix-core/src/main/java/de/schlund/pfixxml/targets/TargetGeneratorRunner.java (modified) (4 diffs)
• pustefix-core/src/main/java/de/schlund/pfixxml/targets/TargetImpl.java (modified) (5 diffs)
• pustefix-core/src/main/java/de/schlund/pfixxml/targets/VirtualTarget.java (modified) (4 diffs)
• pustefix-core/src/main/java/org/pustefixframework/container/spring/http/PustefixHandlerMapping.java (modified) (1 diff)
• pustefix-core/src/main/java/org/pustefixframework/http/AbstractPustefixXMLRequestHandler.java (modified) (2 diffs)
• pustefix-plugins/pustefix-generate-plugin/pom.xml (modified) (1 diff)
• pustefix-plugins/pustefix-generate-plugin/src/main/java/org/pustefixframework/maven/plugins/GenerateMojo.java (modified) (3 diffs)
• pustefix-plugins/pustefix-generate-plugin/src/main/java/org/pustefixframework/maven/plugins/GenerateReportLogger.java (added)

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/IncludePartsInfoFactory.java

@@ -36 +36 @@
     }
     
+    public void reset() {
+        urisToInfo.clear();
+    }
+    
 }

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/targets/AuxDependencyManager.java

@@ -117 +117 @@
 
         if (parent_path != null && parent_part != null && parent_theme != null) {
-            LOG.debug("*** Found another AuxDependency as Parent...");
+            if(LOG.isDebugEnabled()) {
+                LOG.debug("*** Found another AuxDependency as Parent...");
+            }
             parent = auxFactory.getAuxDependencyInclude(parent_path, parent_part,
                             parent_theme);
@@ -143 +145 @@
         if (part != null && part.equals("")) part = null;
         if (theme != null && theme.equals("")) theme = null;
-        LOG.info("Adding Dependency of type 'text' to Target '" + target.getTargetKey() + "':");
-        LOG.info("*** [" + path.toURI().toString() + "][" + part + "][" + theme + "][" +
-                 ((parent_path == null)? "null" : parent_path.toURI().toString()) + "][" + parent_part + "][" + parent_theme + "]");
-
+        if(LOG.isInfoEnabled()) {
+            LOG.info("Adding Dependency of type 'text' to Target '" + target.getTargetKey() + "':");
+            LOG.info("*** [" + path.toURI().toString() + "][" + part + "][" + theme + "][" +
+                    ((parent_path == null)? "null" : parent_path.toURI().toString()) + "][" + parent_part + "][" + parent_theme + "]");
+        }
+        
         child = auxFactory.getAuxDependencyInclude(path, part, theme);
         parent = getParentDependency(parent_path, parent_part, parent_theme);
@@ -161 +165 @@
         AuxDependency parent = null;
 
-        LOG.info("Adding Dependency of type 'text' to Target '" + target.getTargetKey() + "':");
-        LOG.info("*** [" + path.toURI().toString() + "][" +
-                 ((parent_path == null)? "null" : parent_path.toURI().toString()) + "][" + parent_part + "][" + parent_theme + "]");
-
+        if(LOG.isInfoEnabled()) {
+            LOG.info("Adding Dependency of type 'text' to Target '" + target.getTargetKey() + "':");
+            LOG.info("*** [" + path.toURI().toString() + "][" +
+                    ((parent_path == null)? "null" : parent_path.toURI().toString()) + "][" + parent_part + "][" + parent_theme + "]");
+        }
+        
         child = auxFactory.getAuxDependencyImage(path);
         parent = getParentDependency(parent_path, parent_part, parent_theme);
@@ -178 +184 @@
         AuxDependency child  = null;
 
-        LOG.info("Adding Dependency of type 'text' to Target '" + target.getTargetKey() + "':");
-        LOG.info("*** [" + path.toURI().toString() + "]");
-
+        if(LOG.isInfoEnabled()) {
+            LOG.info("Adding Dependency of type 'text' to Target '" + target.getTargetKey() + "':");
+            LOG.info("*** [" + path.toURI().toString() + "]");
+        }
+        
         child = auxFactory.getAuxDependencyFile(path);
         
@@ -193 +201 @@
         AuxDependency child  = null;
 
-        LOG.info("Adding Dependency of type 'text' to Target '" + target.getTargetKey() + "':");
-        LOG.info("*** [" + target.getTargetKey() + "]");
-
+        if(LOG.isInfoEnabled()) {
+            LOG.info("Adding Dependency of type 'text' to Target '" + target.getTargetKey() + "':");
+            LOG.info("*** [" + target.getTargetKey() + "]");
+        }
+        
         child = auxFactory.getAuxDependencyTarget(target.getTargetGenerator(), targetkey);
         
@@ -229 +239 @@
 
     public synchronized void saveAuxdepend() throws IOException  {
-        LOG.info("===> Trying to save aux info of Target '" + target.getTargetKey() + "'");
-
+        if(LOG.isInfoEnabled()) {
+            LOG.info("===> Trying to save aux info of Target '" + target.getTargetKey() + "'");
+        }
+        
         FileResource       path   = getAuxFile();
         FileResource       dir    = path.getParentAsFileResource();

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/targets/LeafTarget.java

@@ -147 +147 @@
         long maxmodtime = ResourceUtil.getResource(getTargetKey()).lastModified();
         NDC.push("    ");
-        TREE.debug("> " + getTargetKey());
+        if(TREE.isDebugEnabled()) {
+            TREE.debug("> " + getTargetKey());
+        }
 
         for (Iterator<AuxDependency> i = this.getAuxDependencyManager().getChildren()
@@ -169 +171 @@
                 // invalidate Memcache:
                 storeValue(null);
-                TREE.debug("  [" + getTargetKey() + ": updated leaf node...]");
+                if(TREE.isDebugEnabled()) {
+                    TREE.debug("  [" + getTargetKey() + ": updated leaf node...]");
+                }
                 setModTime(maxmodtime);
             } catch (Exception e) {
@@ -175 +179 @@
             }
         } else {
-            TREE.debug("  [" + getTargetKey() + ": leaf node...]");
+            if(TREE.isDebugEnabled()) {
+                TREE.debug("  [" + getTargetKey() + ": leaf node...]");
+            }
         }
         NDC.pop();

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/targets/TargetDependencyRelation.java

@@ -177 +177 @@
                                        + " for target " + target.getTargetKey() + " would result in a LOOP!");
         }
-
-        LOG.debug("+++ Adding relations " + target.getTargetKey() + " <-> " + aux.toString() + " / " + parent.toString());
-
+        if(LOG.isDebugEnabled()) {
+            LOG.debug("+++ Adding relations " + target.getTargetKey() + " <-> " + aux.toString() + " / " + parent.toString());
+        }
         if (allauxs.get(aux) == null) {
             allauxs.put(aux, new TreeSet<Target>());
@@ -218 +218 @@
 
     public synchronized void resetRelation(Target target) {
-        LOG.debug("--- Removing all relations for " + target.getTargetKey());
-
+        if(LOG.isDebugEnabled()) {
+            LOG.debug("--- Removing all relations for " + target.getTargetKey());
+        }
         TreeSet<AuxDependency> auxsForTarget = alltargets.get(target);
 

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/targets/TargetGenerationReport.java

@@ -18 +18 @@
 package de.schlund.pfixxml.targets;
 
+import java.io.File;
 import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
-public class TargetGenerationReport {
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class TargetGenerationReport implements TargetGeneratorListener {
     
-    private ArrayList<Exception> errors = new ArrayList<Exception>();
+    private String LINE1 = "============================================================================================";
+    private String LINE2 = "|----------------------------------------------------------------------------------";
+    
+    private Logger logger;
+    
+    private List<TargetGenerationException> errors = new ArrayList<TargetGenerationException>();
+    
+    private long start;
+    private long end;
+    
+    private int startedTargets;
+    private int finishedTargets;
+    private int failedTargets;
     
     public TargetGenerationReport() {
     }
     
-    public void addError(Exception e) {
-        errors.add(e);
+    public TargetGenerationReport(Logger logger) {
+        this.logger = logger;
+    }
+    
+    public void start(TargetGenerator targetGen) {
+        start = System.currentTimeMillis();
+        info("Start generating targets...");
+    }
+    
+    public void end(TargetGenerator targetGen) {
+        end = System.currentTimeMillis();
+        info(LINE1);
+        info("Generated " + finishedTargets + " targets in " + (end - start) + "ms");
+        if(failedTargets > 0) {
+            info("Failed to create " + failedTargets + " from " + startedTargets + " targets due to errors");
+        }
+        if (errors.isEmpty()) {
+            info("No exceptions");
+        } else {
+            info("Exceptions:");
+            Iterator<TargetGenerationException> it = errors.iterator();
+            if(it.hasNext()) {
+                info(LINE2);
+            }
+            while(it.hasNext()) {
+                String errorMsg = it.next().toStringRepresentation();
+                String[] errorLines = errorMsg.split("\n");
+                for(String errorLine: errorLines) {
+                    info(errorLine);
+                }
+                if(it.hasNext()) {
+                    info(LINE2);
+                }
+            }
+        }
+        info(LINE1);
     }
     
@@ -35 +87 @@
     }
  
-    @Override
-    public String toString() {
-        StringBuffer buf = new StringBuffer(255);
-        String prod_break = "'============================================================================================'\n";
-        String ex_break = "|----------------------------------------------------------------------------------\n";
-        if (errors.isEmpty()) {
-            StringBuffer sb = new StringBuffer();
-            sb.append(prod_break);
-            sb.append("| No exceptions\n");
-            sb.append(prod_break);
-            return sb.toString();
-        }
-        buf.append(prod_break);
-        buf.append("| Exceptions: ").append("\n");
-        for (int i = 0; i < errors.size(); i++) {
-            TargetGenerationException tgex = (TargetGenerationException) errors.get(i);
-                String str = tgex.toStringRepresentation();
-                buf.append(str);
-                if (errors.size() - 1 > i)
-                    buf.append(ex_break);
-            }
-            buf.append(prod_break);
-        
-        return buf.toString();
+    public void error(Target target, TargetGenerationException exception) {
+        failedTargets++;
+        errors.add(exception);
+        String path = target.getTargetGenerator().getDisccachedir().toURI().toString();
+        error(">>>>> Error generating " + path + File.separator + target.getTargetKey() + " from " + 
+                target.getXMLSource().getTargetKey() + " and " + target.getXSLSource().getTargetKey(), exception);
     }
+    
+    public void start(Target target) {
+        startedTargets++;
+    }
+    
+    public void end(Target target) {
+        finishedTargets++;
+        String path = target.getTargetGenerator().getDisccachedir().toURI().toString();
+        debug(">>>>> Generated " + path + File.separator + target.getTargetKey() + " from " + 
+                target.getXMLSource().getTargetKey() + " and " + target.getXSLSource().getTargetKey());
+    }
+    
+    protected void debug(String msg) {
+        logger.log(Level.FINE, msg);
+    }
+    
+    protected void error(String msg, TargetGenerationException exception) {
+        logger.log(Level.SEVERE, msg, exception);
+    }
+    
+    protected void info(String msg) {
+        logger.log(Level.INFO, msg);
+    }
+    
 }

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/targets/TargetGenerator.java

@@ -22 +22 @@
 import java.io.IOException;
 import java.io.StringReader;
+import java.lang.management.ManagementFactory;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -114 +115 @@
     private static final Logger LOG = Logger.getLogger(TargetGenerator.class);
 
-    private TargetGenerationReport report = new TargetGenerationReport();
-
     private PageTargetTree pagetree = new PageTargetTree();
 
@@ -157 +156 @@
     private IncludePartsInfoFactory includePartsInfo;
     private boolean parseIncludes = true;
+    private boolean parallel = false;
 
     private Map<String, String> renderParams;
@@ -167 +167 @@
 
     public TargetGenerator(final Resource confile, final FileResource cacheDir, final boolean parseIncludes) throws IOException, SAXException, XMLException {
-        this(confile, cacheDir, new SPCacheFactory().init(), new SiteMap(confile), parseIncludes);   
+        this(confile, cacheDir, new SPCacheFactory().init(), new SiteMap(confile), parseIncludes, false);   
+    }
+    
+    public TargetGenerator(final Resource confile, final FileResource cacheDir, final boolean parseIncludes, final boolean parallel) throws IOException, SAXException, XMLException {
+        this(confile, cacheDir, new SPCacheFactory().init(), new SiteMap(confile), parseIncludes, parallel);   
     }
     
     public TargetGenerator(final Resource confile, final FileResource cacheDir, final SPCacheFactory cacheFactory, final SiteMap siteMap) throws IOException, SAXException, XMLException {
-        this(confile, cacheDir, cacheFactory, siteMap, true);
-    }
-        
-    public TargetGenerator(final Resource confile, final FileResource cacheDir, final SPCacheFactory cacheFactory, final SiteMap siteMap, final boolean parseIncludes) throws IOException, SAXException, XMLException {
+        this(confile, cacheDir, cacheFactory, siteMap, true, false);
+    }
+        
+    public TargetGenerator(final Resource confile, final FileResource cacheDir, final SPCacheFactory cacheFactory, final SiteMap siteMap, final boolean parseIncludes, final boolean parallel) throws IOException, SAXException, XMLException {
         this.config_path = confile;
         this.cacheDir = cacheDir;
@@ -180 +184 @@
         this.siteMap = siteMap;
         this.parseIncludes = parseIncludes;
+        this.parallel = parallel;
     }
         
@@ -206 +211 @@
         pageInfoFactory = new PageInfoFactory();
         includePartsInfo = new IncludePartsInfoFactory();
-        //TODO: factory init on reload
         Meminfo meminfo = new Meminfo();
         meminfo.print("TG: Before loading " + config_path.toString());
         loadConfig(config_path);
         meminfo.print("TG: after loading targets for " + config_path.toString());
+    }
+    
+    private void reload() throws Exception {
+        pagetree = new PageTargetTree();
+        alltargets.clear();
+        includeDocumentFactory.reset();
+        targetDependencyRelation.reset();
+        auxDependencyFactory.reset();
+        targetFactory.reset();
+        sharedLeafFactory.reset();
+        pageInfoFactory.reset();
+        includePartsInfo.reset();
+        loadConfig(config_path);
     }
     
@@ -379 +396 @@
                 }
             }
-            pagetree = new PageTargetTree();
-            alltargets = new HashMap<String, Target>();
-            loadConfig(this.config_path);
+            reload();
             this.fireConfigurationChangeEvent();
             return true;
@@ -1095 +1110 @@
                         gen.generateAll();
                         System.out.println("---------- ...done [" + args[i] + "]");
-                        report.append(gen.getReportAsString());
                     } else {
                         LOG.error("Couldn't read configfile '" + args[i] + "'");
@@ -1114 +1128 @@
 
     public void generateAll() throws Exception {
+        notifyListenerStart();
+        if(parallel) {
+            generateAllParallel();
+        } else {
+            generateAllSerial();
+        }
+        notifyListenerEnd();
+    }
+    
+    private void generateAllSerial() throws Exception {
         for (Iterator<String> e = getAllTargets().keySet().iterator(); e.hasNext();) {
             Target current = getTarget(e.next());
             generateTarget(current);
-            /* if all listeners want to stop, 
-             * there is no point in continuing ... */
-            if (needsToStop()) {
-                break;
-            }
+        }
+    }
+    
+    private void generateAllParallel() throws Exception {
+        int processors = ManagementFactory.getOperatingSystemMXBean().getAvailableProcessors();
+        List<Target> genTargets = new ArrayList<Target>();
+        for (Iterator<String> e = getAllTargets().keySet().iterator(); e.hasNext();) {
+            Target current = getTarget(e.next());
+            genTargets.add(current);
+        }
+        Thread[] genThreads = new Thread[processors];
+        for(int i=0; i<processors; i++) {
+            Thread genThread = new GenThread(genTargets);
+            genThread.start();
+            genThreads[i] = genThread;
+        }
+        for(int i=0; i<processors; i++) {
+            genThreads[i].join();
         }
     }
@@ -1127 +1164 @@
     public void generateTarget(Target target) throws Exception {
         if (target.getType() != TargetType.XML_LEAF && target.getType() != TargetType.XSL_LEAF) {
-            String path = getDisccachedir().toURI().toString();
-            System.out.println(">>>>> Generating " + path + File.separator + target.getTargetKey() + " from " + target.getXMLSource().getTargetKey() + " and " + target.getXSLSource().getTargetKey());
-
             boolean needs_update = false;
             needs_update = target.needsUpdate();
             if (needs_update) {
                 try {
+                    notifyListenerStart(target);
                     target.getValue();
-                    notifyListenerTargetDone(target);
-                } catch (TargetGenerationException tgex) {
-                    notifyListenerTargetException(target, tgex);
-                    report.addError(tgex);
-                    tgex.printStackTrace();
-                }
-            } else {
-                notifyListenerTargetDone(target);
-            }
-            System.out.println("done.");
-        } else {
-            notifyListenerTargetDone(target);
-        }
-    }
-
-    /**
-     * This method checks, if a TargetGeneratorListener wants to stop,
-     * if so he will get kicked out of the listener set. 
-     * 
-     * @return true if all listeners want to stop
-     */
-    private boolean needsToStop() {
-        boolean result = false;
-        if (generationListeners.size() > 0) {
-            result = true;
-            for (Iterator<TargetGeneratorListener> it = generationListeners.iterator(); it.hasNext();) {
-                TargetGeneratorListener listener = it.next();
-                if (listener.needsStop()) {
-                    result = result && true;
-                    it.remove();
-                } else {
-                    result = false;
-                }
-            }
-        }
-        return result;
-    }
-
-    /**
-     * This calls the finishedTarget method of all registered listeners
-     * @param target the finished target
-     */
-    private void notifyListenerTargetDone(Target target) {
-        for (Iterator<TargetGeneratorListener> it = generationListeners.iterator(); it.hasNext();) {
-            TargetGeneratorListener listener = it.next();
-            listener.finishedTarget(target);
-        }
-    }
-
-    /**
-     * This calls the generationException method of all registered listeners
-     * @param target the finished target
-     * @param tgex the exception!
-     */
-    private void notifyListenerTargetException(Target target, TargetGenerationException tgex) {
-        for (Iterator<TargetGeneratorListener> it = generationListeners.iterator(); it.hasNext();) {
-            TargetGeneratorListener listener = it.next();
-            listener.generationException(target, tgex);
+                    notifyListenerEnd(target);
+                } catch (TargetGenerationException e) {
+                    notifyListenerError(target, e);
+                }
+            }
+        }
+    }
+
+    private void notifyListenerStart() {
+        for(TargetGeneratorListener listener: generationListeners) {
+            listener.start(this);
+        }
+    }
+    
+    private void notifyListenerEnd() {
+        for(TargetGeneratorListener listener: generationListeners) {
+            listener.end(this);
+        }
+    }
+    
+    private void notifyListenerStart(Target target) {
+        for(TargetGeneratorListener listener: generationListeners) {
+            listener.start(target);
+        }
+    }
+    
+    private void notifyListenerEnd(Target target) {
+        for(TargetGeneratorListener listener: generationListeners) {
+            listener.end(target);
+        }
+    }
+
+    private void notifyListenerError(Target target, TargetGenerationException e) {
+        for(TargetGeneratorListener listener: generationListeners) {
+            listener.error(target, e);
         }
     }
@@ -1220 +1232 @@
     }
     
-    /**
-     * @return report containing sensilbe information after {@link #generateAll()}, not null
-     */
-    public String getReportAsString() {
-        return report.toString();
-    }
-
-    public boolean errorsReported() {
-        return report.hasError();
-    }
-    
-    public void resetGenerationReport() {
-        report = new TargetGenerationReport();
-    }
-
     //--
 
@@ -1287 +1284 @@
     }
 
+    
+    private class GenThread extends Thread {
+        
+        private List<Target> genTargets;
+        
+        GenThread(List<Target> genTargets) {
+            this.genTargets = genTargets;
+        }
+        
+        @Override
+        public void run() {
+            Target genTarget = null;
+            do {
+            synchronized(genTargets) {
+                if(!genTargets.isEmpty()) {
+                    genTarget = genTargets.remove(0);
+                } else {
+                    genTarget = null;
+                }
+            }
+            if(genTarget != null) {
+                try {
+                    generateTarget(genTarget);
+                } catch(Exception x) {
+                    throw new RuntimeException("Error generating target " + genTarget.getTargetKey(), x);
+                }
+            } else {
+                break;
+            }
+            } while(genTarget != null);
+        }
+        
+    }
 }

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/targets/TargetGeneratorListener.java

@@ -20 +20 @@
 
 
-/**
- * @author Niels Schelbach
- * 23.04.2004
- */
 public interface TargetGeneratorListener {
     
+    public void start(TargetGenerator targetGen);
+    public void end(TargetGenerator targetGen);
     
-    public void finishedTarget(Target target);
-    public void abortedTargetGeneration(Target target);
-    public void generationException(Target target, TargetGenerationException exception);
-
-    public boolean needsStop();
+    public void start(Target target);
+    public void end(Target target);
+    
+    public void error(Target target, TargetGenerationException exception);
 
 }

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/targets/TargetGeneratorRunner.java

@@ -3 +3 @@
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.Writer;
 import java.net.URI;
 import java.util.ArrayList;
@@ -48 +47 @@
     private TenantInfo tenantInfo;
     private Resource confFile;
-    
-    public boolean run(File docroot, File cache, String mode, Writer output, String logLevel) throws Exception {
+        
+    public boolean run(File docroot, File cache, String mode, boolean parallel, java.util.logging.Logger reportLogger) throws Exception {
         
         if(!docroot.exists()) throw new Exception("TargetGenerator docroot " + docroot.getAbsolutePath() + " doesn't exist");
@@ -59 +58 @@
         if(projectConfigLocation == null) throw new Exception("Can't get project config location from web.xml");
         
-        ConsoleAppender appender = new ConsoleAppender(new PatternLayout("[%p] %c - %m\n"));
-        Logger logger=Logger.getRootLogger();
-        logger.setLevel(Level.toLevel(logLevel));
-        logger.addAppender(appender);
+        Logger rootLogger = Logger.getRootLogger();
+        rootLogger.setLevel(Level.toLevel("error"));
+        ConsoleAppender rootAppender = new ConsoleAppender(new PatternLayout("[%p] %c - %m\n"));
+        rootLogger.addAppender(rootAppender);
         
         Properties props = new Properties();
@@ -85 +84 @@
         FileResource cacheDir = ResourceUtil.getFileResource(cache.toURI());
         
-        try { 
-            TargetGenerator gen = new TargetGenerator(confFile, cacheDir, true);
-            gen.setIsGetModTimeMaybeUpdateSkipped(false);
+        try {
+            TargetGenerator gen = new TargetGenerator(confFile, cacheDir, true, parallel);
+            gen.setIsGetModTimeMaybeUpdateSkipped(true);
             gen.setTenantInfo(tenantInfo);
             gen.afterPropertiesSet();
+            TargetGenerationReport report = new TargetGenerationReport(reportLogger);
+            gen.addListener(report);
             gen.generateAll();
-            output.write(gen.getReportAsString());
-            return !gen.errorsReported();
+            return !report.hasError();
         } catch(Exception x) {
             throw new Exception("Generating targets failed", x);

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/targets/TargetImpl.java

@@ -127 +127 @@
      * @see de.schlund.pfixxml.targets.Target#getValue()
      */
-    public Object getValue() throws TargetGenerationException {
+    public synchronized Object getValue() throws TargetGenerationException {
         // Idea: if skip_getmodtimemaybeupdate is set we do not need to call getModeTimeMaybeUpdate
         // but: if the target is not in disk-cache (has not been generated) we must call
@@ -134 +134 @@
         if (generator.isGetModTimeMaybeUpdateSkipped()) {
             // skip getModTimeMaybeUpdate!
-            LOG.debug("skip_getmodtimemaybeupdate is true. Trying to skip getModTimeMaybeUpdate...");
+            if(LOG.isDebugEnabled()) {
+                LOG.debug("skip_getmodtimemaybeupdate is true. Trying to skip getModTimeMaybeUpdate...");
+            }
             if (!onceLoaded) {
                 // do test for exists here!
@@ -142 +144 @@
                 }
                 if (thefile==null || !thefile.exists()) { // Target has not been loaded once and it doesn't exist in disk cache
-                    LOG.debug("Cant't skip getModTimeMaybeUpdated because it has not been loaded " +
-                              "and doesn't even exist in disk cache! Generating now !!");
+                    if(LOG.isDebugEnabled()) {
+                        LOG.debug("Cant't skip getModTimeMaybeUpdated because it has not been loaded " +
+                                "and doesn't even exist in disk cache! Generating now !!");
+                    }
                     try {
                         getModTimeMaybeUpdate();
@@ -153 +157 @@
                     }
                 } else {
-                    LOG.debug("Target exists in disc cache, using it...");
+                    if(LOG.isDebugEnabled()) {
+                        LOG.debug("Target exists in disc cache, using it...");
+                    }
                 }
-            } else { // target generated -> nop 
-                LOG.debug("Target has already been loaded, reusing it...");
+            } else { // target generated -> nop
+                if(LOG.isDebugEnabled()) {
+                    LOG.debug("Target has already been loaded, reusing it...");
+                }
             }
         } else { // do not skip getModTimeMaybeUpdate 
-            LOG.debug("Skipping getModTimeMaybeUpdate disabled in TargetGenerator!");
+            if(LOG.isDebugEnabled()) {
+                LOG.debug("Skipping getModTimeMaybeUpdate disabled in TargetGenerator!");
+            }
             try {
                 getModTimeMaybeUpdate();
@@ -215 +225 @@
                 obj = getValueFromSPCache();
                 if (obj == null || isDiskCacheNewerThenMemCache()) {
-                    if (LOG.isDebugEnabled()) {
-                        if (LOG.isDebugEnabled() && isDiskCacheNewerThenMemCache()) {
-                            LOG.debug(
+                    if (LOG.isDebugEnabled() && isDiskCacheNewerThenMemCache()) {
+                        LOG.debug(
                                 "File in disk cache is newer then in memory cache. Rereading target from disk...");
-                        }
                     }
                     

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/targets/VirtualTarget.java

@@ -128 +128 @@
      */
     @Override
-    public boolean needsUpdate() throws Exception {
+    public synchronized boolean needsUpdate() throws Exception {
         long mymodtime = getModTime();
         long xmlmod;
@@ -228 +228 @@
         long tmpmodtime;
         NDC.push("    ");
-        TREE.debug("> " + getTargetKey());
+        if(TREE.isDebugEnabled()) {
+            TREE.debug("> " + getTargetKey());
+        }
         maxmodtime = ((TargetImpl) getXMLSource()).getModTimeMaybeUpdate();
         // if (maxmodtime > currmodtime) {
@@ -276 +278 @@
                     try {
                         generateValue();
-                        TREE.debug("  [" + getTargetKey() + ": generated...]");
+                        if(TREE.isDebugEnabled()) {
+                            TREE.debug("  [" + getTargetKey() + ": generated...]");
+                        }
                     } catch (TransformerException e) {
                         LOG.error("Error when generating: " + getTargetKey()
@@ -309 +313 @@
             }
         } else {
-            TREE.debug("  [" + getTargetKey() + ": skipping...]");
+            if(TREE.isDebugEnabled()) {
+                TREE.debug("  [" + getTargetKey() + ": skipping...]");
+            }
         }
         NDC.pop();

trunk/pustefix-core/src/main/java/org/pustefixframework/container/spring/http/PustefixHandlerMapping.java

@@ -70 +70 @@
     }
     
+    public void reload() {
+        initApplicationContext();
+    }
+    
 }

trunk/pustefix-core/src/main/java/org/pustefixframework/http/AbstractPustefixXMLRequestHandler.java

@@ -51 +51 @@
 import org.pustefixframework.config.contextxmlservice.AbstractXMLServletConfig;
 import org.pustefixframework.config.contextxmlservice.ServletManagerConfig;
+import org.pustefixframework.container.spring.http.PustefixHandlerMapping;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -496 +497 @@
         }
         
+        if(!generator.isGetModTimeMaybeUpdateSkipped()) {
+            synchronized(this) {
+                try {
+                    boolean reloaded = generator.tryReinit();
+                    if(reloaded) {
+                        PustefixHandlerMapping handlerMapping = (PustefixHandlerMapping)applicationContext.getBean(PustefixHandlerMapping.class.getName());
+                        handlerMapping.reload();
+                    }
+                } catch(Exception x) {
+                    throw new PustefixCoreException(x);
+                }
+            }
+        }
+        
         if (spdoc.getResponseError() == HttpServletResponse.SC_NOT_FOUND && spdoc.getDocument() != null) {
             String stylesheet = extractStylesheetFromSPDoc(spdoc, preq);

trunk/pustefix-plugins/pustefix-generate-plugin/pom.xml

@@ -34 +34 @@
       <version>1.5.1</version>
     </dependency>
-    <dependency>
-      <groupId>org.pustefixframework</groupId>
-      <artifactId>pustefix-core</artifactId>
-      <version>0.18.5-SNAPSHOT</version>
-    </dependency>
   </dependencies>
 

trunk/pustefix-plugins/pustefix-generate-plugin/src/main/java/org/pustefixframework/maven/plugins/GenerateMojo.java

@@ -19 +19 @@
 
 import java.io.File;
-import java.io.StringWriter;
-import java.io.Writer;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import org.apache.maven.plugin.AbstractMojo;
@@ -56 +56 @@
     
     /**
-     * @parameter default-value="error"
+     * @parameter default-value=true
      * @required
      */
-    private String loglevel;
+    private boolean parallel;
 
     /** @parameter default-value="${project}" */
@@ -74 +74 @@
         
         File cache = new File(webappdir, ".cache");
-
+        
+        Logger reportLogger = new GenerateReportLogger(getLog());
+        if(getLog().isDebugEnabled()) {
+            reportLogger.setLevel(Level.FINE);
+        } else if(getLog().isInfoEnabled()) {
+            reportLogger.setLevel(Level.INFO);
+        } else if(getLog().isWarnEnabled()) {
+            reportLogger.setLevel(Level.WARNING);
+        } else if(getLog().isErrorEnabled()) {
+            reportLogger.setLevel(Level.SEVERE);
+        }
+        
         URLClassLoader loader = getProjectRuntimeClassLoader();
         ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
         try {
             Class<?> generator = Class.forName("de.schlund.pfixxml.targets.TargetGeneratorRunner", true, loader);
-            Method meth =
-                    generator.getMethod("run", File.class, File.class, String.class,
-                            Writer.class, String.class);
+            Method meth = generator.getMethod("run", File.class, File.class, String.class, boolean.class, Logger.class);
             Object instance = generator.newInstance();
-            StringWriter output = new StringWriter();
             Thread.currentThread().setContextClassLoader(loader);
-            boolean ok =
-                    (Boolean) meth.invoke(instance, docroot, cache, "prod", output, loglevel);
-            getLog().info(output.toString());
+            boolean ok = (Boolean) meth.invoke(instance, docroot, cache, "prod", parallel, reportLogger);
             if (!ok)
                 throw new MojoExecutionException("Target generation errors occurred.");