geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r464142 [4/4] - in /geronimo/gbuild/trunk: ./ gbuild-agent/ gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/ gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/activemq/ gbuild-agent/src/main/java/org/apache/geronimo/gb...
Date Sun, 15 Oct 2006 07:06:32 GMT
Modified: geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/BuildOutputExtension.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/BuildOutputExtension.java?view=diff&rev=464142&r1=464141&r2=464142
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/BuildOutputExtension.java (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/BuildOutputExtension.java Sun Oct 15 00:06:27 2006
@@ -23,25 +23,29 @@
 import java.io.IOException;
 import java.util.Map;
 
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-
 import org.apache.maven.continuum.configuration.ConfigurationException;
 import org.apache.maven.continuum.configuration.ConfigurationService;
-import org.apache.maven.continuum.core.action.AbstractContinuumAction;
 import org.apache.maven.continuum.model.project.BuildResult;
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 
+import org.apache.geronimo.gbuild.agent.continuum.Context;
+import org.apache.geronimo.gbuild.agent.extension.BuildAgentExtentionSupport;
 import org.apache.geronimo.gbuild.agent.util.GZipUtils;
-import org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension;
 
 /**
+ * Writes the results of a build to the results.
+ *
+ * <p>
+ * The build output is gzipped and attached to the the <tt>build.output-file.gz</tt> field of the build result context.
+ * </p>
+ *
  * @version $Rev$ $Date$
  */
-public class BuildOutputExtension extends AbstractLogEnabled implements BuildAgentExtension
+public class BuildOutputExtension
+    extends BuildAgentExtentionSupport
 {
-
     /**
      * @plexus.requirement
      */
@@ -52,56 +56,48 @@
      */
     private ContinuumStore store;
 
-    public void preProcess(Map build) {
-    }
+    public void postProcess(final Map build, final Map results) {
+        assert build != null;
+        assert results != null;
 
-    public void postProcess(Map build, Map results) {
         File file = null;
-        try {
-            int projectId = AbstractContinuumAction.getProjectId(build);
 
+        try {
+            int projectId = Context.getProjectId(build);
             Project project = store.getProject(projectId);
 
             BuildResult buildResult = store.getBuildResult(project.getLatestBuildId());
 
             file = configurationService.getBuildOutputFile(buildResult.getId(), projectId);
-
-        } catch (ContinuumStoreException e) {
-
-            getLogger().error("Unable to retrieve info from the ContinuumStore.", e);
+        }
+        catch (ContinuumStoreException e) {
+            log.error("Unable to retrieve info from the ContinuumStore.", e);
 
             return;
-
-        } catch (ConfigurationException e) {
-
-            getLogger().error("Unable to get the build output file from the configuration service.", e);
+        }
+        catch (ConfigurationException e) {
+            log.error("Unable to get the build output file from the configuration service.", e);
 
             return;
         }
 
         if (!file.exists()) {
-
-            getLogger().warn("File to include doesn't exist: " + file.getAbsolutePath());
+            log.warn("File to include doesn't exist: " + file);
 
             return;
         }
 
         try {
-
-            getLogger().debug("Reading " + file.getAbsolutePath());
+            log.debug("Reading: " + file);
 
             byte[] bytes = GZipUtils.fileRead(file);
 
-            getLogger().info("Including " + bytes.length + " - " + file.getAbsolutePath());
+            log.info("Including " + bytes.length + " - " + file);
 
             results.put("build.output-file.gz", bytes);
-
         }
         catch (IOException e) {
-            getLogger().warn("Error reading file to include: " + file.getAbsolutePath(), e);
+            log.warn("Error reading file to include: " + file, e);
         }
-
-
     }
-
 }

Modified: geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/FileIncludeExtension.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/FileIncludeExtension.java?view=diff&rev=464142&r1=464141&r2=464142
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/FileIncludeExtension.java (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/FileIncludeExtension.java Sun Oct 15 00:06:27 2006
@@ -24,20 +24,22 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.FileUtils;
 
 import org.apache.maven.continuum.configuration.ConfigurationService;
 
-import org.apache.geronimo.gbuild.agent.ContinuumBuildAgent;
-import org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension;
+import org.apache.geronimo.gbuild.agent.continuum.Context;
+import org.apache.geronimo.gbuild.agent.extension.BuildAgentExtentionSupport;
 
 /**
+ * Includes additional files from a builds output into the build result context based on
+ * a regular expression to match the file name.
+ * 
  * @version $Rev$ $Date$
  */
-public class FileIncludeExtension extends AbstractLogEnabled implements BuildAgentExtension
+public class FileIncludeExtension
+    extends BuildAgentExtentionSupport
 {
-
     /**
      * @plexus.requirement
      */
@@ -48,69 +50,65 @@
      */
     private String pattern;
 
-
-    public void preProcess(Map build) {
-    }
-
-    public void postProcess(Map build, Map results) {
-        getLogger().debug("Pattern '"+pattern+"'");
-
-        Iterator keys = build.keySet().iterator();
-
-        while (keys.hasNext()) {
-
-            String key = (String) keys.next();
+    public void postProcess(final Map build, final Map results) {
+        assert build != null;
+        assert results != null;
+
+        log.debug("Pattern '" + pattern + "'");
+
+        Iterator iter = build.keySet().iterator();
+        while (iter.hasNext()) {
+            String key = (String) iter.next();
 
             if (key.matches(pattern)){
-                getLogger().debug("Match '"+key+"'");
+                log.debug("Match '" + key + "'");
                 include(key, build, results);
-            } else {
-                getLogger().debug("No Match '"+key+"'");
+            }
+            else {
+                log.debug("No Match '" + key + "'");
             }
         }
     }
 
+    //
     // TODO: Maybe allow for the file contents to be compressed
-    private void include(String fileNameKey, Map build, Map results) {
-        getLogger().debug("Looking for " + fileNameKey);
+    //
 
-        String fileName = (String) build.get(fileNameKey);
+    private void include(final String fileNameKey, final Map build, final Map results) {
+        assert fileNameKey != null;
+        assert build != null;
+        assert results != null;
+
+        log.debug("Looking for: " + fileNameKey);
 
+        String fileName = (String) build.get(fileNameKey);
         if (fileName == null) {
             return;
         }
 
-        getLogger().debug("Found entry " + fileNameKey + " = " + fileName);
+        log.debug("Found entry: " + fileNameKey + " = " + fileName);
 
         File dir = configurationService.getWorkingDirectory();
-
-        int projectId = ContinuumBuildAgent.getProjectId(build);
-
+        int projectId = Context.getProjectId(build);
         dir = new File(dir, Integer.toString(projectId));
-
         File file = new File(dir, fileName);
 
         if (!file.exists()) {
-
-            getLogger().warn("File to include doesn't exist: " + file.getAbsolutePath());
-
+            log.warn("File to include doesn't exist: " + file);
             return;
         }
 
         try {
-
-            getLogger().debug("Reading "+file.getAbsolutePath());
+            log.debug("Reading: " + file);
 
             String content = FileUtils.fileRead(file.getAbsolutePath());
 
-            getLogger().debug("Including "+content.length()+" - "+file.getAbsolutePath());
+            log.debug("Including " + content.length() + " - " + file);
+            
             results.put(fileNameKey, content);
-
         }
         catch (IOException e) {
-            getLogger().warn("Error reading file to include: " + file.getAbsolutePath(), e);
+            log.warn("Error reading file to include: " + file, e);
         }
     }
-
-
 }

Modified: geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/HeaderIncludeExtension.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/HeaderIncludeExtension.java?view=diff&rev=464142&r1=464141&r2=464142
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/HeaderIncludeExtension.java (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/HeaderIncludeExtension.java Sun Oct 15 00:06:27 2006
@@ -22,64 +22,67 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-
-import org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension;
+import org.apache.geronimo.gbuild.agent.extension.BuildAgentExtentionSupport;
 
 /**
+ * Adds properties to the build results based on regular expressions matched on the build context.
+ * 
  * @version $Rev$ $Date$
  */
-public class HeaderIncludeExtension extends AbstractLogEnabled implements BuildAgentExtension
+public class HeaderIncludeExtension
+    extends BuildAgentExtentionSupport
 {
     /**
      * @plexus.configuration
      */
     private String pattern;
 
-    public void preProcess(Map build) {
-    }
+    public void postProcess(final Map build, final Map results) {
+        assert build != null;
+        assert results != null;
 
-    public void postProcess(Map build, Map results) {
-        getLogger().debug("Pattern '"+pattern+"'");
+        log.debug("Pattern '" + pattern + "'");
 
         Iterator keys = build.keySet().iterator();
-
         while (keys.hasNext()) {
-
             String key = (String) keys.next();
 
             if (key.matches(pattern)){
-                getLogger().debug("Match '"+key+"'");
+                log.debug("Match '" + key + "'");
                 include(key, build, results);
-            } else {
-                getLogger().debug("No Match '"+key+"'");
+            }
+            else {
+                log.debug("No Match '" + key + "'");
             }
         }
     }
 
-    private void include(String header, Map build, Map results) {
-        Object value = build.get(header);
+    private void include(final String header, final Map build, final Map results) {
+        assert header != null;
+        assert build != null;
+        assert results != null;
 
+        Object value = build.get(header);
         String text = toText(value);
 
-        getLogger().debug("adding "+header + " = " + text);
+        log.debug("Adding " + header + " = " + text);
 
         Object old = results.put(header, value);
-
         if (old != null){
-
-            getLogger().warn("replaced "+header + " = " + toText(old));
-
+            log.warn("Replaced " + header + " = " + toText(old));
         }
     }
 
-    private String toText(Object value) {
+    private String toText(final Object value) {
+        assert value != null;
+
         String text = value.toString();
 
         int LIMIT = 50;
         if (text != null && text.length() > LIMIT) {
             text  = text.substring(0, LIMIT - 3) + "...";
         }
+        
         return text;
     }
 }

Modified: geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/KillProcessesExtension.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/KillProcessesExtension.java?view=diff&rev=464142&r1=464141&r2=464142
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/KillProcessesExtension.java (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/KillProcessesExtension.java Sun Oct 15 00:06:27 2006
@@ -24,18 +24,23 @@
 import java.util.List;
 import java.util.Map;
 
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.cli.CommandLineException;
 import org.codehaus.plexus.util.cli.CommandLineUtils;
+import org.codehaus.plexus.util.cli.CommandLineUtils.StringStreamConsumer;
 import org.codehaus.plexus.util.cli.Commandline;
 
-import org.apache.geronimo.gbuild.agent.BuildActivityNotifier;
-import org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension;
+import org.apache.commons.lang.SystemUtils;
+
+import org.apache.geronimo.gbuild.agent.activity.BuildActivityNotifier;
+import org.apache.geronimo.gbuild.agent.extension.BuildAgentExtentionSupport;
 
 /**
+ * ???
+ *
  * @version $Rev$ $Date$
  */
-public class KillProcessesExtension extends AbstractLogEnabled implements BuildAgentExtension
+public class KillProcessesExtension
+    extends BuildAgentExtentionSupport
 {
     /**
      * @plexus.requirement
@@ -44,23 +49,21 @@
 
     private String regex;
 
-    public void preProcess(Map build) {
-    }
-
-    public void postProcess(Map build, Map results) {
-        boolean isWindows = System.getProperty("os.name").startsWith("Windows");
+    public void postProcess(final Map build, final Map results) {
+        assert build != null;
+        assert results != null;
 
-        if (isWindows){
+        if (SystemUtils.IS_OS_WINDOWS) {
+            log.warn("Can not kill processes on Windows");
             return;
         }
-        
-        String[] ids = null;
 
         List pids = null;
         try {
             pids = findProcessIds(regex);
-        } catch (Exception e) {
-            getLogger().warn("Failed to get a list of running processes. ", e);
+        }
+        catch (Exception e) {
+            log.warn("Failed to get a list of running processes", e);
             return;
         }
 
@@ -72,57 +75,93 @@
 
         processes = processes.replaceAll(", $","");
 
-        if (pids.size() > 0){
-
-            String message = "Found " + pids.size()+ " processes matching \""+regex+"\" (" + processes + ").";
+        if (pids.size() > 0) {
+            String message = "Found " + pids.size() + " processes matching \"" + regex + "\" (" + processes + ")";
 
             results.put("header.hung-processes", processes);
-            getLogger().info(message);
+            log.info(message);
             notifier.sendNotification(build, message);
 
             try {
                 killProcesses(pids);
-            } catch (Exception e) {
-                getLogger().error("Unable to kill "+pids.size()+" processes matching \""+regex+"\" (" + processes + ").", e);
             }
-
-        } else {
-            getLogger().debug("No processes found matching \""+regex+"\".");
+            catch (Exception e) {
+                log.error("Unable to kill " + pids.size() + " processes matching \"" + regex + "\" (" + processes + ")", e);
+            }
+        }
+        else {
+            log.debug("No processes found matching: " + regex);
         }
     }
 
-    public static void killProcesses(List pids) throws Exception {
-        ExecResult res = exec("kill", (String[]) pids.toArray(new String[]{}));
+    public static void killProcesses(final List pids) throws Exception {
+        assert pids != null;
+
+        ExecResult res = exec("kill", (String[]) pids.toArray(new String[0]));
+
         if (res.exitCode != 0){
-            throw new IllegalStateException("Command returned error exit code " + res.exitCode + ".");
+            throw new IllegalStateException("Command returned error exit code: " + res.exitCode);
         }
     }
 
-    public static List findProcessIds(String regex) throws Exception {
-        ExecResult res = exec("sh", new String[]{"-c","\"ps ax\""});
+    public static List findProcessIds(final String regex) throws Exception {
+        assert regex != null;
+
+        ExecResult res = exec("sh", new String[]{ "-c","\"ps ax\"" });
+
         if (res.exitCode != 0){
-            throw new IllegalStateException("Command returned error exit code " + res.exitCode + ".");
+            throw new IllegalStateException("Command returned error exit code: " + res.exitCode);
         }
+
         String stdout = res.getStdout();
         String[] lines = stdout.split("[\n\r]");
         List list = new ArrayList();
+
         for (int i = 0; i < lines.length; i++) {
             String line = lines[i];
+
             if (line.matches(regex)){
                 line = line.replaceFirst(" *","");
                 String pid = line.split(" +")[0];
                 list.add(pid);
             }
         }
+
         return list;
     }
 
-    public static class ExecResult {
+    public static ExecResult exec(final String cmd, final String[] arguments) throws CommandLineException {
+        assert cmd != null;
+        assert arguments != null;
+        
+        Commandline commandline = new Commandline();
+        commandline.setExecutable(cmd);
+        commandline.setWorkingDirectory(new File(".").getAbsolutePath());
+
+        for (int i = 0; i < arguments.length; i++) {
+            commandline.createArgument().setLine(arguments[i]);
+        }
+
+        StringStreamConsumer stderr = new StringStreamConsumer();
+        StringStreamConsumer stdout = new StringStreamConsumer();
+
+        int exitCode = CommandLineUtils.executeCommandLine(commandline, stdout, stderr);
+
+        return new ExecResult(exitCode, stdout.getOutput(), stderr.getOutput());
+    }
+
+    /**
+     * ???
+     */
+    public static class ExecResult
+    {
         private final int exitCode;
+
         private final String stdout;
+
         private final String stderr;
 
-        public ExecResult(int exitCode, String stdout, String stderr) {
+        public ExecResult(final int exitCode, final String stdout, final String stderr) {
             this.exitCode = exitCode;
             this.stdout = stdout;
             this.stderr = stderr;
@@ -140,20 +179,4 @@
             return stderr;
         }
     }
-
-    public static ExecResult exec(String cmd, String[] arguments) throws CommandLineException {
-        Commandline commandline = new Commandline();
-        commandline.setExecutable(cmd);
-        commandline.setWorkingDirectory(new File(".").getAbsolutePath());
-
-        for (int i = 0; i < arguments.length; i++) {
-            commandline.createArgument().setLine(arguments[i]);
-        }
-
-        CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
-        CommandLineUtils.StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer();
-        int exitCode = CommandLineUtils.executeCommandLine(commandline, stdout, stderr);
-        return new ExecResult(exitCode, stdout.getOutput(), stderr.getOutput());
-    }
-
 }

Modified: geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/LogFailedBuildsExtension.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/LogFailedBuildsExtension.java?view=diff&rev=464142&r1=464141&r2=464142
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/LogFailedBuildsExtension.java (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/LogFailedBuildsExtension.java Sun Oct 15 00:06:27 2006
@@ -26,76 +26,79 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.StartingException;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.StoppingException;
 import org.codehaus.plexus.util.FileUtils;
 
-import org.apache.maven.continuum.core.action.AbstractContinuumAction;
 import org.apache.maven.continuum.model.project.BuildResult;
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.store.ContinuumStore;
 
-import org.apache.geronimo.gbuild.agent.AbstractContinuumAgentAction;
-import org.apache.geronimo.gbuild.agent.extension.BuildResultsExtension;
+import org.apache.geronimo.gbuild.agent.continuum.Context;
+import org.apache.geronimo.gbuild.agent.extension.BuildResultsExtensionSupport;
 import org.apache.geronimo.gbuild.agent.util.GZipUtils;
 import org.apache.geronimo.gbuild.agent.util.StringTemplate;
 
 /**
+ * ???
+ *
  * @version $Rev$ $Date$
  */
-public class LogFailedBuildsExtension extends AbstractLogEnabled implements BuildResultsExtension, Startable {
-
+public class LogFailedBuildsExtension
+    extends BuildResultsExtensionSupport
+    implements Startable
+{
     /**
      * @plexus.configuration
      */
     private String fileNameTemplate;
+
     private StringTemplate template;
 
     /**
      * @plexus.configuration
      */
-    private String resultsDirectory;
-    private File directory;
+    private File resultsDirectory;
 
     /**
      * @plexus.configuration
      */
     private String dateFormat;
+
     private SimpleDateFormat dateFormatter;
 
     private StringTemplate header = new StringTemplate("#   Date: {date}\n#   Project: {project.name}-{project.version}\n#   OS: {os.name} - {os.version}\n#   Java: {java.version} - {java.vendor}\n#   Host: {host-name} {host-address}\n#   Contributor: {contributor} {admin-address}\n");
 
     public void start() throws StartingException {
         template = new StringTemplate(fileNameTemplate);
-        directory = new File(resultsDirectory);
-        directory.mkdirs();
 
-        if (!directory.exists()) {
-            throw new IllegalStateException("File specified does not exist. " + directory.getAbsolutePath());
+        try {
+            FileUtils.forceMkdir(resultsDirectory);
         }
-
-        if (!directory.isDirectory()) {
-            throw new IllegalStateException("File specified is not a directory. " + directory.getAbsolutePath());
+        catch (IOException e) {
+            throw new StartingException("Failed to create directory: " + resultsDirectory, e);
         }
 
-        if (!directory.canWrite()) {
-            throw new IllegalStateException("Directory specified is not writable. " + directory.getAbsolutePath());
+        if (!resultsDirectory.canWrite()) {
+            throw new IllegalStateException("Directory specified is not writable: " + resultsDirectory);
         }
 
-        getLogger().info("Include files will be written to " + directory.getAbsolutePath());
+        log.info("Include files will be written to: " + resultsDirectory);
+
         dateFormatter = new SimpleDateFormat(dateFormat);
     }
 
     public void stop() throws StoppingException {
+        // empty
     }
 
-    public void execute(Map context) throws Exception {
+    public void execute(final Map context) throws Exception {
+        assert context != null;
 
-        ContinuumStore store = AbstractContinuumAgentAction.getContinuumStore(context);
+        ContinuumStore store = Context.getContinuumStore(context);
 
-        int projectId = AbstractContinuumAction.getProjectId(context);
+        int projectId = Context.getProjectId(context);
 
         Project project = store.getProject(projectId);
 
@@ -103,46 +106,32 @@
 
         int exitCode = buildResult.getExitCode();
 
-        getLogger().debug(context.get("build.name") + " " + context.get("build.id") + " - exit code (" + exitCode + ")");
+        log.debug(context.get("build.name") + " " + context.get("build.id") + " - exit code (" + exitCode + ")");
 
         if (exitCode == 0) {
             return;
         }
 
         byte[] bytes = (byte[]) context.get("build.output-file.gz");
-
         if (bytes == null) {
-
-            getLogger().debug("No build output to write.");
+            log.debug("No build output to write.");
 
             return;
         }
 
-
         Map map = new HashMap();
-
         map.putAll(context);
-
         map.put("date", dateFormatter.format(new Date()));
 
         String fileName = template.apply(map);
 
-        File file = new File(directory, fileName);
-
+        File file = new File(resultsDirectory, fileName);
         File parent = file.getParentFile();
+        FileUtils.forceMkdir(parent);
 
-        parent.mkdirs();
-
-        try {
-
-            FileUtils.fileWrite(file.getAbsolutePath(), header.apply(map));
-
-            GZipUtils.fileAppend(file, bytes);
-
-        } catch (IOException e) {
-            getLogger().error("Could not write to file " + file.getAbsolutePath(), e);
-        }
+        FileUtils.fileWrite(file.getAbsolutePath(), header.apply(map));
+        GZipUtils.fileAppend(file, bytes);
 
-        getLogger().info("Wrote build ouput (" + file.length() + " bytes) to " + file.getAbsolutePath());
+        log.info("Wrote build ouput (" + file.length() + " bytes) to: " + file);
     }
 }

Modified: geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/ReportActivityExtension.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/ReportActivityExtension.java?view=diff&rev=464142&r1=464141&r2=464142
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/ReportActivityExtension.java (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/ReportActivityExtension.java Sun Oct 15 00:06:27 2006
@@ -21,21 +21,22 @@
 
 import java.util.Map;
 
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-
 import org.apache.maven.continuum.core.action.AbstractContinuumAction;
 import org.apache.maven.continuum.model.project.BuildResult;
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 
-import org.apache.geronimo.gbuild.agent.BuildActivityNotifier;
-import org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension;
+import org.apache.geronimo.gbuild.agent.activity.BuildActivityNotifier;
+import org.apache.geronimo.gbuild.agent.extension.BuildAgentExtentionSupport;
 
 /**
+ * Reports build activity to be consumed by the activity monitor.
+ *
  * @version $Rev$ $Date$
  */
-public class ReportActivityExtension extends AbstractLogEnabled implements BuildAgentExtension
+public class ReportActivityExtension
+    extends BuildAgentExtentionSupport
 {
     /**
      * @plexus.requirement
@@ -47,21 +48,29 @@
      */
     private BuildActivityNotifier notifier;
 
-    public void preProcess(Map build) {
+    public void preProcess(final Map build) {
+        assert build != null;
+
         notifier.sendNotification(build, "Started");
     }
 
-    public void postProcess(Map build, Map results) {
+    public void postProcess(final Map build, final Map results) {
+        assert build != null;
+        assert results != null;
 
         int projectId = AbstractContinuumAction.getProjectId(build);
 
         BuildResult buildResult = null;
         try {
             Project project = store.getProject(projectId);
-
             buildResult = store.getBuildResult(project.getLatestBuildId());
-        } catch (ContinuumStoreException e) {
-            getLogger().error("Unable to read data from ContinuumStore.", e);
+        }
+        catch (ContinuumStoreException e) {
+            //
+            // FIXME: Throw an exception!
+            //
+
+            log.error("Unable to read data from ContinuumStore.", e);
         }
 
         long minutes = (buildResult.getEndTime() - buildResult.getStartTime()) / 60000;
@@ -70,7 +79,8 @@
 
         if (exitCode == 0) {
             notifier.sendNotification(build, "Completed: " + minutes + " minutes: Successful");
-        } else {
+        }
+        else {
             notifier.sendNotification(build, "Completed: " + minutes + " minutes: Failed (exit " + exitCode + ") ");
         }
     }

Modified: geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/WriteIncludeFileExtension.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/WriteIncludeFileExtension.java?view=diff&rev=464142&r1=464141&r2=464142
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/WriteIncludeFileExtension.java (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/WriteIncludeFileExtension.java Sun Oct 15 00:06:27 2006
@@ -19,27 +19,37 @@
 
 package org.apache.geronimo.gbuild.agent.extension.standard;
 
+import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import org.codehaus.plexus.logging.Logger;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.StartingException;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.StoppingException;
+import org.codehaus.plexus.util.FileUtils;
 
-import org.apache.geronimo.gbuild.agent.AbstractContinuumAgentAction;
-import org.apache.geronimo.gbuild.agent.extension.BuildResultsExtension;
+import org.apache.geronimo.gbuild.agent.extension.BuildAgentExtentionSupport;
 import org.apache.geronimo.gbuild.agent.util.StringTemplate;
 
 /**
+ * ???
+ *
  * @version $Rev$ $Date$
  */
-public class WriteIncludeFileExtension extends AbstractContinuumAgentAction implements BuildResultsExtension, Startable {
+public class WriteIncludeFileExtension
+    extends BuildAgentExtentionSupport
+    implements Startable
+{
+    private Logger log;
 
     /**
      * @plexus.configuration
@@ -56,90 +66,102 @@
     /**
      * @plexus.configuration
      */
-    private String resultsDirectory;
+    private File resultsDirectory;
 
     /**
      * @plexus.configuration
      */
     private String dateFormat;
 
-
-    private File directory;
     private SimpleDateFormat dateFormatter;
 
     /**
      * required for plexus
      */
     public WriteIncludeFileExtension() {
+        // empty
     }
 
-    public WriteIncludeFileExtension(String includePattern, String fileNameTemplate, String resultsDirectory, String dateFormat) {
+    public WriteIncludeFileExtension(final String includePattern, final String fileNameTemplate, final File resultsDirectory, final String dateFormat) {
         this.includePattern = includePattern;
         this.fileNameTemplate = fileNameTemplate;
         this.resultsDirectory = resultsDirectory;
         this.dateFormat = dateFormat;
     }
 
+    public void initialize() throws InitializationException {
+        log = getLogger();
+    }
+
     public void start() throws StartingException {
         template = new StringTemplate(fileNameTemplate);
-        directory = new File(resultsDirectory);
-        directory.mkdirs();
 
-        if (!directory.exists()) {
-            throw new IllegalStateException("File specified does not exist. " + directory.getAbsolutePath());
+        try {
+            FileUtils.forceMkdir(resultsDirectory);
         }
-
-        if (!directory.isDirectory()) {
-            throw new IllegalStateException("File specified is not a directory. " + directory.getAbsolutePath());
+        catch (IOException e) {
+            throw new StartingException("Unable to create directory: " + resultsDirectory, e);
         }
 
-        if (!directory.canWrite()) {
-            throw new IllegalStateException("Directory specified is not writable. " + directory.getAbsolutePath());
+        if (!resultsDirectory.canWrite()) {
+            throw new IllegalStateException("Directory specified is not writable: " + resultsDirectory);
         }
 
-        getLogger().info("Include files will be written to " + directory.getAbsolutePath());
+        log.info("Include files will be written to: " + resultsDirectory);
+
         dateFormatter = new SimpleDateFormat(dateFormat);
     }
 
     public void stop() throws StoppingException {
+        // empty
     }
 
-    public void execute(Map context) throws Exception {
-        getLogger().debug("Pattern " + includePattern);
+    public void execute(final Map context) throws Exception {
+        assert context != null;
+
+        log.debug("Pattern: " + includePattern);
+        
         Map map = new HashMap();
         map.putAll(context);
         map.put("date", dateFormatter.format(new Date()));
 
-        for (Iterator iterator = context.entrySet().iterator(); iterator.hasNext();) {
+        Iterator iterator = context.entrySet().iterator();
+        while (iterator.hasNext()) {
             Map.Entry entry = (Map.Entry) iterator.next();
             String key = (String) entry.getKey();
             Object value = entry.getValue();
 
             if (key.matches(includePattern)) {
                 try {
-                    getLogger().debug("Found include pattern " + key);
+                    log.debug("Found include pattern: " + key);
+
                     String fileName = template.apply(map);
-                    File file = new File(directory, fileName);
+                    File file = new File(resultsDirectory, fileName);
                     File parent = file.getParentFile();
-                    parent.mkdirs();
+                    FileUtils.forceMkdir(parent);
+
                     write(file, (String) value);
-                } catch (Exception e) {
-                    getLogger().warn("Abnormal failure on header " + key, e);
+                }
+                catch (Exception e) {
+                    log.warn("Abnormal failure on header: " + key, e);
                 }
             }
         }
-
     }
 
-    private void write(File file, String content) {
+    private void write(final File file, final String content) throws IOException {
+        assert file != null;
+        assert content != null;
+
+        log.info("Writing " + content.length() + " characters to: " + file);
+
+        OutputStream out = new BufferedOutputStream(new FileOutputStream(file));
         try {
-            getLogger().info("Writing " + content.length() + " characters to " + file.getAbsolutePath());
-            FileOutputStream out = new FileOutputStream(file);
             out.write(content.getBytes());
             out.flush();
+        }
+        finally {
             out.close();
-        } catch (IOException e) {
-            getLogger().error("Could not write to file " + file.getAbsolutePath(), e);
         }
     }
 }

Modified: geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=464142&r1=464141&r2=464142
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/resources/META-INF/plexus/components.xml (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/standard/src/main/resources/META-INF/plexus/components.xml Sun Oct 15 00:06:27 2006
@@ -67,7 +67,7 @@
                     <role>org.apache.maven.continuum.store.ContinuumStore</role>
                 </requirement>
                 <requirement>
-                    <role>org.apache.geronimo.gbuild.agent.BuildActivityNotifier</role>
+                    <role>org.apache.geronimo.gbuild.agent.activity.BuildActivityNotifier</role>
                 </requirement>
             </requirements>
         </component>
@@ -78,7 +78,7 @@
             <implementation>org.apache.geronimo.gbuild.agent.extension.standard.KillProcessesExtension</implementation>
             <requirements>
                 <requirement>
-                    <role>org.apache.geronimo.gbuild.agent.BuildActivityNotifier</role>
+                    <role>org.apache.geronimo.gbuild.agent.activity.BuildActivityNotifier</role>
                 </requirement>
             </requirements>
             <configuration>

Added: geronimo/gbuild/trunk/gbuild-extensions/standard/src/test/java/org/apache/geronimo/gbuild/agent/extension/standard/KillProcessesExtensionTest.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/standard/src/test/java/org/apache/geronimo/gbuild/agent/extension/standard/KillProcessesExtensionTest.java?view=auto&rev=464142
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/standard/src/test/java/org/apache/geronimo/gbuild/agent/extension/standard/KillProcessesExtensionTest.java (added)
+++ geronimo/gbuild/trunk/gbuild-extensions/standard/src/test/java/org/apache/geronimo/gbuild/agent/extension/standard/KillProcessesExtensionTest.java Sun Oct 15 00:06:27 2006
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.gbuild.agent.extension.standard;
+
+import java.util.List;
+
+import junit.framework.TestCase;
+
+/**
+ * Unit tests for the {@link KillProcessesExtension} class.
+ *
+ * @version $Rev$ $Date$
+ */
+public class KillProcessesExtensionTest extends TestCase {
+
+    public void testNothing() throws Exception {
+    }
+
+    public void notReliable_testFindProcessIds() throws Exception {
+        boolean isWindows = System.getProperty("os.name").startsWith("Windows");
+
+        if (isWindows){
+            return;
+        }
+        
+        Runtime runtime = Runtime.getRuntime();
+
+        runtime.exec("sleep 43210");
+        runtime.exec("sleep 43210");
+        runtime.exec("sleep 43210");
+
+        List pids = KillProcessesExtension.findProcessIds(".*sleep 43210.*");
+
+        assertEquals("processes started: pids.size", 3, pids.size());
+        KillProcessesExtension.killProcesses(pids);
+
+        pids = KillProcessesExtension.findProcessIds(".*sleep 43210.*");
+        assertEquals("processes killed: pids.size", 0, pids.size());
+    }
+}
\ No newline at end of file

Propchange: geronimo/gbuild/trunk/gbuild-extensions/standard/src/test/java/org/apache/geronimo/gbuild/agent/extension/standard/KillProcessesExtensionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gbuild/trunk/gbuild-extensions/standard/src/test/java/org/apache/geronimo/gbuild/agent/extension/standard/KillProcessesExtensionTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gbuild/trunk/gbuild-extensions/standard/src/test/java/org/apache/geronimo/gbuild/agent/extension/standard/KillProcessesExtensionTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/gbuild/trunk/gbuild-extensions/standard/src/test/java/org/apache/geronimo/gbuild/agent/extension/standard/TestLogger.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/standard/src/test/java/org/apache/geronimo/gbuild/agent/extension/standard/TestLogger.java?view=auto&rev=464142
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/standard/src/test/java/org/apache/geronimo/gbuild/agent/extension/standard/TestLogger.java (added)
+++ geronimo/gbuild/trunk/gbuild-extensions/standard/src/test/java/org/apache/geronimo/gbuild/agent/extension/standard/TestLogger.java Sun Oct 15 00:06:27 2006
@@ -0,0 +1,117 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.gbuild.agent.extension.standard;
+
+import org.codehaus.plexus.logging.Logger;
+
+/**
+ * ???
+ *
+ * @version $Rev$ $Date$
+ */
+public class TestLogger implements Logger {
+
+    private final String name;
+
+    public TestLogger(String name) {
+        this.name = name;
+    }
+
+    public TestLogger() {
+        this.name = hashCode()+"";
+    }
+
+    public void debug(String string) {
+        System.out.println("[debug] " + name +" - " + string);
+    }
+
+    public void debug(String string, Throwable throwable) {
+        System.out.println("[debug] " + name +" - " + string);
+        throwable.printStackTrace();
+    }
+
+    public boolean isDebugEnabled() {
+        return false;
+    }
+
+    public void info(String string) {
+        System.out.println("[info] " + name +" - " + string);
+    }
+
+    public void info(String string, Throwable throwable) {
+        System.out.println("[info] " + name +" - " + string);
+        throwable.printStackTrace();
+    }
+
+    public boolean isInfoEnabled() {
+        return false;
+    }
+
+    public void warn(String string) {
+        System.out.println("[warn] " + name +" - " + string);
+    }
+
+    public void warn(String string, Throwable throwable) {
+        System.out.println("[warn] " + name +" - " + string);
+        throwable.printStackTrace();
+    }
+
+    public boolean isWarnEnabled() {
+        return false;
+    }
+
+    public void error(String string) {
+        System.out.println("[error] " + name +" - " + string);
+    }
+
+    public void error(String string, Throwable throwable) {
+        System.out.println("[error] " + name +" - " + string);
+        throwable.printStackTrace();
+    }
+
+    public boolean isErrorEnabled() {
+        return false;
+    }
+
+    public void fatalError(String string) {
+        System.out.println("[fatalError] " + name +" - " + string);
+    }
+
+    public void fatalError(String string, Throwable throwable) {
+        System.out.println("[fatalError] " + name +" - " + string);
+        throwable.printStackTrace();
+    }
+
+    public boolean isFatalErrorEnabled() {
+        return false;
+    }
+
+    public Logger getChildLogger(String string) {
+        return null;
+    }
+
+    public int getThreshold() {
+        return 0;
+    }
+
+    public String getName() {
+        return null;
+    }
+}

Propchange: geronimo/gbuild/trunk/gbuild-extensions/standard/src/test/java/org/apache/geronimo/gbuild/agent/extension/standard/TestLogger.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gbuild/trunk/gbuild-extensions/standard/src/test/java/org/apache/geronimo/gbuild/agent/extension/standard/TestLogger.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gbuild/trunk/gbuild-extensions/standard/src/test/java/org/apache/geronimo/gbuild/agent/extension/standard/TestLogger.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/gbuild/trunk/gbuild-extensions/standard/src/test/java/org/apache/geronimo/gbuild/agent/extension/standard/WriteIncludeFileExtensionTest.java (from r463602, geronimo/gbuild/trunk/gbuild-agent/src/test/java/org/apache/geronimo/gbuild/agent/WriteIncludeFileExtentionTest.java)
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/standard/src/test/java/org/apache/geronimo/gbuild/agent/extension/standard/WriteIncludeFileExtensionTest.java?view=diff&rev=464142&p1=geronimo/gbuild/trunk/gbuild-agent/src/test/java/org/apache/geronimo/gbuild/agent/WriteIncludeFileExtentionTest.java&r1=463602&p2=geronimo/gbuild/trunk/gbuild-extensions/standard/src/test/java/org/apache/geronimo/gbuild/agent/extension/standard/WriteIncludeFileExtensionTest.java&r2=464142
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent/src/test/java/org/apache/geronimo/gbuild/agent/WriteIncludeFileExtentionTest.java (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/standard/src/test/java/org/apache/geronimo/gbuild/agent/extension/standard/WriteIncludeFileExtensionTest.java Sun Oct 15 00:06:27 2006
@@ -1,22 +1,42 @@
-package org.apache.geronimo.gbuild.agent;
-/**
- * @version $Rev$ $Date$
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
-import junit.framework.TestCase;
+package org.apache.geronimo.gbuild.agent.extension.standard;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.util.HashMap;
 import java.util.Properties;
 
-import org.apache.geronimo.gbuild.agent.extension.standard.WriteIncludeFileExtension;
+import junit.framework.TestCase;
 
-public class WriteIncludeFileExtentionTest extends TestCase {
+/**
+ * Unit tests for the {@link WriteIncludeFileExtension} class.
+ *
+ * @version $Rev$ $Date$
+ */
+public class WriteIncludeFileExtensionTest extends TestCase {
 
     public void testExecute() throws Exception {
-        WriteIncludeFileExtension extention = new WriteIncludeFileExtension("^include.*", "{foo}/{name}.properties", "target", "yyyy");
+        WriteIncludeFileExtension extention = new WriteIncludeFileExtension("^include.*", "{foo}/{name}.properties", new File("target"), "yyyy");
         extention.enableLogging(new TestLogger("include-writer"));
+        extention.initialize();
         extention.start();
 
         HashMap map = new HashMap();

Propchange: geronimo/gbuild/trunk/gbuild-extensions/standard/src/test/java/org/apache/geronimo/gbuild/agent/extension/standard/WriteIncludeFileExtensionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gbuild/trunk/gbuild-extensions/standard/src/test/java/org/apache/geronimo/gbuild/agent/extension/standard/WriteIncludeFileExtensionTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gbuild/trunk/gbuild-extensions/standard/src/test/java/org/apache/geronimo/gbuild/agent/extension/standard/WriteIncludeFileExtensionTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/gbuild/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/pom.xml?view=diff&rev=464142&r1=464141&r2=464142
==============================================================================
--- geronimo/gbuild/trunk/pom.xml (original)
+++ geronimo/gbuild/trunk/pom.xml Sun Oct 15 00:06:27 2006
@@ -82,28 +82,52 @@
     
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.2.8</version>
-            </dependency>
-            
+            <!--
             <dependency>
                 <groupId>concurrent</groupId>
                 <artifactId>concurrent</artifactId>
                 <version>1.3.4</version>
             </dependency>
+            -->
             
             <dependency>
                 <groupId>org.apache.maven.continuum</groupId>
                 <artifactId>continuum-api</artifactId>
-                <version>1.0.2</version>
+                <version>1.0.3</version>
             </dependency>
             
             <dependency>
                 <groupId>org.apache.maven.continuum</groupId>
                 <artifactId>continuum-core</artifactId>
-                <version>1.0.2</version>
+                <version>1.0.3</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.resource</groupId>
+                        <artifactId>connector</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.sql</groupId>
+                        <artifactId>jdbc-stdext</artifactId>
+                    </exclusion>
+
+                    <!--
+                    NOTE: Exclude the default store, which is JDO-based
+                    -->
+                    <exclusion>
+                        <groupId>org.apache.maven.continuum</groupId>
+                        <artifactId>continuum-store</artifactId>
+                    </exclusion>
+
+                    <!--
+                    NOTE: Excluded to prevent JDO components from loading.
+                    -->
+                    <exclusion>
+                        <groupId>org.codehaus.plexus</groupId>
+                        <artifactId>plexus-jdo2</artifactId>
+                    </exclusion>
+                </exclusions>
+
+                <!--
                 <exclusions>
                     <exclusion>
                         <groupId>javax.transaction</groupId>
@@ -118,14 +142,16 @@
                         <artifactId>plexus-jdo2</artifactId>
                     </exclusion>
                 </exclusions>
+                -->
             </dependency>
             
             <dependency>
                 <groupId>org.apache.maven.continuum</groupId>
                 <artifactId>continuum-model</artifactId>
-                <version>1.0.2</version>
+                <version>1.0.3</version>
             </dependency>
-            
+
+            <!--
             <dependency>
                 <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-command-line</artifactId>
@@ -137,7 +163,8 @@
                 <artifactId>maven-scm-provider-cvs</artifactId>
                 <version>1.0-beta-2</version>
             </dependency>
-            
+            -->
+
             <dependency>
                 <groupId>org.apache.activemq</groupId>
                 <artifactId>activeio-core</artifactId>
@@ -173,6 +200,12 @@
                 <artifactId>log4j</artifactId>
                 <version>1.2.13</version>
             </dependency>
+
+            <dependency>
+                <groupId>commons-lang</groupId>
+                <artifactId>commons-lang</artifactId>
+                <version>2.2</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     
@@ -276,7 +309,10 @@
             
             <modules>
                 <module>gbuild-agent</module>
+                <!--
+                NOTE: This module is not very functional... so disable it for now
                 <module>gbuild-agent-web</module>
+                -->
                 <module>gbuild-extensions</module>
                 <!--
                 NOTE: Most of this module has been relocated to the j2eetck-maven-plugin



Mime
View raw message