You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2012/08/13 06:29:28 UTC
svn commit: r1372260 [4/30] - in /continuum/trunk: ./ continuum-api/
continuum-api/src/main/java/org/apache/continuum/builder/distributed/
continuum-api/src/main/java/org/apache/continuum/builder/distributed/executor/
continuum-api/src/main/java/org/ap...
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java Mon Aug 13 04:29:09 2012
@@ -68,7 +68,8 @@ public interface ContinuumBuildAgentServ
String getPreparedReleaseName( String releaseId )
throws ContinuumBuildAgentException;
- void releasePerform( String releaseId, String goals, String arguments, boolean useReleaseProfile, Map repository, String username )
+ void releasePerform( String releaseId, String goals, String arguments, boolean useReleaseProfile, Map repository,
+ String username )
throws ContinuumBuildAgentException;
String releasePerformFromScm( String goals, String arguments, boolean useReleaseProfile, Map repository,
@@ -130,45 +131,43 @@ public interface ContinuumBuildAgentServ
boolean ping()
throws ContinuumBuildAgentException;
-
+
/**
* Get build agent's platform.
- *
+ *
* @return The operating system name of the build agent
* @throws Exception
*/
String getBuildAgentPlatform()
throws ContinuumBuildAgentException;
-
+
/**
* Determines if build agent is currently executing a build
- *
+ *
* @return true if executing build; false otherwise
*/
boolean isExecutingBuild();
-
+
/**
* Determines if build agent is currently executing a release
- *
+ *
* @return true if executing release; false otherwise
- *
* @throws ContinuumBuildAgentException if unable to determine if buildagent is executing a release
*/
- boolean isExecutingRelease() throws ContinuumBuildAgentException;
-
+ boolean isExecutingRelease()
+ throws ContinuumBuildAgentException;
+
/**
* Execute a directory purge on the build agent
- *
- * @param directoryType valid types are <i>working</i> and <i>releases</i>
- * @param daysOlder days older
+ *
+ * @param directoryType valid types are <i>working</i> and <i>releases</i>
+ * @param daysOlder days older
* @param retentionCount retention count
- * @param deleteAll delete all flag
- *
+ * @param deleteAll delete all flag
* @return true if purge is successful; false otherwise
- *
* @throws ContinuumBuildAgentException error that will occur during the purge
*/
void executeDirectoryPurge( String directoryType, int daysOlder, int retentionCount, boolean deleteAll )
throws ContinuumBuildAgentException;
-
+
}
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationService.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationService.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationService.java Mon Aug 13 04:29:09 2012
@@ -19,12 +19,12 @@ package org.apache.continuum.buildagent.
* under the License.
*/
-import java.io.File;
-import java.util.List;
-
import org.apache.continuum.buildagent.model.Installation;
import org.apache.continuum.buildagent.model.LocalRepository;
+import java.io.File;
+import java.util.List;
+
public interface BuildAgentConfigurationService
{
String ROLE = BuildAgentConfigurationService.class.getName();
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/mdo/continuum-buildagent.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/mdo/continuum-buildagent.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/mdo/continuum-buildagent.xml (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/mdo/continuum-buildagent.xml Mon Aug 13 04:29:09 2012
@@ -88,12 +88,12 @@
<name>varName</name>
<version>1.0.0+</version>
<type>String</type>
- </field>
+ </field>
<field>
<name>name</name>
<version>1.0.0+</version>
<type>String</type>
- </field>
+ </field>
</fields>
</class>
<class>
@@ -112,7 +112,7 @@
<type>String</type>
<required>true</required>
<description>
- The file system location for this repository
+ The file system location for this repository
</description>
</field>
<field>
@@ -121,7 +121,7 @@
<type>String</type>
<defaultValue>default</defaultValue>
<description>
- The layout of the repository. Valid values are "default" and "legacy"
+ The layout of the repository. Valid values are "default" and "legacy"
</description>
</field>
</fields>
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/pom.xml (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/pom.xml Mon Aug 13 04:29:09 2012
@@ -16,7 +16,9 @@ software distributed under the License i
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.continuum</groupId>
@@ -136,7 +138,7 @@ under the License.
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-junit3</artifactId>
@@ -151,8 +153,8 @@ under the License.
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
<scope>test</scope>
- </dependency>
- <!-- dependency of jmock3 -->
+ </dependency>
+ <!-- dependency of jmock3 -->
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
@@ -161,7 +163,7 @@ under the License.
<!-- dependency of jmock3 -->
<dependency>
<groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
+ <artifactId>objenesis</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
@@ -195,5 +197,5 @@ under the License.
</executions>
</plugin>
</plugins>
- </build>
+ </build>
</project>
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java Mon Aug 13 04:29:09 2012
@@ -50,7 +50,6 @@ import org.codehaus.plexus.util.StringUt
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.activation.MimetypesFileTypeMap;
import java.io.File;
import java.io.IOException;
import java.text.MessageFormat;
@@ -61,6 +60,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import javax.activation.MimetypesFileTypeMap;
/**
* @plexus.component role="org.apache.continuum.buildagent.ContinuumBuildAgentService"
@@ -101,7 +101,7 @@ public class ContinuumBuildAgentServiceI
* @plexus.requirement
*/
private BuildAgentManager buildAgentManager;
-
+
/**
* @plexus.requirement
*/
@@ -219,8 +219,8 @@ public class ContinuumBuildAgentServiceI
{
if ( buildResult.getStartTime() <= 0 )
{
- result.put( ContinuumBuildAgentUtil.KEY_START_TIME,
- Long.toString( buildContext.getBuildStartTime() ) );
+ result.put( ContinuumBuildAgentUtil.KEY_START_TIME, Long.toString(
+ buildContext.getBuildStartTime() ) );
}
else
{
@@ -259,12 +259,13 @@ public class ContinuumBuildAgentServiceI
result.put( ContinuumBuildAgentUtil.KEY_BUILD_OUTPUT, buildOutput );
}
- result.put( ContinuumBuildAgentUtil.KEY_SCM_RESULT,
- ContinuumBuildAgentUtil.createScmResult( buildContext ) );
+ result.put( ContinuumBuildAgentUtil.KEY_SCM_RESULT, ContinuumBuildAgentUtil.createScmResult(
+ buildContext ) );
}
else
{
- log.debug( "Unable to get build result because project {} is not currently building in the agent", projectId );
+ log.debug( "Unable to get build result because project {} is not currently building in the agent",
+ projectId );
}
return result;
}
@@ -341,7 +342,7 @@ public class ContinuumBuildAgentServiceI
boolean isStream = false;
if ( ( mimeType.indexOf( "image" ) >= 0 ) || ( mimeType.indexOf( "java-archive" ) >= 0 ) ||
- ( mimeType.indexOf( "java-class" ) >= 0 ) || ( userFile.length() > 100000 ) )
+ ( mimeType.indexOf( "java-class" ) >= 0 ) || ( userFile.length() > 100000 ) )
{
fileContent = "";
isStream = true;
@@ -457,7 +458,8 @@ public class ContinuumBuildAgentServiceI
try
{
log.debug( "Performing release" );
- buildAgentReleaseManager.releasePerform( releaseId, goals, arguments, useReleaseProfile, repository, username );
+ buildAgentReleaseManager.releasePerform( releaseId, goals, arguments, useReleaseProfile, repository,
+ username );
}
catch ( ContinuumReleaseException e )
{
@@ -507,7 +509,7 @@ public class ContinuumBuildAgentServiceI
public int getBuildSizeOfAgent()
{
int size = 0;
-
+
try
{
log.debug( "Getting number of projects in any queue" );
@@ -565,10 +567,11 @@ public class ContinuumBuildAgentServiceI
return projects;
}
- catch( TaskQueueManagerException e )
+ catch ( TaskQueueManagerException e )
{
log.error( "Error occurred while retrieving projects in prepare build queue", e );
- throw new ContinuumBuildAgentException( "Error occurred while retrieving projects in prepare build queue", e );
+ throw new ContinuumBuildAgentException( "Error occurred while retrieving projects in prepare build queue",
+ e );
}
}
@@ -595,10 +598,11 @@ public class ContinuumBuildAgentServiceI
return projects;
}
- catch( TaskQueueManagerException e )
+ catch ( TaskQueueManagerException e )
{
log.error( "Error occurred while retrieving projects in prepare build queue", e );
- throw new ContinuumBuildAgentException( "Error occurred while retrieving projects in prepare build queue", e );
+ throw new ContinuumBuildAgentException( "Error occurred while retrieving projects in prepare build queue",
+ e );
}
}
@@ -625,7 +629,7 @@ public class ContinuumBuildAgentServiceI
return projects;
}
- catch( TaskQueueManagerException e )
+ catch ( TaskQueueManagerException e )
{
log.error( "Error occurred while retrieving projects in build queue", e );
throw new ContinuumBuildAgentException( "Error occurred while retrieving projects in build queue", e );
@@ -656,7 +660,8 @@ public class ContinuumBuildAgentServiceI
catch ( TaskQueueManagerException e )
{
log.error( "Error occurred while retrieving current project in prepare build", e );
- throw new ContinuumBuildAgentException( "Error occurred while retrieving current project in prepare build", e );
+ throw new ContinuumBuildAgentException( "Error occurred while retrieving current project in prepare build",
+ e );
}
}
@@ -688,9 +693,11 @@ public class ContinuumBuildAgentServiceI
catch ( TaskQueueManagerException e )
{
log.error( "Error occurred while retrieving current projects in prepare build", e );
- throw new ContinuumBuildAgentException( "Error occurred while retrieving current projects in prepare build", e );
+ throw new ContinuumBuildAgentException( "Error occurred while retrieving current projects in prepare build",
+ e );
}
}
+
public Map<String, Object> getProjectCurrentlyBuilding()
throws ContinuumBuildAgentException
{
@@ -704,7 +711,8 @@ public class ContinuumBuildAgentServiceI
if ( task != null )
{
project.put( ContinuumBuildAgentUtil.KEY_PROJECT_ID, new Integer( task.getProjectId() ) );
- project.put( ContinuumBuildAgentUtil.KEY_BUILD_DEFINITION_ID, new Integer( task.getBuildDefinitionId() ) );
+ project.put( ContinuumBuildAgentUtil.KEY_BUILD_DEFINITION_ID, new Integer(
+ task.getBuildDefinitionId() ) );
project.put( ContinuumBuildAgentUtil.KEY_TRIGGER, task.getBuildTrigger().getTrigger() );
project.put( ContinuumBuildAgentUtil.KEY_USERNAME, task.getBuildTrigger().getTriggeredBy() );
project.put( ContinuumBuildAgentUtil.KEY_PROJECT_GROUP_ID, new Integer( task.getProjectGroupId() ) );
@@ -734,7 +742,8 @@ public class ContinuumBuildAgentServiceI
}
}
- PrepareBuildProjectsTask currentPrepareBuildTask = buildAgentTaskQueueManager.getCurrentProjectInPrepareBuild();
+ PrepareBuildProjectsTask currentPrepareBuildTask =
+ buildAgentTaskQueueManager.getCurrentProjectInPrepareBuild();
if ( currentPrepareBuildTask != null && currentPrepareBuildTask.getProjectGroupId() == projectGroupId )
{
@@ -757,11 +766,11 @@ public class ContinuumBuildAgentServiceI
{
log.debug( "projectGroup {} is currently building", projectGroupId );
return true;
- }
+ }
}
catch ( TaskQueueManagerException e )
{
- log.error( "Error while checking if project group " + projectGroupId + " is queued in agent", e);
+ log.error( "Error while checking if project group " + projectGroupId + " is queued in agent", e );
}
return false;
@@ -772,7 +781,8 @@ public class ContinuumBuildAgentServiceI
try
{
log.debug( "Checking if projects {} is in any queue", projectIds );
- PrepareBuildProjectsTask currentPrepareBuildTask = buildAgentTaskQueueManager.getCurrentProjectInPrepareBuild();
+ PrepareBuildProjectsTask currentPrepareBuildTask =
+ buildAgentTaskQueueManager.getCurrentProjectInPrepareBuild();
if ( currentPrepareBuildTask != null && currentPrepareBuildTask.getScmRootId() == projectScmRootId )
{
@@ -780,7 +790,7 @@ public class ContinuumBuildAgentServiceI
}
BuildProjectTask currentBuildTask = buildAgentTaskQueueManager.getCurrentProjectInBuilding();
-
+
if ( currentBuildTask != null )
{
int projectId = currentBuildTask.getProjectId();
@@ -817,7 +827,7 @@ public class ContinuumBuildAgentServiceI
}
catch ( TaskQueueManagerException e )
{
- log.error( "Error while checking if project scm root " + projectScmRootId + " is queued in agent", e);
+ log.error( "Error while checking if project scm root " + projectScmRootId + " is queued in agent", e );
}
return false;
@@ -838,7 +848,8 @@ public class ContinuumBuildAgentServiceI
}
catch ( TaskQueueManagerException e )
{
- log.error( "Error while checking if project group " + projectGroupId + " is in prepare build queue in agent", e);
+ log.error(
+ "Error while checking if project group " + projectGroupId + " is in prepare build queue in agent", e );
}
return false;
@@ -848,15 +859,16 @@ public class ContinuumBuildAgentServiceI
{
try
{
- log.debug( "Checking if projectId={}, buildDefinitionId={} is in prepare build queue", projectId, buildDefinitionId );
+ log.debug( "Checking if projectId={}, buildDefinitionId={} is in prepare build queue", projectId,
+ buildDefinitionId );
for ( PrepareBuildProjectsTask task : buildAgentTaskQueueManager.getProjectsInPrepareBuildQueue() )
{
if ( task != null )
{
for ( BuildContext context : task.getBuildContexts() )
{
- if ( context.getProjectId() == projectId &&
- ( buildDefinitionId == -1 || context.getBuildDefinitionId() == buildDefinitionId ) )
+ if ( context.getProjectId() == projectId &&
+ ( buildDefinitionId == -1 || context.getBuildDefinitionId() == buildDefinitionId ) )
{
log.debug( "projectId={}, buildDefinitionId={} is in prepare build queue" );
return true;
@@ -867,8 +879,8 @@ public class ContinuumBuildAgentServiceI
}
catch ( TaskQueueManagerException e )
{
- log.error( "Error while checking if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId +
- " is in prepare build queue in agent", e);
+ log.error( "Error while checking if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId +
+ " is in prepare build queue in agent", e );
}
return false;
@@ -879,7 +891,8 @@ public class ContinuumBuildAgentServiceI
try
{
log.debug( "Checking if project group {} currently preparing build", projectGroupId );
- PrepareBuildProjectsTask currentPrepareBuildTask = buildAgentTaskQueueManager.getCurrentProjectInPrepareBuild();
+ PrepareBuildProjectsTask currentPrepareBuildTask =
+ buildAgentTaskQueueManager.getCurrentProjectInPrepareBuild();
if ( currentPrepareBuildTask != null && currentPrepareBuildTask.getProjectGroupId() == projectGroupId )
{
@@ -888,7 +901,9 @@ public class ContinuumBuildAgentServiceI
}
catch ( TaskQueueManagerException e )
{
- log.error( "Error while checking if project group " + projectGroupId + " is currently preparing build in agent", e);
+ log.error(
+ "Error while checking if project group " + projectGroupId + " is currently preparing build in agent",
+ e );
}
return false;
@@ -898,15 +913,17 @@ public class ContinuumBuildAgentServiceI
{
try
{
- log.debug( "Checking if projectId={}, buildDefinitionId={} currently preparing build", projectId, buildDefinitionId );
- PrepareBuildProjectsTask currentPrepareBuildTask = buildAgentTaskQueueManager.getCurrentProjectInPrepareBuild();
+ log.debug( "Checking if projectId={}, buildDefinitionId={} currently preparing build", projectId,
+ buildDefinitionId );
+ PrepareBuildProjectsTask currentPrepareBuildTask =
+ buildAgentTaskQueueManager.getCurrentProjectInPrepareBuild();
if ( currentPrepareBuildTask != null )
{
for ( BuildContext context : currentPrepareBuildTask.getBuildContexts() )
{
- if ( context.getProjectId() == projectId &&
- ( buildDefinitionId == -1 || context.getBuildDefinitionId() == buildDefinitionId ) )
+ if ( context.getProjectId() == projectId &&
+ ( buildDefinitionId == -1 || context.getBuildDefinitionId() == buildDefinitionId ) )
{
log.debug( "projectId={}, buildDefinitionId={} is currently preparing build" );
return true;
@@ -916,8 +933,8 @@ public class ContinuumBuildAgentServiceI
}
catch ( TaskQueueManagerException e )
{
- log.error( "Error while checking if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId +
- " is currently preparing build in agent", e);
+ log.error( "Error while checking if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId +
+ " is currently preparing build in agent", e );
}
return false;
@@ -927,11 +944,12 @@ public class ContinuumBuildAgentServiceI
{
try
{
- log.debug( "Checking if projectId={}, buildDefinitionId={} is currently building", projectId, buildDefinitionId );
+ log.debug( "Checking if projectId={}, buildDefinitionId={} is currently building", projectId,
+ buildDefinitionId );
BuildProjectTask currentBuildTask = buildAgentTaskQueueManager.getCurrentProjectInBuilding();
- if ( currentBuildTask != null && currentBuildTask.getProjectId() == projectId &&
- ( buildDefinitionId == -1 || currentBuildTask.getBuildDefinitionId() == buildDefinitionId ) )
+ if ( currentBuildTask != null && currentBuildTask.getProjectId() == projectId &&
+ ( buildDefinitionId == -1 || currentBuildTask.getBuildDefinitionId() == buildDefinitionId ) )
{
log.debug( "projectId={}, buildDefinitionId={} is currently building" );
return true;
@@ -939,8 +957,9 @@ public class ContinuumBuildAgentServiceI
}
catch ( TaskQueueManagerException e )
{
- log.error( "Error occurred while checking if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId +
- " is currently building in agent", e );
+ log.error(
+ "Error occurred while checking if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId +
+ " is currently building in agent", e );
}
return false;
@@ -950,15 +969,16 @@ public class ContinuumBuildAgentServiceI
{
try
{
- log.debug( "Checking if projectId={}, buildDefinitionId={} is in build queue", projectId, buildDefinitionId );
+ log.debug( "Checking if projectId={}, buildDefinitionId={} is in build queue", projectId,
+ buildDefinitionId );
List<BuildProjectTask> buildTasks = buildAgentTaskQueueManager.getProjectsInBuildQueue();
if ( buildTasks != null )
{
for ( BuildProjectTask task : buildTasks )
{
- if ( task.getProjectId() == projectId &&
- ( buildDefinitionId == -1 || task.getBuildDefinitionId() == buildDefinitionId ) )
+ if ( task.getProjectId() == projectId &&
+ ( buildDefinitionId == -1 || task.getBuildDefinitionId() == buildDefinitionId ) )
{
log.debug( "projectId={}, buildDefinitionId={} is in build queue" );
return true;
@@ -968,8 +988,9 @@ public class ContinuumBuildAgentServiceI
}
catch ( TaskQueueManagerException e )
{
- log.error( "Error occurred while checking if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId +
- " is in build queue of agent", e );
+ log.error(
+ "Error occurred while checking if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId +
+ " is in build queue of agent", e );
}
return false;
@@ -986,7 +1007,8 @@ public class ContinuumBuildAgentServiceI
catch ( TaskQueueManagerException e )
{
log.error( "Error occurred while removing projects from prepare build queue", e );
- throw new ContinuumBuildAgentException( "Error occurred while removing projects from prepare build queue", e );
+ throw new ContinuumBuildAgentException( "Error occurred while removing projects from prepare build queue",
+ e );
}
}
@@ -1001,7 +1023,8 @@ public class ContinuumBuildAgentServiceI
catch ( TaskQueueManagerException e )
{
log.error( "Error occurred while removing projects from prepare build queue", e );
- throw new ContinuumBuildAgentException( "Error occurred while removing projects from prepare build queue", e );
+ throw new ContinuumBuildAgentException( "Error occurred while removing projects from prepare build queue",
+ e );
}
}
@@ -1049,7 +1072,7 @@ public class ContinuumBuildAgentServiceI
}
}
- public String getBuildAgentPlatform()
+ public String getBuildAgentPlatform()
throws ContinuumBuildAgentException
{
try
@@ -1063,13 +1086,14 @@ public class ContinuumBuildAgentServiceI
throw new ContinuumBuildAgentException( "Error in when trying to get build agent's platform", e );
}
}
-
+
public boolean isExecutingBuild()
{
return getBuildSizeOfAgent() > 0;
}
-
- public boolean isExecutingRelease() throws ContinuumBuildAgentException
+
+ public boolean isExecutingRelease()
+ throws ContinuumBuildAgentException
{
try
{
@@ -1080,23 +1104,25 @@ public class ContinuumBuildAgentServiceI
throw new ContinuumBuildAgentException( e.getMessage(), e );
}
}
-
+
public void executeDirectoryPurge( String directoryType, int daysOlder, int retentionCount, boolean deleteAll )
throws ContinuumBuildAgentException
{
- String logMsgFormat = "Directory purge [directoryType={0}, daysOlder={1}, retentionCount={2}, deleteAll={3}] not possible; {4}";
+ String logMsgFormat =
+ "Directory purge [directoryType={0}, daysOlder={1}, retentionCount={2}, deleteAll={3}] not possible; {4}";
if ( isExecutingBuild() )
{
- log.info( MessageFormat.format( logMsgFormat, directoryType, daysOlder, retentionCount, deleteAll, "Build Agent busy" ) );
+ log.info( MessageFormat.format( logMsgFormat, directoryType, daysOlder, retentionCount, deleteAll,
+ "Build Agent busy" ) );
return;
- }
-
+ }
+
try
{
if ( isExecutingRelease() )
{
- log.info( MessageFormat.format( logMsgFormat, directoryType, daysOlder, retentionCount, deleteAll,
- "Build Agent is executing a release." ) );
+ log.info( MessageFormat.format( logMsgFormat, directoryType, daysOlder, retentionCount, deleteAll,
+ "Build Agent is executing a release." ) );
return;
}
}
@@ -1104,9 +1130,9 @@ public class ContinuumBuildAgentServiceI
{
if ( isExecutingRelease() )
{
- log.info( MessageFormat.format( logMsgFormat, directoryType, daysOlder, retentionCount, deleteAll,
- "Unable to determine if Build Agent is executing a release." ) );
- return;
+ log.info( MessageFormat.format( logMsgFormat, directoryType, daysOlder, retentionCount, deleteAll,
+ "Unable to determine if Build Agent is executing a release." ) );
+ return;
}
}
@@ -1229,8 +1255,10 @@ public class ContinuumBuildAgentServiceI
if ( buildContexts != null && buildContexts.size() > 0 )
{
BuildContext context = buildContexts.get( 0 );
- return new PrepareBuildProjectsTask( buildContexts, new BuildTrigger( context.getTrigger(), context.getUsername() ),
- context.getProjectGroupId(), context.getScmRootAddress(), context.getScmRootId() );
+ return new PrepareBuildProjectsTask( buildContexts, new BuildTrigger( context.getTrigger(),
+ context.getUsername() ),
+ context.getProjectGroupId(), context.getScmRootAddress(),
+ context.getScmRootId() );
}
else
{
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/ChangeLogProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/ChangeLogProjectAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/ChangeLogProjectAction.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/ChangeLogProjectAction.java Mon Aug 13 04:29:09 2012
@@ -19,11 +19,6 @@ package org.apache.continuum.buildagent.
* under the License.
*/
-import java.io.File;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
import org.apache.continuum.buildagent.configuration.BuildAgentConfigurationService;
import org.apache.continuum.buildagent.utils.ContinuumBuildAgentUtil;
import org.apache.continuum.scm.ContinuumScm;
@@ -35,6 +30,11 @@ import org.apache.maven.scm.command.chan
import org.apache.maven.scm.command.changelog.ChangeLogSet;
import org.codehaus.plexus.action.AbstractAction;
+import java.io.File;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
/**
* @plexus.component role="org.codehaus.plexus.action.Action" role-hint="changelog-agent-project"
*/
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CheckWorkingDirectoryAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CheckWorkingDirectoryAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CheckWorkingDirectoryAction.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CheckWorkingDirectoryAction.java Mon Aug 13 04:29:09 2012
@@ -19,14 +19,14 @@ package org.apache.continuum.buildagent.
* under the License.
*/
-import java.io.File;
-import java.util.Map;
-
import org.apache.continuum.buildagent.configuration.BuildAgentConfigurationService;
import org.apache.continuum.buildagent.utils.ContinuumBuildAgentUtil;
import org.apache.maven.continuum.model.project.Project;
import org.codehaus.plexus.action.AbstractAction;
+import java.io.File;
+import java.util.Map;
+
/**
* @plexus.component role="org.codehaus.plexus.action.Action" role-hint="check-agent-working-directory"
*/
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CheckoutProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CheckoutProjectAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CheckoutProjectAction.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CheckoutProjectAction.java Mon Aug 13 04:29:09 2012
@@ -19,12 +19,6 @@ package org.apache.continuum.buildagent.
* under the License.
*/
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang.StringUtils;
import org.apache.continuum.buildagent.configuration.BuildAgentConfigurationService;
import org.apache.continuum.buildagent.utils.ContinuumBuildAgentUtil;
import org.apache.continuum.scm.ContinuumScm;
@@ -35,12 +29,14 @@ import org.apache.maven.continuum.model.
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.command.checkout.CheckOutScmResult;
import org.apache.maven.scm.manager.NoSuchScmProviderException;
-import org.apache.maven.scm.provider.ScmProvider;
-import org.apache.maven.scm.provider.ScmUrlUtils;
-import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
import org.apache.maven.scm.repository.ScmRepositoryException;
import org.codehaus.plexus.action.AbstractAction;
+import java.io.File;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
/**
* @plexus.component role="org.codehaus.plexus.action.Action" role-hint="checkout-agent-project"
*/
@@ -72,13 +68,13 @@ public class CheckoutProjectAction
try
{
- String scmUserName =
- ContinuumBuildAgentUtil.getString( context, ContinuumBuildAgentUtil.KEY_SCM_USERNAME, project.getScmUsername() );
- String scmPassword =
- ContinuumBuildAgentUtil.getString( context, ContinuumBuildAgentUtil.KEY_SCM_PASSWORD, project.getScmPassword() );
+ String scmUserName = ContinuumBuildAgentUtil.getString( context, ContinuumBuildAgentUtil.KEY_SCM_USERNAME,
+ project.getScmUsername() );
+ String scmPassword = ContinuumBuildAgentUtil.getString( context, ContinuumBuildAgentUtil.KEY_SCM_PASSWORD,
+ project.getScmPassword() );
- ContinuumScmConfiguration config =
- createScmConfiguration( project, workingDirectory, scmUserName, scmPassword );
+ ContinuumScmConfiguration config = createScmConfiguration( project, workingDirectory, scmUserName,
+ scmPassword );
String tag = config.getTag();
getLogger().info(
@@ -166,7 +162,7 @@ public class CheckoutProjectAction
// CONTINUUM-2628
config = ContinuumScmUtils.setSCMCredentialsforSSH( config, project.getScmUrl(), scmUserName, scmPassword );
-
+
config.setUrl( project.getScmUrl() );
config.setUseCredentialsCache( project.isScmUseCache() );
config.setWorkingDirectory( workingDirectory );
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CleanWorkingDirectoryAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CleanWorkingDirectoryAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CleanWorkingDirectoryAction.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CleanWorkingDirectoryAction.java Mon Aug 13 04:29:09 2012
@@ -19,9 +19,6 @@ package org.apache.continuum.buildagent.
* under the License.
*/
-import java.io.File;
-import java.util.Map;
-
import org.apache.continuum.buildagent.configuration.BuildAgentConfigurationService;
import org.apache.continuum.buildagent.utils.ContinuumBuildAgentUtil;
import org.apache.maven.continuum.model.project.Project;
@@ -29,6 +26,9 @@ import org.apache.maven.shared.model.fil
import org.apache.maven.shared.model.fileset.util.FileSetManager;
import org.codehaus.plexus.action.AbstractAction;
+import java.io.File;
+import java.util.Map;
+
/**
* @plexus.component role="org.codehaus.plexus.action.Action" role-hint="clean-agent-working-directory"
*/
@@ -44,9 +44,9 @@ public class CleanWorkingDirectoryAction
throws Exception
{
Project project = ContinuumBuildAgentUtil.getProject( context );
-
+
File workingDirectory = buildAgentConfigurationService.getWorkingDirectory( project.getId() );
-
+
if ( workingDirectory.exists() )
{
getLogger().debug( "Cleaning working directory " + workingDirectory.getAbsolutePath() );
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CreateBuildProjectTaskAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CreateBuildProjectTaskAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CreateBuildProjectTaskAction.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CreateBuildProjectTaskAction.java Mon Aug 13 04:29:09 2012
@@ -19,9 +19,6 @@ package org.apache.continuum.buildagent.
* under the License.
*/
-import java.util.List;
-import java.util.Map;
-
import org.apache.continuum.buildagent.buildcontext.BuildContext;
import org.apache.continuum.buildagent.taskqueue.manager.BuildAgentTaskQueueManager;
import org.apache.continuum.buildagent.utils.ContinuumBuildAgentUtil;
@@ -34,6 +31,9 @@ import org.codehaus.plexus.taskqueue.Tas
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.List;
+import java.util.Map;
+
/**
* @plexus.component role="org.codehaus.plexus.action.Action" role-hint="create-agent-build-project-task"
*/
@@ -54,12 +54,14 @@ public class CreateBuildProjectTaskActio
for ( BuildContext buildContext : buildContexts )
{
- BuildTrigger buildTrigger = new BuildTrigger( buildContext.getTrigger(), buildContext.getUsername() );
-
- BuildProjectTask buildProjectTask =
- new BuildProjectTask( buildContext.getProjectId(), buildContext.getBuildDefinitionId(),
- buildTrigger, buildContext.getProjectName(), buildContext.getBuildDefinitionLabel(),
- buildContext.getScmResult(), buildContext.getProjectGroupId() );
+ BuildTrigger buildTrigger = new BuildTrigger( buildContext.getTrigger(), buildContext.getUsername() );
+
+ BuildProjectTask buildProjectTask = new BuildProjectTask( buildContext.getProjectId(),
+ buildContext.getBuildDefinitionId(), buildTrigger,
+ buildContext.getProjectName(),
+ buildContext.getBuildDefinitionLabel(),
+ buildContext.getScmResult(),
+ buildContext.getProjectGroupId() );
buildProjectTask.setMaxExecutionTime( buildContext.getMaxExecutionTime() * 1000 );
try
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/ExecuteBuilderAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/ExecuteBuilderAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/ExecuteBuilderAction.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/ExecuteBuilderAction.java Mon Aug 13 04:29:09 2012
@@ -19,10 +19,6 @@ package org.apache.continuum.buildagent.
* under the License.
*/
-import java.io.File;
-import java.util.Date;
-import java.util.Map;
-
import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildCancelledException;
import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutionResult;
import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutor;
@@ -35,6 +31,10 @@ import org.apache.maven.continuum.model.
import org.apache.maven.continuum.project.ContinuumProjectState;
import org.codehaus.plexus.action.AbstractAction;
+import java.io.File;
+import java.util.Date;
+import java.util.Map;
+
/**
* @plexus.component role="org.codehaus.plexus.action.Action" role-hint="execute-agent-builder"
*/
@@ -57,7 +57,7 @@ public class ExecuteBuilderAction
// ----------------------------------------------------------------------
// Get parameters from the context
// ----------------------------------------------------------------------
-
+
Project project = ContinuumBuildAgentUtil.getProject( context );
BuildDefinition buildDefinition = ContinuumBuildAgentUtil.getBuildDefinition( context );
@@ -67,11 +67,12 @@ public class ExecuteBuilderAction
String localRepository = ContinuumBuildAgentUtil.getLocalRepository( context );
int trigger = ContinuumBuildAgentUtil.getTrigger( context );
-
+
String username = ContinuumBuildAgentUtil.getUsername( context );
- ContinuumAgentBuildExecutor buildExecutor = buildAgentBuildExecutorManager.getBuildExecutor( project.getExecutorId() );
-
+ ContinuumAgentBuildExecutor buildExecutor = buildAgentBuildExecutorManager.getBuildExecutor(
+ project.getExecutorId() );
+
// ----------------------------------------------------------------------
// Make the buildResult
// ----------------------------------------------------------------------
@@ -83,7 +84,7 @@ public class ExecuteBuilderAction
buildResult.setState( ContinuumProjectState.BUILDING );
buildResult.setTrigger( trigger );
-
+
buildResult.setUsername( username );
buildResult.setBuildDefinition( buildDefinition );
@@ -107,7 +108,7 @@ public class ExecuteBuilderAction
catch ( ContinuumAgentBuildCancelledException e )
{
getLogger().info( "Cancelled build" );
-
+
buildResult.setState( ContinuumProjectState.CANCELLED );
}
catch ( Throwable e )
@@ -123,9 +124,9 @@ public class ExecuteBuilderAction
buildResult.setEndTime( new Date().getTime() );
if ( buildResult.getState() != ContinuumProjectState.OK &&
- buildResult.getState() != ContinuumProjectState.FAILED &&
- buildResult.getState() != ContinuumProjectState.ERROR &&
- buildResult.getState() != ContinuumProjectState.CANCELLED )
+ buildResult.getState() != ContinuumProjectState.FAILED &&
+ buildResult.getState() != ContinuumProjectState.ERROR &&
+ buildResult.getState() != ContinuumProjectState.CANCELLED )
{
buildResult.setState( ContinuumProjectState.ERROR );
}
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/UpdateProjectFromWorkingDirectoryAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/UpdateProjectFromWorkingDirectoryAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/UpdateProjectFromWorkingDirectoryAction.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/UpdateProjectFromWorkingDirectoryAction.java Mon Aug 13 04:29:09 2012
@@ -19,9 +19,6 @@ package org.apache.continuum.buildagent.
* under the License.
*/
-import java.io.File;
-import java.util.Map;
-
import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutor;
import org.apache.continuum.buildagent.build.execution.manager.BuildAgentBuildExecutorManager;
import org.apache.continuum.buildagent.configuration.BuildAgentConfigurationService;
@@ -32,6 +29,9 @@ import org.codehaus.plexus.action.Abstra
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.util.Map;
+
/**
* @plexus.component role="org.codehaus.plexus.action.Action"
* role-hint="update-project-from-agent-working-directory"
@@ -62,8 +62,8 @@ public class UpdateProjectFromWorkingDir
File workingDirectory = buildAgentConfigurationService.getWorkingDirectory( project.getId() );
- ContinuumAgentBuildExecutor buildExecutor =
- buildAgentBuildExecutorManager.getBuildExecutor( project.getExecutorId() );
+ ContinuumAgentBuildExecutor buildExecutor = buildAgentBuildExecutorManager.getBuildExecutor(
+ project.getExecutorId() );
buildExecutor.updateProjectFromWorkingDirectory( workingDirectory, project, buildDefinition );
}
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/UpdateWorkingDirectoryAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/UpdateWorkingDirectoryAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/UpdateWorkingDirectoryAction.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/UpdateWorkingDirectoryAction.java Mon Aug 13 04:29:09 2012
@@ -19,12 +19,6 @@ package org.apache.continuum.buildagent.
* under the License.
*/
-import java.io.File;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
import org.apache.continuum.buildagent.configuration.BuildAgentConfigurationService;
import org.apache.continuum.buildagent.utils.ContinuumBuildAgentUtil;
import org.apache.continuum.scm.ContinuumScm;
@@ -41,6 +35,12 @@ import org.apache.maven.scm.manager.NoSu
import org.apache.maven.scm.repository.ScmRepositoryException;
import org.codehaus.plexus.action.AbstractAction;
+import java.io.File;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
/**
* @plexus.component role="org.codehaus.plexus.action.Action" role-hint="update-agent-working-directory"
*/
@@ -65,7 +65,7 @@ public class UpdateWorkingDirectoryActio
UpdateScmResult scmResult;
ScmResult result;
-
+
try
{
File workingDirectory = buildAgentConfigurationService.getWorkingDirectory( project.getId() );
@@ -100,8 +100,8 @@ public class UpdateWorkingDirectoryActio
result.setSuccess( false );
result.setProviderMessage( e.getMessage() + ": " + getValidationMessages( e ) );
-
- getLogger().error( e.getMessage(), e);
+
+ getLogger().error( e.getMessage(), e );
}
catch ( NoSuchScmProviderException e )
{
@@ -111,8 +111,8 @@ public class UpdateWorkingDirectoryActio
result.setSuccess( false );
result.setProviderMessage( e.getMessage() );
-
- getLogger().error( e.getMessage(), e);
+
+ getLogger().error( e.getMessage(), e );
}
catch ( ScmException e )
{
@@ -121,8 +121,8 @@ public class UpdateWorkingDirectoryActio
result.setSuccess( false );
result.setException( ContinuumBuildAgentUtil.throwableMessagesToString( e ) );
-
- getLogger().error( e.getMessage(), e);
+
+ getLogger().error( e.getMessage(), e );
}
context.put( ContinuumBuildAgentUtil.KEY_UPDATE_SCM_RESULT, result );
@@ -143,8 +143,9 @@ public class UpdateWorkingDirectoryActio
config.setUrl( project.getScmUrl() );
// CONTINUUM-2628
- config = ContinuumScmUtils.setSCMCredentialsforSSH( config, project.getScmUrl(), project.getScmUsername(), project.getScmPassword() );
-
+ config = ContinuumScmUtils.setSCMCredentialsforSSH( config, project.getScmUrl(), project.getScmUsername(),
+ project.getScmPassword() );
+
config.setUseCredentialsCache( project.isScmUseCache() );
config.setWorkingDirectory( workingDirectory );
config.setTag( project.getScmTag() );
@@ -255,7 +256,7 @@ public class UpdateWorkingDirectoryActio
return cmd;
}
-
+
private String getValidationMessages( ScmRepositoryException ex )
{
List<String> messages = ex.getValidationMessages();
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java Mon Aug 13 04:29:09 2012
@@ -19,14 +19,6 @@ package org.apache.continuum.buildagent.
* under the License.
*/
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
import org.apache.continuum.buildagent.configuration.BuildAgentConfigurationService;
import org.apache.continuum.buildagent.installation.BuildAgentInstallationService;
import org.apache.continuum.buildagent.manager.BuildAgentManager;
@@ -49,6 +41,14 @@ import org.codehaus.plexus.util.cli.Comm
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
public abstract class AbstractBuildExecutor
implements ContinuumAgentBuildExecutor, Initializable
{
@@ -167,7 +167,7 @@ public abstract class AbstractBuildExecu
if ( StringUtils.isEmpty( defaultExecutable ) )
{
log.warn( "The default executable for build executor '" + id + "' is not set. " +
- "This will cause a problem unless the project has a executable configured." );
+ "This will cause a problem unless the project has a executable configured." );
}
else
{
@@ -181,7 +181,7 @@ public abstract class AbstractBuildExecu
else
{
log.info( "Resolved the executable '" + defaultExecutable + "' to " + "'" +
- resolvedExecutable.getAbsolutePath() + "'." );
+ resolvedExecutable.getAbsolutePath() + "'." );
}
}
}
@@ -267,9 +267,9 @@ public abstract class AbstractBuildExecu
try
{
- ExecutionResult result =
- getShellCommandHelper().executeShellCommand( workingDirectory, actualExecutable, arguments, output,
- project.getId(), environments );
+ ExecutionResult result = getShellCommandHelper().executeShellCommand( workingDirectory, actualExecutable,
+ arguments, output, project.getId(),
+ environments );
log.info( "Exit code: " + result.getExitCode() );
@@ -385,10 +385,10 @@ public abstract class AbstractBuildExecu
projectMap.put( ContinuumBuildAgentUtil.KEY_PROJECT_URL, "" );
}
projectMap.put( ContinuumBuildAgentUtil.KEY_PROJECT_PARENT, getProjectParent( project.getParent() ) );
- projectMap.put( ContinuumBuildAgentUtil.KEY_PROJECT_DEVELOPERS,
- getProjectDevelopers( project.getDevelopers() ) );
- projectMap.put( ContinuumBuildAgentUtil.KEY_PROJECT_DEPENDENCIES,
- getProjectDependencies( project.getDependencies() ) );
+ projectMap.put( ContinuumBuildAgentUtil.KEY_PROJECT_DEVELOPERS, getProjectDevelopers(
+ project.getDevelopers() ) );
+ projectMap.put( ContinuumBuildAgentUtil.KEY_PROJECT_DEPENDENCIES, getProjectDependencies(
+ project.getDependencies() ) );
projectMap.put( ContinuumBuildAgentUtil.KEY_PROJECT_NOTIFIERS, getProjectNotifiers( project.getNotifiers() ) );
try
@@ -421,15 +421,15 @@ public abstract class AbstractBuildExecu
}
if ( StringUtils.isNotEmpty( developer.getEmail() ) )
{
- map.put( ContinuumBuildAgentUtil.KEY_PROJECT_DEVELOPER_EMAIL, developer.getEmail() );
+ map.put( ContinuumBuildAgentUtil.KEY_PROJECT_DEVELOPER_EMAIL, developer.getEmail() );
}
else
{
- map.put( ContinuumBuildAgentUtil.KEY_PROJECT_DEVELOPER_EMAIL, "" );
+ map.put( ContinuumBuildAgentUtil.KEY_PROJECT_DEVELOPER_EMAIL, "" );
}
if ( StringUtils.isNotEmpty( developer.getScmId() ) )
{
- map.put( ContinuumBuildAgentUtil.KEY_PROJECT_DEVELOPER_SCMID, developer.getScmId() );
+ map.put( ContinuumBuildAgentUtil.KEY_PROJECT_DEVELOPER_SCMID, developer.getScmId() );
}
else
{
@@ -550,7 +550,7 @@ public abstract class AbstractBuildExecu
map.put( ContinuumBuildAgentUtil.KEY_NOTIFIER_SEND_ON_FAILURE, notifier.isSendOnFailure() );
map.put( ContinuumBuildAgentUtil.KEY_NOTIFIER_SEND_ON_SCMFAILURE, notifier.isSendOnScmFailure() );
map.put( ContinuumBuildAgentUtil.KEY_NOTIFIER_SEND_ON_WARNING, notifier.isSendOnWarning() );
- pNotifiers.add(map);
+ pNotifiers.add( map );
}
}
return pNotifiers;
@@ -558,8 +558,8 @@ public abstract class AbstractBuildExecu
public boolean isBuilding( Project project )
{
- return project.getState() == ContinuumProjectState.BUILDING ||
- getShellCommandHelper().isRunning( project.getId() );
+ return project.getState() == ContinuumProjectState.BUILDING || getShellCommandHelper().isRunning(
+ project.getId() );
}
public void killProcess( Project project )
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutor.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutor.java Mon Aug 13 04:29:09 2012
@@ -19,15 +19,15 @@ package org.apache.continuum.buildagent.
* under the License.
*/
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.project.MavenProject;
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
public interface ContinuumAgentBuildExecutor
{
String ROLE = ContinuumAgentBuildExecutor.class.getName();
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ant/AntBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ant/AntBuildExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ant/AntBuildExecutor.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ant/AntBuildExecutor.java Mon Aug 13 04:29:09 2012
@@ -19,11 +19,6 @@ package org.apache.continuum.buildagent.
* under the License.
*/
-import java.io.File;
-import java.util.Enumeration;
-import java.util.Map;
-import java.util.Properties;
-
import org.apache.continuum.buildagent.build.execution.AbstractBuildExecutor;
import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildCancelledException;
import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutionResult;
@@ -35,8 +30,13 @@ import org.apache.maven.continuum.model.
import org.apache.maven.continuum.model.project.Project;
import org.codehaus.plexus.util.StringUtils;
+import java.io.File;
+import java.util.Enumeration;
+import java.util.Map;
+import java.util.Properties;
+
public class AntBuildExecutor
- extends AbstractBuildExecutor
+ extends AbstractBuildExecutor
implements ContinuumAgentBuildExecutor
{
public static final String CONFIGURATION_EXECUTABLE = "executable";
@@ -50,25 +50,24 @@ public class AntBuildExecutor
super( ID, true );
}
- public ContinuumAgentBuildExecutionResult build( Project project, BuildDefinition buildDefinition,
- File buildOutput, Map<String, String> environments,
- String localRepository )
+ public ContinuumAgentBuildExecutionResult build( Project project, BuildDefinition buildDefinition, File buildOutput,
+ Map<String, String> environments, String localRepository )
throws ContinuumAgentBuildExecutorException, ContinuumAgentBuildCancelledException
{
- String executable = getBuildAgentInstallationService().getExecutorConfigurator( BuildAgentInstallationService.ANT_TYPE )
- .getExecutable();
+ String executable = getBuildAgentInstallationService().getExecutorConfigurator(
+ BuildAgentInstallationService.ANT_TYPE ).getExecutable();
StringBuffer arguments = new StringBuffer();
-
+
String buildFile = getBuildFileForProject( buildDefinition );
-
+
if ( !StringUtils.isEmpty( buildFile ) )
{
arguments.append( "-f " ).append( buildFile ).append( " " );
}
-
+
arguments.append( StringUtils.clean( buildDefinition.getArguments() ) ).append( " " );
-
+
Properties props = getContinuumSystemProperties( project );
for ( Enumeration itr = props.propertyNames(); itr.hasMoreElements(); )
{
@@ -83,7 +82,8 @@ public class AntBuildExecutor
if ( environments != null )
{
- antHome = environments.get( getBuildAgentInstallationService().getEnvVar( BuildAgentInstallationService.ANT_TYPE ) );
+ antHome = environments.get( getBuildAgentInstallationService().getEnvVar(
+ BuildAgentInstallationService.ANT_TYPE ) );
}
if ( StringUtils.isNotEmpty( antHome ) )
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildAgentBuildExecutorManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildAgentBuildExecutorManager.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildAgentBuildExecutorManager.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildAgentBuildExecutorManager.java Mon Aug 13 04:29:09 2012
@@ -19,14 +19,14 @@ package org.apache.continuum.buildagent.
* under the License.
*/
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutor;
import org.apache.maven.continuum.ContinuumException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* @plexus.component role="org.apache.continuum.buildagent.build.execution.manager.BuildAgentBuildExecutorManager"
* role-hint"default"
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/BuildAgentMavenOneMetadataHelper.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/BuildAgentMavenOneMetadataHelper.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/BuildAgentMavenOneMetadataHelper.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/BuildAgentMavenOneMetadataHelper.java Mon Aug 13 04:29:09 2012
@@ -19,11 +19,11 @@ package org.apache.continuum.buildagent.
* under the License.
*/
-import java.io.File;
-
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
+import java.io.File;
+
public interface BuildAgentMavenOneMetadataHelper
{
String ROLE = BuildAgentMavenOneMetadataHelper.class.getName();
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/DefaultBuildAgentMavenOneMetadataHelper.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/DefaultBuildAgentMavenOneMetadataHelper.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/DefaultBuildAgentMavenOneMetadataHelper.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/DefaultBuildAgentMavenOneMetadataHelper.java Mon Aug 13 04:29:09 2012
@@ -19,14 +19,6 @@ package org.apache.continuum.buildagent.
* under the License.
*/
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.project.ProjectDependency;
import org.apache.maven.continuum.model.project.ProjectDeveloper;
@@ -39,6 +31,14 @@ import org.codehaus.plexus.util.xml.pull
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
/**
* @plexus.component role="org.apache.continuum.buildagent.build.execution.maven.m1.BuildAgentMavenOneMetadataHelper" role-hint="default"
*/
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/MavenOneBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/MavenOneBuildExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/MavenOneBuildExecutor.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/MavenOneBuildExecutor.java Mon Aug 13 04:29:09 2012
@@ -19,13 +19,6 @@ package org.apache.continuum.buildagent.
* under the License.
*/
-import java.io.File;
-import java.util.Enumeration;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.annotation.Resource;
-
import org.apache.continuum.buildagent.build.execution.AbstractBuildExecutor;
import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildCancelledException;
import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutionResult;
@@ -38,6 +31,12 @@ import org.apache.maven.continuum.model.
import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
import org.codehaus.plexus.util.StringUtils;
+import java.io.File;
+import java.util.Enumeration;
+import java.util.Map;
+import java.util.Properties;
+import javax.annotation.Resource;
+
public class MavenOneBuildExecutor
extends AbstractBuildExecutor
implements ContinuumAgentBuildExecutor
@@ -54,25 +53,24 @@ public class MavenOneBuildExecutor
super( ID, true );
}
- public ContinuumAgentBuildExecutionResult build( Project project, BuildDefinition buildDefinition,
- File buildOutput, Map<String, String> environments,
- String localRepository )
+ public ContinuumAgentBuildExecutionResult build( Project project, BuildDefinition buildDefinition, File buildOutput,
+ Map<String, String> environments, String localRepository )
throws ContinuumAgentBuildExecutorException, ContinuumAgentBuildCancelledException
{
- String executable = getBuildAgentInstallationService().getExecutorConfigurator( BuildAgentInstallationService.MAVEN1_TYPE )
- .getExecutable();
-
+ String executable = getBuildAgentInstallationService().getExecutorConfigurator(
+ BuildAgentInstallationService.MAVEN1_TYPE ).getExecutable();
+
StringBuffer arguments = new StringBuffer();
-
+
String buildFile = getBuildFileForProject( buildDefinition );
-
+
if ( !StringUtils.isEmpty( buildFile ) && !"project.xml".equals( buildFile ) )
{
arguments.append( "-p " ).append( buildFile ).append( " " );
}
-
+
arguments.append( StringUtils.clean( buildDefinition.getArguments() ) ).append( " " );
-
+
Properties props = getContinuumSystemProperties( project );
for ( Enumeration itr = props.propertyNames(); itr.hasMoreElements(); )
{
@@ -92,13 +90,14 @@ public class MavenOneBuildExecutor
if ( environments != null )
{
- m1Home = environments.get( getBuildAgentInstallationService().getEnvVar( BuildAgentInstallationService.MAVEN1_TYPE ) );
+ m1Home = environments.get( getBuildAgentInstallationService().getEnvVar(
+ BuildAgentInstallationService.MAVEN1_TYPE ) );
}
if ( StringUtils.isNotEmpty( m1Home ) )
{
executable = m1Home + File.separator + "bin" + File.separator + executable;
- setResolveExecutable( false );
+ setResolveExecutable( false );
}
return executeShellCommand( project, executable, arguments.toString(), buildOutput, environments );
@@ -133,12 +132,13 @@ public class MavenOneBuildExecutor
try
{
ContinuumProjectBuildingResult result = new ContinuumProjectBuildingResult();
-
+
buildAgentMavenOneMetadataHelper.mapMetadata( result, projectXmlFile, project );
if ( result.hasErrors() )
{
- throw new ContinuumAgentBuildExecutorException( "Error while mapping metadata:" + result.getErrorsAsString() );
+ throw new ContinuumAgentBuildExecutorException(
+ "Error while mapping metadata:" + result.getErrorsAsString() );
}
updateProject( project );
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/BuildAgentMavenBuilderHelper.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/BuildAgentMavenBuilderHelper.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/BuildAgentMavenBuilderHelper.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/BuildAgentMavenBuilderHelper.java Mon Aug 13 04:29:09 2012
@@ -19,12 +19,12 @@ package org.apache.continuum.buildagent.
* under the License.
*/
-import java.io.File;
-
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
import org.apache.maven.project.MavenProject;
+import java.io.File;
+
public interface BuildAgentMavenBuilderHelper
{
String ROLE = BuildAgentMavenBuilderHelper.class.getName();
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultBuildAgentMavenBuilderHelper.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultBuildAgentMavenBuilderHelper.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultBuildAgentMavenBuilderHelper.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultBuildAgentMavenBuilderHelper.java Mon Aug 13 04:29:09 2012
@@ -19,12 +19,6 @@ package org.apache.continuum.buildagent.
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
@@ -73,6 +67,12 @@ import org.codehaus.plexus.util.xml.pull
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @plexus.component role="org.apache.continuum.buildagent.build.execution.maven.m2.BuildAgentMavenBuilderHelper"
* role-hint="default"
@@ -214,8 +214,8 @@ public class DefaultBuildAgentMavenBuild
{
result.addError( ContinuumProjectBuildingResult.ERROR_MISSING_SCM_CONNECTION, getProjectName( project ) );
- log.error(
- "Missing 'connection' element in the 'scm' element in the " + getProjectName( project ) + " POM." );
+ log.error( "Missing 'connection' element in the 'scm' element in the " + getProjectName( project ) +
+ " POM." );
return null;
}
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/MavenTwoBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/MavenTwoBuildExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/MavenTwoBuildExecutor.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/MavenTwoBuildExecutor.java Mon Aug 13 04:29:09 2012
@@ -19,13 +19,6 @@ package org.apache.continuum.buildagent.
* under the License.
*/
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
import org.apache.continuum.buildagent.build.execution.AbstractBuildExecutor;
import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildCancelledException;
import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutionResult;
@@ -43,6 +36,13 @@ import org.apache.maven.project.MavenPro
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
import org.codehaus.plexus.util.StringUtils;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
public class MavenTwoBuildExecutor
extends AbstractBuildExecutor
implements ContinuumAgentBuildExecutor
@@ -86,25 +86,24 @@ public class MavenTwoBuildExecutor
this.buildAgentMavenBuilderHelper = builderHelper;
}
- public ContinuumAgentBuildExecutionResult build( Project project, BuildDefinition buildDefinition,
- File buildOutput, Map<String, String> environments,
- String localRepository )
+ public ContinuumAgentBuildExecutionResult build( Project project, BuildDefinition buildDefinition, File buildOutput,
+ Map<String, String> environments, String localRepository )
throws ContinuumAgentBuildExecutorException, ContinuumAgentBuildCancelledException
{
- String executable = getBuildAgentInstallationService().getExecutorConfigurator( BuildAgentInstallationService.MAVEN2_TYPE )
- .getExecutable();
+ String executable = getBuildAgentInstallationService().getExecutorConfigurator(
+ BuildAgentInstallationService.MAVEN2_TYPE ).getExecutable();
StringBuffer arguments = new StringBuffer();
-
+
String buildFile = getBuildFileForProject( buildDefinition );
-
+
if ( !StringUtils.isEmpty( buildFile ) && !"pom.xml".equals( buildFile ) )
{
arguments.append( "-f " ).append( buildFile ).append( " " );
}
-
+
arguments.append( StringUtils.clean( buildDefinition.getArguments() ) ).append( " " );
-
+
Properties props = getContinuumSystemProperties( project );
for ( Enumeration itr = props.propertyNames(); itr.hasMoreElements(); )
{
@@ -124,7 +123,8 @@ public class MavenTwoBuildExecutor
if ( environments != null )
{
- m2Home = environments.get( getBuildAgentInstallationService().getEnvVar( BuildAgentInstallationService.MAVEN2_TYPE ) );
+ m2Home = environments.get( getBuildAgentInstallationService().getEnvVar(
+ BuildAgentInstallationService.MAVEN2_TYPE ) );
}
if ( StringUtils.isNotEmpty( m2Home ) )
@@ -138,7 +138,7 @@ public class MavenTwoBuildExecutor
@Override
public List<Artifact> getDeployableArtifacts( Project continuumProject, File workingDirectory,
- BuildDefinition buildDefinition )
+ BuildDefinition buildDefinition )
throws ContinuumAgentBuildExecutorException
{
MavenProject project = getMavenProject( workingDirectory, buildDefinition );
@@ -231,23 +231,25 @@ public class MavenTwoBuildExecutor
return artifacts;
}
- public void updateProjectFromWorkingDirectory( File workingDirectory, Project project, BuildDefinition buildDefinition )
+ public void updateProjectFromWorkingDirectory( File workingDirectory, Project project,
+ BuildDefinition buildDefinition )
throws ContinuumAgentBuildExecutorException
{
File f = getPomFile( getBuildFileForProject( buildDefinition ), workingDirectory );
-
+
if ( !f.exists() )
{
throw new ContinuumAgentBuildExecutorException( "Could not find Maven project descriptor." );
}
-
+
ContinuumProjectBuildingResult result = new ContinuumProjectBuildingResult();
-
+
buildAgentMavenBuilderHelper.mapMetadataToProject( result, f, project );
-
+
if ( result.hasErrors() )
{
- throw new ContinuumAgentBuildExecutorException( "Error while mapping metadata:" + result.getErrorsAsString() );
+ throw new ContinuumAgentBuildExecutorException(
+ "Error while mapping metadata:" + result.getErrorsAsString() );
}
else
{
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/SettingsConfigurationException.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/SettingsConfigurationException.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/SettingsConfigurationException.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/SettingsConfigurationException.java Mon Aug 13 04:29:09 2012
@@ -21,34 +21,34 @@ package org.apache.continuum.buildagent.
public class SettingsConfigurationException
extends Exception
- {
+{
private int lineNumber;
-
+
private int columnNumber;
-
+
public SettingsConfigurationException( String message )
{
super( message );
}
-
+
public SettingsConfigurationException( String message, Throwable cause )
{
super( message, cause );
}
-
+
public SettingsConfigurationException( String message, Throwable cause, int lineNumber, int columnNumber )
{
super( message + ( lineNumber > 0 ? "\n Line: " + lineNumber : "" ) +
- ( columnNumber > 0 ? "\n Column: " + columnNumber : "" ), cause );
+ ( columnNumber > 0 ? "\n Column: " + columnNumber : "" ), cause );
this.lineNumber = lineNumber;
this.columnNumber = columnNumber;
}
-
+
public int getColumnNumber()
{
return columnNumber;
}
-
+
public int getLineNumber()
{
return lineNumber;
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/shell/ShellBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/shell/ShellBuildExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/shell/ShellBuildExecutor.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/shell/ShellBuildExecutor.java Mon Aug 13 04:29:09 2012
@@ -19,9 +19,6 @@ package org.apache.continuum.buildagent.
* under the License.
*/
-import java.io.File;
-import java.util.Map;
-
import org.apache.continuum.buildagent.build.execution.AbstractBuildExecutor;
import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildCancelledException;
import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutionResult;
@@ -31,6 +28,9 @@ import org.apache.maven.continuum.execut
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.Project;
+import java.io.File;
+import java.util.Map;
+
public class ShellBuildExecutor
extends AbstractBuildExecutor
implements ContinuumAgentBuildExecutor
@@ -44,9 +44,8 @@ public class ShellBuildExecutor
super( ID, false );
}
- public ContinuumAgentBuildExecutionResult build( Project project, BuildDefinition buildDefinition,
- File buildOutput, Map<String, String> environments,
- String localRepository )
+ public ContinuumAgentBuildExecutionResult build( Project project, BuildDefinition buildDefinition, File buildOutput,
+ Map<String, String> environments, String localRepository )
throws ContinuumAgentBuildExecutorException, ContinuumAgentBuildCancelledException
{
String executable = getBuildFileForProject( buildDefinition );