geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r469004 - in /geronimo/gbuild/trunk: gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/continuum/ gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/producer/ gbuild-extensions/gbuild-standard-extensions/src/main/java/org...
Date Sun, 29 Oct 2006 21:25:52 GMT
Author: jdillon
Date: Sun Oct 29 13:25:51 2006
New Revision: 469004

URL: http://svn.apache.org/viewvc?view=rev&rev=469004
Log:
Canonicalize files

Modified:
    geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/continuum/ContinuumBuildAgent.java
    geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/producer/BuildQueueReloader.java
    geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/producer/PropertiesBuildTaskProducer.java
    geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/LogFailedBuildsExtension.java
    geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/WriteIncludeFileExtension.java

Modified: geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/continuum/ContinuumBuildAgent.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/continuum/ContinuumBuildAgent.java?view=diff&rev=469004&r1=469003&r2=469004
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/continuum/ContinuumBuildAgent.java
(original)
+++ geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/continuum/ContinuumBuildAgent.java
Sun Oct 29 13:25:51 2006
@@ -20,6 +20,7 @@
 package org.apache.geronimo.gbuild.agent.continuum;
 
 import java.io.File;
+import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.HashMap;
@@ -258,6 +259,20 @@
     }
 
     public void init() throws ConfigurationLoadingException {
+        try {
+            workingDirectory = workingDirectory.getCanonicalFile();
+        }
+        catch (IOException e) {
+            throw new ConfigurationLoadingException(e);
+        }
+
+        try {
+            buildOutputDirectory = buildOutputDirectory.getCanonicalFile();
+        }
+        catch (IOException e) {
+            throw new ConfigurationLoadingException(e);
+        }
+
         configurationService.load();
         configurationService.setWorkingDirectory(workingDirectory);
         configurationService.setBuildOutputDirectory(buildOutputDirectory);

Modified: geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/producer/BuildQueueReloader.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/producer/BuildQueueReloader.java?view=diff&rev=469004&r1=469003&r2=469004
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/producer/BuildQueueReloader.java
(original)
+++ geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/producer/BuildQueueReloader.java
Sun Oct 29 13:25:51 2006
@@ -20,6 +20,7 @@
 package org.apache.geronimo.gbuild.agent.producer;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Enumeration;
 import javax.jms.JMSException;
 import javax.jms.Queue;
@@ -83,6 +84,13 @@
     }
 
     public void start() throws StartingException {
+        try {
+            tasksDirectory = tasksDirectory.getCanonicalFile();
+        }
+        catch (IOException e) {
+            throw new StartingException(e.getMessage(), e);
+        }
+
         setRunning(true);
         Thread thread = new Thread(this);
         thread.setDaemon(true);

Modified: geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/producer/PropertiesBuildTaskProducer.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/producer/PropertiesBuildTaskProducer.java?view=diff&rev=469004&r1=469003&r2=469004
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/producer/PropertiesBuildTaskProducer.java
(original)
+++ geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/producer/PropertiesBuildTaskProducer.java
Sun Oct 29 13:25:51 2006
@@ -88,6 +88,13 @@
         log.debug("buildTaskQueue " + buildTaskQueue);
 
         try {
+            watchDirectory = watchDirectory.getCanonicalFile();
+        }
+        catch (IOException e) {
+            throw new StartingException(e.getMessage(), e);
+        }
+
+        try {
             FileUtils.forceMkdir(watchDirectory);
         }
         catch (IOException e) {
@@ -110,7 +117,7 @@
 
         scanner = new DirectoryMonitor(watchDirectory, listener, pollInterval, getLogger());
 
-        log.info("Watching:" + watchDirectory);
+        log.info("Watching: " + watchDirectory);
 
         super.start();
     }

Modified: geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/LogFailedBuildsExtension.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/LogFailedBuildsExtension.java?view=diff&rev=469004&r1=469003&r2=469004
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/LogFailedBuildsExtension.java
(original)
+++ geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/LogFailedBuildsExtension.java
Sun Oct 29 13:25:51 2006
@@ -74,6 +74,13 @@
         template = new StringTemplate(fileNameTemplate);
 
         try {
+            resultsDirectory = resultsDirectory.getCanonicalFile();
+        }
+        catch (IOException e) {
+            throw new StartingException(e.getMessage(), e);
+        }
+
+        try {
             FileUtils.forceMkdir(resultsDirectory);
         }
         catch (IOException e) {

Modified: geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/WriteIncludeFileExtension.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/WriteIncludeFileExtension.java?view=diff&rev=469004&r1=469003&r2=469004
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/WriteIncludeFileExtension.java
(original)
+++ geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/WriteIncludeFileExtension.java
Sun Oct 29 13:25:51 2006
@@ -103,6 +103,13 @@
         template = new StringTemplate(fileNameTemplate);
 
         try {
+            resultsDirectory = resultsDirectory.getCanonicalFile();
+        }
+        catch (IOException e) {
+            throw new StartingException(e.getMessage(), e);
+        }
+        
+        try {
             FileUtils.forceMkdir(resultsDirectory);
         }
         catch (IOException e) {



Mime
View raw message