You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ct...@apache.org on 2008/12/17 04:09:26 UTC
svn commit: r727253 [2/3] - in
/continuum/branches/continuum-distributed-builds: ./
continuum-api/src/main/java/org/apache/continuum/builder/distributed/manager/
continuum-builder/
continuum-builder/src/main/java/org/apache/continuum/builder/distribute...
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 16 19:09:22 2008
@@ -0,0 +1,2 @@
+/continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ContinuumConfiguration.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
+/continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ContinuumConfiguration.java:713270-724659
Copied: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationException.java (from r726995, continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ContinuumConfigurationException.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationException.java?p2=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationException.java&p1=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ContinuumConfigurationException.java&r1=726995&r2=727253&rev=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ContinuumConfigurationException.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationException.java Tue Dec 16 19:09:22 2008
@@ -1,19 +1,19 @@
package org.apache.continuum.buildagent.configuration;
-public class ContinuumConfigurationException
+public class BuildAgentConfigurationException
extends Exception
{
- public ContinuumConfigurationException( String message )
+ public BuildAgentConfigurationException( String message )
{
super( message );
}
- public ContinuumConfigurationException( Throwable cause )
+ public BuildAgentConfigurationException( Throwable cause )
{
super( cause );
}
- public ContinuumConfigurationException( String message, Throwable cause )
+ public BuildAgentConfigurationException( String message, Throwable cause )
{
super( message, cause );
}
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 16 19:09:22 2008
@@ -0,0 +1,2 @@
+/continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ContinuumConfigurationException.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
+/continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ContinuumConfigurationException.java:713270-724659
Copied: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationService.java (from r726995, continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ConfigurationService.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationService.java?p2=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationService.java&p1=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ConfigurationService.java&r1=726995&r2=727253&rev=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ConfigurationService.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationService.java Tue Dec 16 19:09:22 2008
@@ -5,9 +5,9 @@
import org.apache.continuum.buildagent.model.Installation;
-public interface ConfigurationService
+public interface BuildAgentConfigurationService
{
- String ROLE = ConfigurationService.class.getName();
+ String ROLE = BuildAgentConfigurationService.class.getName();
File getBuildOutputDirectory();
@@ -20,10 +20,10 @@
String getContinuumServerUrl();
String getBuildOutput( int projectId )
- throws ContinuumConfigurationException;
+ throws BuildAgentConfigurationException;
File getBuildOutputFile( int projectId )
- throws ContinuumConfigurationException;
+ throws BuildAgentConfigurationException;
List<Installation> getAvailableInstallations();
}
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationService.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 16 19:09:22 2008
@@ -0,0 +1,2 @@
+/continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ConfigurationService.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
+/continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ConfigurationService.java:713270-724659
Copied: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java (from r726995, continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultContinuumConfiguration.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java?p2=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java&p1=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultContinuumConfiguration.java&r1=726995&r2=727253&rev=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultContinuumConfiguration.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java Tue Dec 16 19:09:22 2008
@@ -14,14 +14,14 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class DefaultContinuumConfiguration
- implements ContinuumConfiguration
+public class DefaultBuildAgentConfiguration
+ implements BuildAgentConfiguration
{
private Logger log = LoggerFactory.getLogger( getClass() );
private File configurationFile;
- private ContinuumBuildAgentConfiguration buildAgentConfiguration;
+ private GeneralBuildAgentConfiguration buildAgentConfiguration;
protected void initialize()
{
@@ -35,7 +35,7 @@
{
reload( configurationFile );
}
- catch ( ContinuumConfigurationException e )
+ catch ( BuildAgentConfigurationException e )
{
// skip this and only log a warn
log.warn( " error on loading configuration from file " + configurationFile.getPath() );
@@ -44,24 +44,24 @@
else
{
log.info( "build agent configuration file does not exists" );
- this.buildAgentConfiguration = new ContinuumBuildAgentConfiguration();
+ this.buildAgentConfiguration = new GeneralBuildAgentConfiguration();
}
}
- public ContinuumBuildAgentConfiguration getContinuumBuildAgentConfiguration()
- throws ContinuumConfigurationException
+ public GeneralBuildAgentConfiguration getContinuumBuildAgentConfiguration()
+ throws BuildAgentConfigurationException
{
return buildAgentConfiguration;
}
public void reload()
- throws ContinuumConfigurationException
+ throws BuildAgentConfigurationException
{
this.initialize();
}
public void reload( File file )
- throws ContinuumConfigurationException
+ throws BuildAgentConfigurationException
{
try
{
@@ -70,7 +70,7 @@
ContinuumBuildAgentConfigurationModel configuration = configurationXpp3Reader
.read( new InputStreamReader( new FileInputStream( file ) ) );
- this.buildAgentConfiguration = new ContinuumBuildAgentConfiguration();
+ this.buildAgentConfiguration = new GeneralBuildAgentConfiguration();
if ( StringUtils.isNotEmpty( configuration.getBuildOutputDirectory() ) )
{
this.buildAgentConfiguration.setBuildOutputDirectory( new File( configuration.getBuildOutputDirectory() ) );
@@ -85,17 +85,17 @@
catch ( IOException e )
{
log.error( e.getMessage(), e );
- throw new ContinuumConfigurationException( e.getMessage(), e );
+ throw new BuildAgentConfigurationException( e.getMessage(), e );
}
catch ( XmlPullParserException e )
{
log.error( e.getMessage(), e );
- throw new ContinuumConfigurationException( e.getMessage(), e );
+ throw new BuildAgentConfigurationException( e.getMessage(), e );
}
}
public void save()
- throws ContinuumConfigurationException
+ throws BuildAgentConfigurationException
{
if ( !configurationFile.exists() )
{
@@ -105,7 +105,7 @@
}
public void save( File file )
- throws ContinuumConfigurationException
+ throws BuildAgentConfigurationException
{
try
{
@@ -128,12 +128,12 @@
catch ( IOException e )
{
log.error( e.getMessage(), e );
- throw new ContinuumConfigurationException( e.getMessage(), e );
+ throw new BuildAgentConfigurationException( e.getMessage(), e );
}
}
- public void setContinuumBuildAgentConfiguration( ContinuumBuildAgentConfiguration buildAgentConfiguration )
- throws ContinuumConfigurationException
+ public void setContinuumBuildAgentConfiguration( GeneralBuildAgentConfiguration buildAgentConfiguration )
+ throws BuildAgentConfigurationException
{
this.buildAgentConfiguration = buildAgentConfiguration;
}
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 16 19:09:22 2008
@@ -0,0 +1,2 @@
+/continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultContinuumConfiguration.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
+/continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultContinuumConfiguration.java:713270-724659
Copied: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java (from r726995, continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultConfigurationService.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java?p2=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java&p1=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultConfigurationService.java&r1=726995&r2=727253&rev=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultConfigurationService.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java Tue Dec 16 19:09:22 2008
@@ -9,30 +9,30 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class DefaultConfigurationService
- implements ConfigurationService
+public class DefaultBuildAgentConfigurationService
+ implements BuildAgentConfigurationService
{
private Logger log = LoggerFactory.getLogger( this.getClass() );
/**
* @plexus.requirement
*/
- private ContinuumConfiguration configuration;
+ private BuildAgentConfiguration configuration;
- private ContinuumBuildAgentConfiguration buildAgentConfiguration;
+ private GeneralBuildAgentConfiguration buildAgentConfiguration;
public void initialize()
- throws ContinuumConfigurationException
+ throws BuildAgentConfigurationException
{
loadData();
}
- public ContinuumConfiguration getConfiguration()
+ public BuildAgentConfiguration getConfiguration()
{
return configuration;
}
- public void setConfiguration( ContinuumConfiguration configuration )
+ public void setConfiguration( BuildAgentConfiguration configuration )
{
this.configuration = configuration;
}
@@ -68,7 +68,7 @@
}
public String getBuildOutput( int projectId )
- throws ContinuumConfigurationException
+ throws BuildAgentConfigurationException
{
File file = getBuildOutputFile( projectId );
@@ -92,13 +92,13 @@
}
public File getBuildOutputFile( int projectId )
- throws ContinuumConfigurationException
+ throws BuildAgentConfigurationException
{
File dir = getBuildOutputDirectory( projectId );
if ( !dir.exists() && !dir.mkdirs() )
{
- throw new ContinuumConfigurationException(
+ throw new BuildAgentConfigurationException(
"Could not make the build output directory: " + "'" + dir.getAbsolutePath() + "'." );
}
@@ -116,7 +116,7 @@
}
private void loadData()
- throws ContinuumConfigurationException
+ throws BuildAgentConfigurationException
{
buildAgentConfiguration = configuration.getContinuumBuildAgentConfiguration();
}
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 16 19:09:22 2008
@@ -0,0 +1,2 @@
+/continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultConfigurationService.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
+/continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultConfigurationService.java:713270-724659
Copied: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/GeneralBuildAgentConfiguration.java (from r726995, continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ContinuumBuildAgentConfiguration.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/GeneralBuildAgentConfiguration.java?p2=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/GeneralBuildAgentConfiguration.java&p1=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ContinuumBuildAgentConfiguration.java&r1=726995&r2=727253&rev=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ContinuumBuildAgentConfiguration.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/GeneralBuildAgentConfiguration.java Tue Dec 16 19:09:22 2008
@@ -5,7 +5,7 @@
import org.apache.continuum.buildagent.model.Installation;
-public class ContinuumBuildAgentConfiguration
+public class GeneralBuildAgentConfiguration
{
private File workingDirectory;
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/GeneralBuildAgentConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 16 19:09:22 2008
@@ -0,0 +1,2 @@
+/continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ContinuumBuildAgentConfiguration.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
+/continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ContinuumBuildAgentConfiguration.java:713270-724659
Copied: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/BuildAgentInstallationService.java (from r726995, continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/InstallationService.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/BuildAgentInstallationService.java?p2=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/BuildAgentInstallationService.java&p1=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/InstallationService.java&r1=726995&r2=727253&rev=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/InstallationService.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/BuildAgentInstallationService.java Tue Dec 16 19:09:22 2008
@@ -2,9 +2,9 @@
import org.apache.maven.continuum.execution.ExecutorConfigurator;
-public interface InstallationService
+public interface BuildAgentInstallationService
{
- String ROLE = InstallationService.class.getName();
+ String ROLE = BuildAgentInstallationService.class.getName();
String JDK_TYPE = "jdk";
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/BuildAgentInstallationService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/BuildAgentInstallationService.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/BuildAgentInstallationService.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 16 19:09:22 2008
@@ -0,0 +1,2 @@
+/continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/InstallationService.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
+/continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/InstallationService.java:713270-724659
Copied: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/DefaultBuildAgentInstallationService.java (from r726995, continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/DefaultInstallationService.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/DefaultBuildAgentInstallationService.java?p2=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/DefaultBuildAgentInstallationService.java&p1=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/DefaultInstallationService.java&r1=726995&r2=727253&rev=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/DefaultInstallationService.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/DefaultBuildAgentInstallationService.java Tue Dec 16 19:09:22 2008
@@ -8,10 +8,10 @@
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
/**
- * @plexus.component role="org.apache.continuum.buildagent.installation.InstallationService"
+ * @plexus.component role="org.apache.continuum.buildagent.installation.BuildAgentInstallationService"
*/
-public class DefaultInstallationService
- implements InstallationService, Initializable
+public class DefaultBuildAgentInstallationService
+ implements BuildAgentInstallationService, Initializable
{
private Map<String, ExecutorConfigurator> typesValues;
@@ -24,15 +24,15 @@
throws InitializationException
{
this.typesValues = new HashMap<String, ExecutorConfigurator>();
- this.typesValues.put( InstallationService.ANT_TYPE,
+ this.typesValues.put( BuildAgentInstallationService.ANT_TYPE,
new ExecutorConfigurator( "ant", "bin", "ANT_HOME", "-version" ) );
- this.typesValues.put( InstallationService.ENVVAR_TYPE, null );
- this.typesValues.put( InstallationService.JDK_TYPE,
+ this.typesValues.put( BuildAgentInstallationService.ENVVAR_TYPE, null );
+ this.typesValues.put( BuildAgentInstallationService.JDK_TYPE,
new ExecutorConfigurator( "java", "bin", "JAVA_HOME", "-version" ) );
- this.typesValues.put( InstallationService.MAVEN1_TYPE,
+ this.typesValues.put( BuildAgentInstallationService.MAVEN1_TYPE,
new ExecutorConfigurator( "maven", "bin", "MAVEN_HOME", "-v" ) );
this.typesValues
- .put( InstallationService.MAVEN2_TYPE, new ExecutorConfigurator( "mvn", "bin", "M2_HOME", "-v" ) );
+ .put( BuildAgentInstallationService.MAVEN2_TYPE, new ExecutorConfigurator( "mvn", "bin", "M2_HOME", "-v" ) );
}
}
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/DefaultBuildAgentInstallationService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/DefaultBuildAgentInstallationService.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/DefaultBuildAgentInstallationService.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 16 19:09:22 2008
@@ -0,0 +1,2 @@
+/continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/DefaultInstallationService.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
+/continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/DefaultInstallationService.java:713270-724659
Copied: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentManager.java (from r726995, continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/Continuum.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentManager.java?p2=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentManager.java&p1=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/Continuum.java&r1=726995&r2=727253&rev=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/Continuum.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentManager.java Tue Dec 16 19:09:22 2008
@@ -1,13 +1,13 @@
-package org.apache.continuum.buildagent;
+package org.apache.continuum.buildagent.manager;
import java.util.List;
import org.apache.continuum.buildagent.buildcontext.BuildContext;
import org.apache.maven.continuum.ContinuumException;
-public interface Continuum
+public interface BuildAgentManager
{
- String ROLE = Continuum.class.getName();
+ String ROLE = BuildAgentManager.class.getName();
void prepareBuildProjects( List<BuildContext> buildContextList )
throws ContinuumException;
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 16 19:09:22 2008
@@ -0,0 +1,2 @@
+/continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/Continuum.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
+/continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/Continuum.java:713270-724659
Copied: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java (from r726995, continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/DefaultContinuum.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java?p2=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java&p1=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/DefaultContinuum.java&r1=726995&r2=727253&rev=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/DefaultContinuum.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java Tue Dec 16 19:09:22 2008
@@ -1,16 +1,15 @@
-package org.apache.continuum.buildagent;
+package org.apache.continuum.buildagent.manager;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.continuum.buildagent.buildcontext.BuildContext;
-import org.apache.continuum.buildagent.configuration.ConfigurationService;
-import org.apache.continuum.buildagent.taskqueue.manager.TaskQueueManager;
+import org.apache.continuum.buildagent.configuration.BuildAgentConfigurationService;
+import org.apache.continuum.buildagent.taskqueue.manager.BuildAgentTaskQueueManager;
import org.apache.continuum.buildagent.utils.BuildContextToBuildDefinition;
import org.apache.continuum.buildagent.utils.BuildContextToProject;
import org.apache.continuum.buildagent.utils.ContinuumBuildAgentUtil;
-import org.apache.continuum.buildagent.utils.ContinuumUtils;
import org.apache.continuum.taskqueue.BuildProjectTask;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.BuildDefinition;
@@ -25,10 +24,10 @@
import org.slf4j.LoggerFactory;
/**
- * @plexus.component role="org.apache.continuum.buildagent.Continuum" role-hint="default"
+ * @plexus.component role="org.apache.continuum.buildagent.manager.BuildAgentManager" role-hint="default"
*/
-public class DefaultContinuum
- implements Continuum
+public class DefaultBuildAgentManager
+ implements BuildAgentManager
{
private Logger log = LoggerFactory.getLogger( this.getClass() );
@@ -40,12 +39,12 @@
/**
* @plexus.requirement
*/
- private ConfigurationService configurationService;
+ private BuildAgentConfigurationService buildAgentConfigurationService;
/**
* @plexus.requirement
*/
- private TaskQueueManager taskQueueManager;
+ private BuildAgentTaskQueueManager buildAgentTaskQueueManager;
public void prepareBuildProjects( List<BuildContext> buildContexts)
throws ContinuumException
@@ -155,7 +154,7 @@
Project project = ContinuumBuildAgentUtil.getProject( actionContext );
actionContext.put( ContinuumBuildAgentUtil.KEY_WORKING_DIRECTORY,
- configurationService.getWorkingDirectory( project.getId() ).getAbsolutePath() );
+ buildAgentConfigurationService.getWorkingDirectory( project.getId() ).getAbsolutePath() );
performAction( "checkout-project", buildContext );
@@ -307,7 +306,7 @@
result.setSuccess( false );
- result.setException( ContinuumUtils.throwableToString( exception ) );
+ result.setException( ContinuumBuildAgentUtil.throwableToString( exception ) );
buildContext.setScmResult( result );
buildContext.getActionContext().put( ContinuumBuildAgentUtil.KEY_UPDATE_SCM_RESULT, result );
@@ -327,7 +326,7 @@
"" );
try
{
- taskQueueManager.getBuildQueue().put( buildProjectTask );
+ buildAgentTaskQueueManager.getBuildQueue().put( buildProjectTask );
}
catch ( TaskQueueException e )
{
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 16 19:09:22 2008
@@ -0,0 +1,2 @@
+/continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/DefaultContinuum.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
+/continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/DefaultContinuum.java:713270-724659
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java?rev=727253&r1=727252&r2=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java Tue Dec 16 19:09:22 2008
@@ -1,15 +1,17 @@
package org.apache.continuum.buildagent.taskqueue.execution;
+import java.io.File;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.continuum.buildagent.buildcontext.BuildContext;
import org.apache.continuum.buildagent.buildcontext.manager.BuildContextManager;
+import org.apache.continuum.buildagent.configuration.BuildAgentConfigurationService;
import org.apache.continuum.buildagent.utils.BuildContextToBuildDefinition;
import org.apache.continuum.buildagent.utils.ContinuumBuildAgentUtil;
-import org.apache.continuum.buildagent.utils.ContinuumUtils;
import org.apache.continuum.taskqueue.BuildProjectTask;
import org.apache.maven.continuum.model.project.BuildResult;
import org.apache.maven.continuum.project.ContinuumProjectState;
@@ -20,6 +22,7 @@
import org.codehaus.plexus.taskqueue.Task;
import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
+import org.codehaus.plexus.util.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,6 +45,11 @@
*/
private ActionManager actionManager;
+ /**
+ * @plexus.requirement
+ */
+ private BuildAgentConfigurationService buildAgentConfigurationService;
+
public void executeTask( Task task )
throws TaskExecutionException
{
@@ -110,6 +118,17 @@
result.put( ContinuumBuildAgentUtil.KEY_BUILD_START, new Long( buildResult.getStartTime() ) );
result.put( ContinuumBuildAgentUtil.KEY_BUILD_END, new Long( buildResult.getEndTime() ) );
result.put( ContinuumBuildAgentUtil.KEY_BUILD_EXIT_CODE, new Integer( buildResult.getExitCode() ) );
+
+ String buildOutput = getBuildOutputText( buildContext.getProjectId() );
+ if ( buildOutput == null )
+ {
+ result.put( ContinuumBuildAgentUtil.KEY_BUILD_OUTPUT, "" );
+ }
+ else
+ {
+ result.put( ContinuumBuildAgentUtil.KEY_BUILD_OUTPUT, buildOutput );
+ }
+
if ( buildResult.getError() != null )
{
result.put( ContinuumBuildAgentUtil.KEY_BUILD_ERROR, buildResult.getError() );
@@ -134,25 +153,25 @@
}
catch ( ActionNotFoundException e )
{
- error = ContinuumUtils.throwableToString( e );
+ error = ContinuumBuildAgentUtil.throwableToString( e );
exception = new TaskExecutionException( "Error looking up action '" + actionName + "'", e );
}
catch ( ScmRepositoryException e )
{
- error = getValidationMessages( e ) + "\n" + ContinuumUtils.throwableToString( e );
+ error = getValidationMessages( e ) + "\n" + ContinuumBuildAgentUtil.throwableToString( e );
exception = new TaskExecutionException( "SCM error while executing '" + actionName + "'", e );
}
catch ( ScmException e )
{
- error = ContinuumUtils.throwableToString( e );
+ error = ContinuumBuildAgentUtil.throwableToString( e );
exception = new TaskExecutionException( "SCM error while executing '" + actionName + "'", e );
}
catch ( Exception e )
{
exception = new TaskExecutionException( "Error executing action '" + actionName + "'", e );
- error = ContinuumUtils.throwableToString( exception );
+ error = ContinuumBuildAgentUtil.throwableToString( exception );
}
updateBuildResult( context, error );
@@ -207,4 +226,24 @@
}
return message.toString();
}
+
+ private String getBuildOutputText( int projectId )
+ {
+ try
+ {
+ File buildOutputFile = buildAgentConfigurationService.getBuildOutputFile( projectId );
+
+ if ( buildOutputFile.exists() )
+ {
+ return StringEscapeUtils.escapeHtml( FileUtils.fileRead( buildOutputFile ) );
+ }
+ }
+ catch ( Exception e )
+ {
+ // do not throw exception, just log it
+ log.error( "Error retrieving build output file", e );
+ }
+
+ return null;
+ }
}
Copied: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/BuildAgentTaskQueueManager.java (from r726995, continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/TaskQueueManager.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/BuildAgentTaskQueueManager.java?p2=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/BuildAgentTaskQueueManager.java&p1=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/TaskQueueManager.java&r1=726995&r2=727253&rev=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/TaskQueueManager.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/BuildAgentTaskQueueManager.java Tue Dec 16 19:09:22 2008
@@ -3,9 +3,9 @@
import org.apache.continuum.taskqueue.manager.TaskQueueManagerException;
import org.codehaus.plexus.taskqueue.TaskQueue;
-public interface TaskQueueManager
+public interface BuildAgentTaskQueueManager
{
- String ROLE = TaskQueueManager.class.getName();
+ String ROLE = BuildAgentTaskQueueManager.class.getName();
TaskQueue getBuildQueue();
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/BuildAgentTaskQueueManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 16 19:09:22 2008
@@ -0,0 +1,2 @@
+/continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/TaskQueueManager.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
+/continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/TaskQueueManager.java:713270-724659
Copied: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java (from r726995, continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultTaskQueueManager.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java?p2=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java&p1=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultTaskQueueManager.java&r1=726995&r2=727253&rev=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultTaskQueueManager.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java Tue Dec 16 19:09:22 2008
@@ -4,8 +4,6 @@
import org.apache.continuum.taskqueue.BuildProjectTask;
import org.apache.continuum.taskqueue.manager.TaskQueueManagerException;
-import org.apache.maven.continuum.model.project.BuildDefinition;
-import org.apache.maven.continuum.store.ContinuumStoreException;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
@@ -16,15 +14,14 @@
import org.codehaus.plexus.taskqueue.TaskQueue;
import org.codehaus.plexus.taskqueue.TaskQueueException;
import org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor;
-import org.codehaus.plexus.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * @plexus.component role="org.apache.continuum.buildagent.taskqueue.manager.TaskQueueManager"
+ * @plexus.component role="org.apache.continuum.buildagent.taskqueue.manager.BuildAgentTaskQueueManager"
*/
-public class DefaultTaskQueueManager
- implements TaskQueueManager, Contextualizable
+public class DefaultBuildAgentTaskQueueManager
+ implements BuildAgentTaskQueueManager, Contextualizable
{
private Logger log = LoggerFactory.getLogger( this.getClass() );
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 16 19:09:22 2008
@@ -0,0 +1,2 @@
+/continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultTaskQueueManager.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
+/continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultTaskQueueManager.java:713270-724659
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumBuildAgentUtil.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumBuildAgentUtil.java?rev=727253&r1=727252&r2=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumBuildAgentUtil.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumBuildAgentUtil.java Tue Dec 16 19:09:22 2008
@@ -1,5 +1,7 @@
package org.apache.continuum.buildagent.utils;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.util.Map;
import org.apache.maven.continuum.model.project.BuildDefinition;
@@ -9,6 +11,8 @@
public class ContinuumBuildAgentUtil
{
+ public static final String EOL = System.getProperty( "line.separator" );
+
public static final String KEY_PROJECT_ID = "project-id";
public static final String KEY_BUILD_DEFINITION_ID = "builddefinition-id";
@@ -79,6 +83,8 @@
public static final String KEY_PROJECT_NAME = "project-name";
+ public static final String KEY_BUILD_OUTPUT = "build-output";
+
public static Integer getProjectId( Map context )
{
return getInteger( context, KEY_PROJECT_ID );
@@ -250,4 +256,47 @@
return value;
}
+
+ public static String throwableToString( Throwable error )
+ {
+ if ( error == null )
+ {
+ return "";
+ }
+
+ StringWriter writer = new StringWriter();
+
+ PrintWriter printer = new PrintWriter( writer );
+
+ error.printStackTrace( printer );
+
+ printer.flush();
+
+ return writer.getBuffer().toString();
+ }
+
+ public static String throwableMessagesToString( Throwable error )
+ {
+ if ( error == null )
+ {
+ return "";
+ }
+
+ StringBuffer buffer = new StringBuffer();
+
+ buffer.append( error.getMessage() );
+
+ error = error.getCause();
+
+ while ( error != null )
+ {
+ buffer.append( EOL );
+
+ buffer.append( error.getMessage() );
+
+ error = error.getCause();
+ }
+
+ return buffer.toString();
+ }
}
\ No newline at end of file
Copied: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/BuildAgentShellCommandHelper.java (from r726995, continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/ShellCommandHelper.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/BuildAgentShellCommandHelper.java?p2=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/BuildAgentShellCommandHelper.java&p1=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/ShellCommandHelper.java&r1=726995&r2=727253&rev=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/ShellCommandHelper.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/BuildAgentShellCommandHelper.java Tue Dec 16 19:09:22 2008
@@ -5,9 +5,9 @@
import org.apache.maven.shared.release.ReleaseResult;
-public interface ShellCommandHelper
+public interface BuildAgentShellCommandHelper
{
- String ROLE = ShellCommandHelper.class.getName();
+ String ROLE = BuildAgentShellCommandHelper.class.getName();
ExecutionResult executeShellCommand( File workingDirectory, String executable, String arguments, File output,
long idCommand, Map<String, String> environments )
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/BuildAgentShellCommandHelper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 16 19:09:22 2008
@@ -0,0 +1,2 @@
+/continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/ShellCommandHelper.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
+/continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/ShellCommandHelper.java:713270-724659
Copied: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/DefaultBuildAgentShellCommandHelper.java (from r726995, continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/DefaultShellCommandHelper.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/DefaultBuildAgentShellCommandHelper.java?p2=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/DefaultBuildAgentShellCommandHelper.java&p1=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/DefaultShellCommandHelper.java&r1=726995&r2=727253&rev=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/DefaultShellCommandHelper.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/DefaultBuildAgentShellCommandHelper.java Tue Dec 16 19:09:22 2008
@@ -20,11 +20,11 @@
import org.slf4j.LoggerFactory;
/**
- * @plexus.component role="org.apache.continuum.buildagent.utils.shell.ShellCommandHelper"
+ * @plexus.component role="org.apache.continuum.buildagent.utils.shell.BuildAgentShellCommandHelper"
* role-hint="default"
*/
-public class DefaultShellCommandHelper
- implements ShellCommandHelper
+public class DefaultBuildAgentShellCommandHelper
+ implements BuildAgentShellCommandHelper
{
private Logger log = LoggerFactory.getLogger( this.getClass() );
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/DefaultBuildAgentShellCommandHelper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 16 19:09:22 2008
@@ -0,0 +1,2 @@
+/continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/DefaultShellCommandHelper.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
+/continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/DefaultShellCommandHelper.java:713270-724659
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/resources/META-INF/spring-context.xml?rev=727253&r1=727252&r2=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/resources/META-INF/spring-context.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/resources/META-INF/spring-context.xml Tue Dec 16 19:09:22 2008
@@ -10,7 +10,7 @@
<bean name="continuumAgentBuildExecutor#maven2"
class="org.apache.continuum.buildagent.build.execution.maven.m2.MavenTwoBuildExecutor" autowire="byName">
<property name="defaultExecutable" value="mvn"/>
- <property name="builderHelper" ref="mavenBuilderHelper"/>
+ <property name="builderHelper" ref="buildAgentMavenBuilderHelper"/>
<property name="projectHelper" ref="mavenProjectHelper"/>
</bean>
<bean name="continuumAgentBuildExecutor#maven-1"
@@ -25,12 +25,12 @@
class="org.apache.continuum.buildagent.build.execution.shell.ShellBuildExecutor" autowire="byName">
</bean>
- <bean id="configurationService" class="org.apache.continuum.buildagent.configuration.DefaultConfigurationService">
- <property name="configuration" ref="continuumConfiguration" />
+ <bean id="buildAgentConfigurationService" class="org.apache.continuum.buildagent.configuration.DefaultBuildAgentConfigurationService">
+ <property name="configuration" ref="buildAgentConfiguration" />
</bean>
- <bean id="continuumConfiguration" class="org.apache.continuum.buildagent.configuration.DefaultContinuumConfiguration">
- <property name="configurationFile" value="file:${appserver.base}/conf/continuum.xml" />
+ <bean id="buildAgentConfiguration" class="org.apache.continuum.buildagent.configuration.DefaultBuildAgentConfiguration">
+ <property name="configurationFile" value="file:${appserver.base}/conf/continuum-buildagent.xml" />
</bean>
</beans>
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-master/continuum-distributed-build-transport-master-api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Dec 16 19:09:22 2008
@@ -0,0 +1,5 @@
+.settings
+target
+.classpath
+.project
+build
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-master/continuum-distributed-build-transport-master-api/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportService.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-master/continuum-distributed-build-transport-master-api/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportService.java?rev=727253&r1=727252&r2=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-master/continuum-distributed-build-transport-master-api/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportService.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-master/continuum-distributed-build-transport-master-api/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportService.java Tue Dec 16 19:09:22 2008
@@ -32,6 +32,10 @@
public Boolean returnBuildResult( Map buildResult ) throws Exception;
public Boolean returnScmResult( Map scmResult ) throws Exception;
-
+
+ public Boolean returnProjectCurrentlyBuilding( Integer projectId ) throws Exception;
+
+ public Boolean prepareBuildFinished( Map prepareBuildResult ) throws Exception;
+
public Boolean ping() throws Exception;
}
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-master/continuum-distributed-build-transport-master-client/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Dec 16 19:09:22 2008
@@ -0,0 +1,5 @@
+.settings
+target
+.classpath
+.project
+build
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-master/continuum-distributed-build-transport-master-client/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-master/continuum-distributed-build-transport-master-client/pom.xml?rev=727253&r1=727252&r2=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-master/continuum-distributed-build-transport-master-client/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-master/continuum-distributed-build-transport-master-client/pom.xml Tue Dec 16 19:09:22 2008
@@ -31,7 +31,6 @@
<dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-distributed-build-transport-master-api</artifactId>
- <version>1.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.atlassian.xmlrpc</groupId>
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-master/continuum-distributed-build-transport-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-master/continuum-distributed-build-transport-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java?rev=727253&r1=727252&r2=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-master/continuum-distributed-build-transport-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-master/continuum-distributed-build-transport-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java Tue Dec 16 19:09:22 2008
@@ -119,4 +119,42 @@
return result;
}
+
+ public Boolean prepareBuildFinished( Map prepareBuildResult )
+ throws Exception
+ {
+ Boolean result = null;
+
+ try
+ {
+ result = master.prepareBuildFinished( prepareBuildResult );
+ log.info( "Prepare build finished." );
+ }
+ catch ( Exception e )
+ {
+ log.error( "Failed to finish prepare build" );
+ throw new Exception( "Failed to finish prepare build", e );
+ }
+
+ return result;
+ }
+
+ public Boolean returnProjectCurrentlyBuilding( Integer projectId )
+ throws Exception
+ {
+ Boolean result = null;
+
+ try
+ {
+ result = master.returnProjectCurrentlyBuilding( projectId );
+ log.info( "Return project currently building" );
+ }
+ catch ( Exception e )
+ {
+ log.error( "Failed to return project currently building", e );
+ throw new Exception( "Failed to return project currently building", e );
+ }
+
+ return result;
+ }
}
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-master/continuum-distributed-build-transport-master-server/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Dec 16 19:09:22 2008
@@ -0,0 +1,5 @@
+.settings
+target
+.classpath
+.project
+build
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-master/continuum-distributed-build-transport-master-server/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-master/continuum-distributed-build-transport-master-server/pom.xml?rev=727253&r1=727252&r2=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-master/continuum-distributed-build-transport-master-server/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-master/continuum-distributed-build-transport-master-server/pom.xml Tue Dec 16 19:09:22 2008
@@ -31,7 +31,6 @@
<dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-distributed-build-transport-master-api</artifactId>
- <version>1.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-master/continuum-distributed-build-transport-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-master/continuum-distributed-build-transport-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java?rev=727253&r1=727252&r2=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-master/continuum-distributed-build-transport-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-master/continuum-distributed-build-transport-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java Tue Dec 16 19:09:22 2008
@@ -62,6 +62,20 @@
return Boolean.TRUE;
}
-
- // TODO: add prepareBuildFinished() method
+
+ public Boolean prepareBuildFinished( Map prepareBuildResult )
+ throws Exception
+ {
+ log.info( "Prepare build finished." );
+ distributedBuildManager.prepareBuildFinished( prepareBuildResult );
+ return Boolean.TRUE;
+ }
+
+ public Boolean returnProjectCurrentlyBuilding( Integer projectId )
+ throws Exception
+ {
+ log.info( "Project currently building returned." );
+ distributedBuildManager.updateProjectCurrentlyBuilding( projectId.intValue() );
+ return Boolean.TRUE;
+ }
}
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-slave/continuum-distributed-build-transport-slave-api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Dec 16 19:09:22 2008
@@ -0,0 +1,5 @@
+.settings
+target
+.classpath
+.project
+build
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-slave/continuum-distributed-build-transport-slave-api/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-slave/continuum-distributed-build-transport-slave-api/pom.xml?rev=727253&r1=727252&r2=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-slave/continuum-distributed-build-transport-slave-api/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-slave/continuum-distributed-build-transport-slave-api/pom.xml Tue Dec 16 19:09:22 2008
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-buildagent-core</artifactId>
- <version>1.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-slave/continuum-distributed-build-transport-slave-client/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Dec 16 19:09:22 2008
@@ -0,0 +1,5 @@
+.settings
+build
+target
+.classpath
+.project
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-slave/continuum-distributed-build-transport-slave-client/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-slave/continuum-distributed-build-transport-slave-client/pom.xml?rev=727253&r1=727252&r2=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-slave/continuum-distributed-build-transport-slave-client/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-slave/continuum-distributed-build-transport-slave-client/pom.xml Tue Dec 16 19:09:22 2008
@@ -31,7 +31,6 @@
<dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-distributed-build-transport-slave-api</artifactId>
- <version>1.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.atlassian.xmlrpc</groupId>
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-slave/continuum-distributed-build-transport-slave-server/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Dec 16 19:09:22 2008
@@ -0,0 +1,5 @@
+.settings
+build
+target
+.classpath
+.project
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-slave/continuum-distributed-build-transport-slave-server/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-slave/continuum-distributed-build-transport-slave-server/pom.xml?rev=727253&r1=727252&r2=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-slave/continuum-distributed-build-transport-slave-server/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-slave/continuum-distributed-build-transport-slave-server/pom.xml Tue Dec 16 19:09:22 2008
@@ -31,7 +31,6 @@
<dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-distributed-build-transport-slave-api</artifactId>
- <version>1.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-slave/continuum-distributed-build-transport-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-slave/continuum-distributed-build-transport-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java?rev=727253&r1=727252&r2=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-slave/continuum-distributed-build-transport-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-slave/continuum-distributed-build-transport-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java Tue Dec 16 19:09:22 2008
@@ -92,7 +92,7 @@
try
{
- continuumBuildAgentService.getBuildResult( projectId );
+ buildResult = continuumBuildAgentService.getBuildResult( projectId );
log.info( "Build result for project " + projectId + " acquired." );
}
catch ( ContinuumBuildAgentException e )
@@ -113,23 +113,6 @@
return projectId;
}
- public Boolean isBusy()
- throws Exception
- {
- Boolean busy = null;
- try
- {
- busy = new Boolean( continuumBuildAgentService.isBusy() );
- log.info( "Build agent is " + ( busy ? "" : "not" ) + " busy." );
- }
- catch ( ContinuumBuildAgentException e )
- {
- log.error( "Failed to determine if master is busy.", e );
- }
-
- return busy;
- }
-
public Boolean ping()
throws Exception
{
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Dec 16 19:09:22 2008
@@ -0,0 +1,5 @@
+.settings
+build
+target
+.classpath
+.project
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/pom.xml?rev=727253&r1=727252&r2=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/pom.xml Tue Dec 16 19:09:22 2008
@@ -33,28 +33,38 @@
<dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-distributed-build-transport-slave-server</artifactId>
- <version>1.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-distributed-build-transport-slave-client</artifactId>
- <version>1.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-distributed-build-transport-master-server</artifactId>
- <version>1.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-distributed-build-transport-master-client</artifactId>
- <version>1.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>2.5.4</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-slf4j-logging</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
Added: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/resources/META-INF/continuum/continuum-configuration.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/resources/META-INF/continuum/continuum-configuration.xml?rev=727253&view=auto
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/resources/META-INF/continuum/continuum-configuration.xml (added)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/resources/META-INF/continuum/continuum-configuration.xml Tue Dec 16 19:09:22 2008
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+
+<!--
+ ~ 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.
+ -->
+
+<configuration>
+ <system/>
+ <jndi prefix="java:comp/env" config-optional="true"/>
+ <xml fileName="${appserver.base}/conf/continuum-buildagent.xml" config-optional="true"
+ config-forceCreate="true" config-name="org.apache.continuum"/>
+ <xml fileName="${user.home}/.m2/continuum-buildagent.xml" config-optional="true"
+ config-forceCreate="true" config-name="org.apache.continuum.user"/>
+</configuration>