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 [3/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-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivator.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivator.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivator.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivator.java Mon Aug 13 04:29:09 2012
@@ -48,10 +48,10 @@ public interface SchedulesActivator
*/
void activateSchedule( Schedule schedule, Continuum continuum )
throws SchedulesActivationException;
-
+
/**
* Activate schedule only for PurgeConfiguration associated.
- *
+ *
* @throws SchedulesActivationException
*/
void activatePurgeSchedule( Schedule schedule, Continuum continuum )
@@ -59,7 +59,7 @@ public interface SchedulesActivator
/**
* Activate schedule only for BuildDefinitions associated.
- *
+ *
* @throws SchedulesActivationException
*/
void activateBuildSchedule( Schedule schedule, Continuum continuum )
@@ -81,7 +81,7 @@ public interface SchedulesActivator
/**
* Unactivate schedule buildDefinitions if it is not in a buildDefinition.
- *
+ *
* @throws SchedulesActivationException
*/
void unactivateOrphanBuildSchedule( Schedule schedule )
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/builddefinition/BuildDefinitionService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/builddefinition/BuildDefinitionService.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/builddefinition/BuildDefinitionService.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/builddefinition/BuildDefinitionService.java Mon Aug 13 04:29:09 2012
@@ -18,34 +18,36 @@
*/
package org.apache.maven.continuum.builddefinition;
-import java.util.List;
-
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.BuildDefinitionTemplate;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.project.ProjectGroup;
import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
+import java.util.List;
+
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
- * @since 15 sept. 07
* @version $Id$
+ * @since 15 sept. 07
*/
public interface BuildDefinitionService
{
-
+
/**
* @param buildDefinitionId
* @return null if not in store
* @throws BuildDefinitionServiceException
+ *
*/
BuildDefinition getBuildDefinition( int buildDefinitionId )
throws BuildDefinitionServiceException;
-
- /**
- * @return List<BuildDefinition> all build defintions
- * @throws BuildDefinitionServiceException
- */
+
+ /**
+ * @return List<BuildDefinition> all build defintions
+ * @throws BuildDefinitionServiceException
+ *
+ */
List<BuildDefinition> getAllBuildDefinitions()
throws BuildDefinitionServiceException;
@@ -59,22 +61,22 @@ public interface BuildDefinitionService
throws BuildDefinitionServiceException;
List<BuildDefinition> getAllTemplates()
- throws BuildDefinitionServiceException;
-
+ throws BuildDefinitionServiceException;
+
/**
* @param buildDefinition
* @return clone of {@link BuildDefinition} template/continuumDefault set to false
*/
BuildDefinition cloneBuildDefinition( BuildDefinition buildDefinition );
-
+
// ------------------------------------------------------
// BuildDefinitionTemplate
// ------------------------------------------------------
void addTemplateInProject( int buildDefinitionTemplateId, Project project )
throws BuildDefinitionServiceException;
-
-
+
+
List<BuildDefinitionTemplate> getAllBuildDefinitionTemplate()
throws BuildDefinitionServiceException;
@@ -115,7 +117,7 @@ public interface BuildDefinitionService
public List<BuildDefinitionTemplate> getBuildDefinitionTemplatesWithType( String type )
throws BuildDefinitionServiceException;
-
+
public ProjectGroup addBuildDefinitionTemplateToProjectGroup( int projectGroupId,
BuildDefinitionTemplate buildDefinitionTemplate )
throws BuildDefinitionServiceException, ContinuumObjectNotFoundException;
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/builddefinition/BuildDefinitionServiceException.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/builddefinition/BuildDefinitionServiceException.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/builddefinition/BuildDefinitionServiceException.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/builddefinition/BuildDefinitionServiceException.java Mon Aug 13 04:29:09 2012
@@ -20,16 +20,16 @@ package org.apache.maven.continuum.build
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
- * @since 15 sept. 07
* @version $Id$
+ * @since 15 sept. 07
*/
public class BuildDefinitionServiceException
extends Exception
{
- private static final long serialVersionUID = -399833410192238226L;
+ private static final long serialVersionUID = -399833410192238226L;
- /**
- *
+ /**
+ *
*/
public BuildDefinitionServiceException()
{
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationException.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationException.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationException.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationException.java Mon Aug 13 04:29:09 2012
@@ -26,9 +26,9 @@ package org.apache.maven.continuum.confi
public class ConfigurationException
extends Exception
{
- private static final long serialVersionUID = 5598659641431851660L;
+ private static final long serialVersionUID = 5598659641431851660L;
- public ConfigurationException( String message )
+ public ConfigurationException( String message )
{
super( message );
}
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationLoadingException.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationLoadingException.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationLoadingException.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationLoadingException.java Mon Aug 13 04:29:09 2012
@@ -26,9 +26,9 @@ package org.apache.maven.continuum.confi
public class ConfigurationLoadingException
extends Exception
{
- private static final long serialVersionUID = -8836376517389252165L;
+ private static final long serialVersionUID = -8836376517389252165L;
- public ConfigurationLoadingException( String message )
+ public ConfigurationLoadingException( String message )
{
super( message );
}
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java Mon Aug 13 04:29:09 2012
@@ -126,13 +126,13 @@ public interface ConfigurationService
void removeBuildAgent( BuildAgentGroupConfiguration buildAgentGroup, BuildAgentConfiguration buildAgent )
throws ConfigurationException;
- BuildAgentGroupConfiguration getBuildAgentGroup(String name);
+ BuildAgentGroupConfiguration getBuildAgentGroup( String name );
- BuildAgentConfiguration getBuildAgent(String url);
+ BuildAgentConfiguration getBuildAgent( String url );
List<BuildAgentGroupConfiguration> getBuildAgentGroups();
- boolean containsBuildAgentUrl(String buildAgentUrl, BuildAgentGroupConfiguration buildAgentGroup );
+ boolean containsBuildAgentUrl( String buildAgentUrl, BuildAgentGroupConfiguration buildAgentGroup );
void setSharedSecretPassword( String sharedSecretPassword );
@@ -157,5 +157,6 @@ public interface ConfigurationService
throws ConfigurationStoringException, ContinuumConfigurationException;
Schedule getDefaultSchedule()
- throws ContinuumStoreException, ConfigurationLoadingException, ContinuumConfigurationException, BuildQueueServiceException;
+ throws ContinuumStoreException, ConfigurationLoadingException, ContinuumConfigurationException,
+ BuildQueueServiceException;
}
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationStoringException.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationStoringException.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationStoringException.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationStoringException.java Mon Aug 13 04:29:09 2012
@@ -26,9 +26,9 @@ package org.apache.maven.continuum.confi
public class ConfigurationStoringException
extends Exception
{
- private static final long serialVersionUID = -421385426351064628L;
+ private static final long serialVersionUID = -421385426351064628L;
- public ConfigurationStoringException( String message )
+ public ConfigurationStoringException( String message )
{
super( message );
}
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildCancelledException.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildCancelledException.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildCancelledException.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildCancelledException.java Mon Aug 13 04:29:09 2012
@@ -26,9 +26,9 @@ package org.apache.maven.continuum.execu
public class ContinuumBuildCancelledException
extends ContinuumBuildExecutorException
{
- private static final long serialVersionUID = 6658199253278756183L;
+ private static final long serialVersionUID = 6658199253278756183L;
- public ContinuumBuildCancelledException( String message )
+ public ContinuumBuildCancelledException( String message )
{
super( message );
}
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java Mon Aug 13 04:29:09 2012
@@ -37,9 +37,10 @@ public interface ContinuumBuildExecutor
String ROLE = ContinuumBuildExecutor.class.getName();
// TODO: stream the build output
- ContinuumBuildExecutionResult build( Project project, BuildDefinition buildDefinition, File buildOutput, List<Project> projectsWithCommonScmRoot, String projectScmRootUrl )
+ ContinuumBuildExecutionResult build( Project project, BuildDefinition buildDefinition, File buildOutput,
+ List<Project> projectsWithCommonScmRoot, String projectScmRootUrl )
throws ContinuumBuildExecutorException;
-
+
// TODO: rename to be clearer
void updateProjectFromCheckOut( File workingDirectory, Project project, BuildDefinition buildDefinition,
ScmResult scmResult )
@@ -54,7 +55,8 @@ public interface ContinuumBuildExecutor
throws ContinuumBuildExecutorException;
//TODO: Move as a plugin
- void backupTestFiles( Project project, int buildId, String projectScmRootUrl, List<Project> projectsWithCommonScmRoot );
+ void backupTestFiles( Project project, int buildId, String projectScmRootUrl,
+ List<Project> projectsWithCommonScmRoot );
boolean shouldBuild( List<ChangeSet> changes, Project continuumProject, File workingDirectory,
BuildDefinition buildDefinition )
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorConstants.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorConstants.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorConstants.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorConstants.java Mon Aug 13 04:29:09 2012
@@ -21,18 +21,18 @@ package org.apache.maven.continuum.execu
/**
* @author <a href="mailto:olamy at apache.org">olamy</a>
- * @since 11 sept. 07
* @version $Id$
+ * @since 11 sept. 07
*/
public class ContinuumBuildExecutorConstants
{
-
+
public static final String MAVEN_TWO_BUILD_EXECUTOR = "maven2";
-
+
public static final String MAVEN_ONE_BUILD_EXECUTOR = "maven-1";
-
+
public static final String ANT_BUILD_EXECUTOR = "ant";
-
+
public static final String SHELL_BUILD_EXECUTOR = "shell";
}
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorException.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorException.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorException.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorException.java Mon Aug 13 04:29:09 2012
@@ -26,9 +26,9 @@ package org.apache.maven.continuum.execu
public class ContinuumBuildExecutorException
extends Exception
{
- private static final long serialVersionUID = 8536807061085844707L;
+ private static final long serialVersionUID = 8536807061085844707L;
- public ContinuumBuildExecutorException( String message )
+ public ContinuumBuildExecutorException( String message )
{
super( message );
}
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/initialization/ContinuumInitializationException.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/initialization/ContinuumInitializationException.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/initialization/ContinuumInitializationException.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/initialization/ContinuumInitializationException.java Mon Aug 13 04:29:09 2012
@@ -26,9 +26,9 @@ package org.apache.maven.continuum.initi
public class ContinuumInitializationException
extends Exception
{
- private static final long serialVersionUID = 7629046230318917696L;
+ private static final long serialVersionUID = 7629046230318917696L;
- public ContinuumInitializationException( String message )
+ public ContinuumInitializationException( String message )
{
super( message );
}
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/installation/AlreadyExistsInstallationException.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/installation/AlreadyExistsInstallationException.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/installation/AlreadyExistsInstallationException.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/installation/AlreadyExistsInstallationException.java Mon Aug 13 04:29:09 2012
@@ -22,16 +22,15 @@ import org.apache.maven.continuum.Contin
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
- * @since 9 mai 2008
* @version $Id$
* @since 1.2
*/
public class AlreadyExistsInstallationException
extends ContinuumException
{
- private static final long serialVersionUID = -7673670059441370868L;
+ private static final long serialVersionUID = -7673670059441370868L;
- /**
+ /**
* @param message
*/
public AlreadyExistsInstallationException( String message )
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/installation/InstallationException.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/installation/InstallationException.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/installation/InstallationException.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/installation/InstallationException.java Mon Aug 13 04:29:09 2012
@@ -18,6 +18,7 @@ package org.apache.maven.continuum.insta
* specific language governing permissions and limitations
* under the License.
*/
+
/**
* @author <a href="mailto:olamy@codehaus.org">olamy</a>
* @version $Id$
@@ -26,9 +27,9 @@ package org.apache.maven.continuum.insta
public class InstallationException
extends Exception
{
- private static final long serialVersionUID = 5055136446336281496L;
+ private static final long serialVersionUID = 5055136446336281496L;
- public InstallationException( String message )
+ public InstallationException( String message )
{
super( message );
}
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/installation/InstallationService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/installation/InstallationService.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/installation/InstallationService.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/installation/InstallationService.java Mon Aug 13 04:29:09 2012
@@ -19,13 +19,13 @@ package org.apache.maven.continuum.insta
* under the License.
*/
-import java.util.List;
-
import org.apache.maven.continuum.execution.ExecutorConfigurator;
import org.apache.maven.continuum.model.system.Installation;
import org.apache.maven.continuum.model.system.Profile;
import org.apache.maven.continuum.profile.AlreadyExistsProfileException;
+import java.util.List;
+
/**
* @author <a href="mailto:olamy@codehaus.org">olamy</a>
* @version $Id$
@@ -96,7 +96,8 @@ public interface InstallationService
* @return the cli output of $path/ec.relativePath.ec.executable ec.versionArgument
* @throws InstallationException
*/
- public List<String> getExecutorConfiguratorVersion( String path, ExecutorConfigurator executorConfigurator, Profile profile )
+ public List<String> getExecutorConfiguratorVersion( String path, ExecutorConfigurator executorConfigurator,
+ Profile profile )
throws InstallationException;
}
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/profile/AlreadyExistsProfileException.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/profile/AlreadyExistsProfileException.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/profile/AlreadyExistsProfileException.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/profile/AlreadyExistsProfileException.java Mon Aug 13 04:29:09 2012
@@ -22,16 +22,15 @@ import org.apache.maven.continuum.Contin
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
- * @since 9 mai 2008
* @version $Id$
* @since 1.2
*/
public class AlreadyExistsProfileException
extends ContinuumException
{
- private static final long serialVersionUID = -3827218055154032672L;
+ private static final long serialVersionUID = -3827218055154032672L;
- /**
+ /**
* @param message
*/
public AlreadyExistsProfileException( String message )
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/profile/ProfileException.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/profile/ProfileException.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/profile/ProfileException.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/profile/ProfileException.java Mon Aug 13 04:29:09 2012
@@ -29,9 +29,9 @@ import org.apache.maven.continuum.Contin
public class ProfileException
extends ContinuumException
{
- private static final long serialVersionUID = 7775067763191224320L;
+ private static final long serialVersionUID = 7775067763191224320L;
- public ProfileException( String message, Throwable throwable )
+ public ProfileException( String message, Throwable throwable )
{
super( message, throwable );
}
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/profile/ProfileService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/profile/ProfileService.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/profile/ProfileService.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/profile/ProfileService.java Mon Aug 13 04:29:09 2012
@@ -1,10 +1,10 @@
package org.apache.maven.continuum.profile;
-import java.util.List;
-
import org.apache.maven.continuum.model.system.Installation;
import org.apache.maven.continuum.model.system.Profile;
+import java.util.List;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuilder.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuilder.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuilder.java Mon Aug 13 04:29:09 2012
@@ -19,10 +19,10 @@ package org.apache.maven.continuum.proje
* under the License.
*/
-import java.net.URL;
-
import org.apache.maven.continuum.model.project.BuildDefinitionTemplate;
+import java.net.URL;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuilderException.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuilderException.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuilderException.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuilderException.java Mon Aug 13 04:29:09 2012
@@ -26,9 +26,9 @@ package org.apache.maven.continuum.proje
public class ContinuumProjectBuilderException
extends Exception
{
- private static final long serialVersionUID = 2666582644236201183L;
+ private static final long serialVersionUID = 2666582644236201183L;
- public ContinuumProjectBuilderException( String message )
+ public ContinuumProjectBuilderException( String message )
{
super( message );
}
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuildingResult.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuildingResult.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuildingResult.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuildingResult.java Mon Aug 13 04:29:09 2012
@@ -19,15 +19,15 @@ package org.apache.maven.continuum.proje
* under the License.
*/
+import org.apache.maven.continuum.model.project.Project;
+import org.apache.maven.continuum.model.project.ProjectGroup;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.maven.continuum.model.project.Project;
-import org.apache.maven.continuum.model.project.ProjectGroup;
-
/**
* Holder for results of adding projects to Continuum. Contains added projects, project groups
* and errors that happened during the add.
@@ -66,8 +66,8 @@ public class ContinuumProjectBuildingRes
public static final String ERROR_MISSING_NOTIFIER_TYPE = "add.project.missing.notifier.type.error";
- public static final String ERROR_MISSING_NOTIFIER_CONFIGURATION = "add.project.missing.notifier.configuration.error"
- ;
+ public static final String ERROR_MISSING_NOTIFIER_CONFIGURATION =
+ "add.project.missing.notifier.configuration.error";
public static final String ERROR_METADATA_TRANSFER = "add.project.metadata.transfer.error";
@@ -92,7 +92,7 @@ public class ContinuumProjectBuildingRes
private final Map<String, String> errors = new HashMap<String, String>();
private static final String LS = System.getProperty( "line.separator" );
-
+
private Project rootProject;
public void addProject( Project project )
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseException.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseException.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseException.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseException.java Mon Aug 13 04:29:09 2012
@@ -26,9 +26,9 @@ package org.apache.maven.continuum.relea
public class ContinuumReleaseException
extends Exception
{
- private static final long serialVersionUID = 2167029372282426809L;
+ private static final long serialVersionUID = 2167029372282426809L;
- public ContinuumReleaseException( String id )
+ public ContinuumReleaseException( String id )
{
super( id );
}
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java Mon Aug 13 04:29:09 2012
@@ -78,13 +78,14 @@ public interface ContinuumReleaseManager
/**
* Perform a release based on a given releaseId
- * @deprecated to remove as not used anymore
+ *
* @param releaseId
* @param buildDirectory
* @param goals
* @param useReleaseProfile
* @param listener
* @throws ContinuumReleaseException
+ * @deprecated to remove as not used anymore
*/
void perform( String releaseId, File buildDirectory, String goals, String arguments, boolean useReleaseProfile,
ContinuumReleaseManagerListener listener )
@@ -92,7 +93,7 @@ public interface ContinuumReleaseManager
/**
* Perform a release based on a release descriptor received by the Maven Release Plugin.
- * @deprecated to remove as not used anymore
+ *
* @param releaseId
* @param workingDirectory
* @param buildDirectory
@@ -100,6 +101,7 @@ public interface ContinuumReleaseManager
* @param useReleaseProfile
* @param listener
* @throws ContinuumReleaseException
+ * @deprecated to remove as not used anymore
*/
void perform( String releaseId, String workingDirectory, File buildDirectory, String goals, String arguments,
boolean useReleaseProfile, ContinuumReleaseManagerListener listener )
@@ -108,6 +110,7 @@ public interface ContinuumReleaseManager
/**
* FIXME use a bean to replace such very huge parameter number (ContinuumReleaseRequest)
+ *
* @param releaseId
* @param buildDirectory
* @param goals
@@ -119,8 +122,8 @@ public interface ContinuumReleaseManager
*/
void perform( String releaseId, File buildDirectory, String goals, String arguments, boolean useReleaseProfile,
ContinuumReleaseManagerListener listener, LocalRepository repository )
- throws ContinuumReleaseException;
-
+ throws ContinuumReleaseException;
+
/**
* Rollback changes made by a previous release.
*
@@ -154,41 +157,41 @@ public interface ContinuumReleaseManager
* @return
*/
ReleaseListenerSummary getListener( String releaseId );
-
+
/**
* Determines if there is an ongoing release
- *
+ *
* @return true if there is an ongoing release; false otherwise
- *
* @throws Exception if unable to determine if release is ongoing
*/
- boolean isExecutingRelease() throws Exception;
-
+ boolean isExecutingRelease()
+ throws Exception;
+
/**
* Retrieve the Release TaskQueueExecutor instance
- *
+ *
* @return Release TaskQueueExecutor instance
- *
* @throws TaskQueueManagerException if unable to retrieve the Release TaskQueueExecutor instance
*/
- TaskQueueExecutor getPerformReleaseTaskQueueExecutor() throws TaskQueueManagerException;
-
+ TaskQueueExecutor getPerformReleaseTaskQueueExecutor()
+ throws TaskQueueManagerException;
+
/**
* Retrieve the PrepareRelease TaskQueueExecutor instance
- *
+ *
* @return PrepareRelease TaskQueueExecutor instance
- *
* @throws TaskQueueManagerException if unable to retrieve the PrepareRelease TaskQueueExecutor instance
*/
- TaskQueueExecutor getPrepareReleaseTaskQueueExecutor() throws TaskQueueManagerException;
-
+ TaskQueueExecutor getPrepareReleaseTaskQueueExecutor()
+ throws TaskQueueManagerException;
+
/**
* Retrieve the RollbackRelease TaskQueueExecutor instance
- *
+ *
* @return RollbackRelease TaskQueueExecutor instance
- *
* @throws TaskQueueManagerException if unable to retrieve the RollbackRelease TaskQueueExecutor instance
*/
- TaskQueueExecutor getRollbackReleaseTaskQueueExecutor() throws TaskQueueManagerException;
+ TaskQueueExecutor getRollbackReleaseTaskQueueExecutor()
+ throws TaskQueueManagerException;
}
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManagerListener.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManagerListener.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManagerListener.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManagerListener.java Mon Aug 13 04:29:09 2012
@@ -40,8 +40,8 @@ public interface ContinuumReleaseManager
String getError();
int getState();
-
+
String getUsername();
-
+
void setUsername( String username );
}
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumObjectNotFoundException.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumObjectNotFoundException.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumObjectNotFoundException.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumObjectNotFoundException.java Mon Aug 13 04:29:09 2012
@@ -26,9 +26,9 @@ package org.apache.maven.continuum.store
public class ContinuumObjectNotFoundException
extends ContinuumStoreException
{
- private static final long serialVersionUID = 6022595625968612620L;
+ private static final long serialVersionUID = 6022595625968612620L;
- public ContinuumObjectNotFoundException( String message )
+ public ContinuumObjectNotFoundException( String message )
{
super( message );
}
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStoreException.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStoreException.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStoreException.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStoreException.java Mon Aug 13 04:29:09 2012
@@ -26,9 +26,9 @@ package org.apache.maven.continuum.store
public class ContinuumStoreException
extends Exception
{
- private static final long serialVersionUID = 5183507100399672781L;
+ private static final long serialVersionUID = 5183507100399672781L;
- public ContinuumStoreException( String msg )
+ public ContinuumStoreException( String msg )
{
super( msg );
}
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/utils/WorkingDirectoryService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/utils/WorkingDirectoryService.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/utils/WorkingDirectoryService.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/utils/WorkingDirectoryService.java Mon Aug 13 04:29:09 2012
@@ -35,8 +35,8 @@ public interface WorkingDirectoryService
File getWorkingDirectory( Project project );
File getWorkingDirectory( Project project, boolean shouldSet );
-
+
File getWorkingDirectory( Project project, String projectScmRootUrl, List<Project> projects );
-
+
File getWorkingDirectory( Project project, String projectScmRootUrl, List<Project> projects, boolean shouldSet );
}
Modified: continuum/trunk/continuum-api/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/resources/META-INF/spring-context.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/resources/META-INF/spring-context.xml (original)
+++ continuum/trunk/continuum-api/src/main/resources/META-INF/spring-context.xml Mon Aug 13 04:29:09 2012
@@ -26,9 +26,9 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-2.5.xsd">
- <context:annotation-config />
- <context:component-scan
- base-package="org.apache.continuum.installation,org.apache.continuum.profile,
+ <context:annotation-config/>
+ <context:component-scan
+ base-package="org.apache.continuum.installation,org.apache.continuum.profile,
org.apache.maven.continuum.configuration,org.apache.maven.continuum.utils,
org.apache.continuum.utils.shell"/>
Modified: continuum/trunk/continuum-api/src/test/java/org/apache/continuum/utils/ProjectSorterTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/test/java/org/apache/continuum/utils/ProjectSorterTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/test/java/org/apache/continuum/utils/ProjectSorterTest.java (original)
+++ continuum/trunk/continuum-api/src/test/java/org/apache/continuum/utils/ProjectSorterTest.java Mon Aug 13 04:29:09 2012
@@ -19,15 +19,14 @@ package org.apache.continuum.utils;
* under the License.
*/
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
+import junit.framework.TestCase;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.project.ProjectDependency;
import org.apache.maven.continuum.model.project.ProjectGroup;
-import junit.framework.TestCase;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
/**
* @author <a href="mailto:jmcconnell@apache.org">Jesse McConnell</a>
@@ -104,7 +103,7 @@ public class ProjectSorterTest
Project p4 = sortedList.get( 3 ); //ear1 project must be the latest
assertEquals( ear1.getArtifactId(), p4.getArtifactId() );
}
-
+
/**
* test project build order
* build order: B -> A -> D -> C -> E
@@ -121,13 +120,13 @@ public class ProjectSorterTest
Project projectC = getNewProject( "C" );
Project projectD = getNewProject( "D" );
Project projectE = getNewProject( "E" );
-
+
projectA.setParent( generateProjectDependency( projectB ) );
projectE.setParent( generateProjectDependency( projectB ) );
projectC.setParent( generateProjectDependency( projectA ) );
projectC.setDependencies( Collections.singletonList( generateProjectDependency( projectD ) ) );
projectD.setParent( generateProjectDependency( projectA ) );
-
+
list.add( projectA );
list.add( projectB );
list.add( projectC );
@@ -136,15 +135,15 @@ public class ProjectSorterTest
List<Project> sortedList = ProjectSorter.getSortedProjects( list, null );
assertNotNull( sortedList );
-
+
List<Project> expectedList = new ArrayList<Project>();
-
+
expectedList.add( projectB );
expectedList.add( projectA );
expectedList.add( projectD );
expectedList.add( projectC );
expectedList.add( projectE );
-
+
for ( int i = 0; i < sortedList.size(); i++ )
{
Project sorted = sortedList.get( i );
Modified: continuum/trunk/continuum-base/continuum-configuration/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-configuration/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-base/continuum-configuration/pom.xml (original)
+++ continuum/trunk/continuum-base/continuum-configuration/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@ KIND, either express or implied. See th
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">
<parent>
<artifactId>continuum-base</artifactId>
<groupId>org.apache.continuum</groupId>
@@ -65,7 +66,7 @@ under the License.
<configuration>
<outputDirectory>${project.build.outputDirectory}/META-INF/continuum/xsd</outputDirectory>
</configuration>
- </execution>
+ </execution>
</executions>
</plugin>
</plugins>
@@ -78,21 +79,21 @@ under the License.
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<scope>runtime</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.codehaus.redback</groupId>
<artifactId>plexus-spring</artifactId>
Modified: continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/DefaultContinuumConfiguration.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/DefaultContinuumConfiguration.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/DefaultContinuumConfiguration.java (original)
+++ continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/DefaultContinuumConfiguration.java Mon Aug 13 04:29:09 2012
@@ -19,14 +19,6 @@ package org.apache.continuum.configurati
* under the License.
*/
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.commons.lang.StringUtils;
import org.apache.continuum.configuration.model.ContinuumConfigurationModel;
import org.apache.continuum.configuration.model.io.xpp3.ContinuumConfigurationModelXpp3Reader;
@@ -36,6 +28,14 @@ import org.codehaus.plexus.util.xml.pull
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
* @version $Id$
@@ -127,18 +127,18 @@ public class DefaultContinuumConfigurati
this.generalConfiguration.setNumberOfBuildsInParallel( configuration.getNumberOfBuildsInParallel() );
this.generalConfiguration.setBaseUrl( configuration.getBaseUrl() );
this.generalConfiguration.setSharedSecretPassword( configuration.getSharedSecretPassword() );
-
+
if ( StringUtils.isNotEmpty( configuration.getBuildOutputDirectory() ) )
{
// TODO take care if file exists ?
- this.generalConfiguration.setBuildOutputDirectory(
- new File( configuration.getBuildOutputDirectory() ) );
+ this.generalConfiguration.setBuildOutputDirectory( new File(
+ configuration.getBuildOutputDirectory() ) );
}
if ( StringUtils.isNotEmpty( configuration.getDeploymentRepositoryDirectory() ) )
{
// TODO take care if file exists ?
- this.generalConfiguration.setDeploymentRepositoryDirectory(
- new File( configuration.getDeploymentRepositoryDirectory() ) );
+ this.generalConfiguration.setDeploymentRepositoryDirectory( new File(
+ configuration.getDeploymentRepositoryDirectory() ) );
}
if ( StringUtils.isNotEmpty( configuration.getWorkingDirectory() ) )
{
@@ -147,23 +147,23 @@ public class DefaultContinuumConfigurati
}
if ( configuration.getProxyConfiguration() != null )
{
- ProxyConfiguration proxyConfiguration =
- new ProxyConfiguration( configuration.getProxyConfiguration().getProxyHost(),
- configuration.getProxyConfiguration().getProxyPassword(),
- configuration.getProxyConfiguration().getProxyPort(),
- configuration.getProxyConfiguration().getProxyUser() );
+ ProxyConfiguration proxyConfiguration = new ProxyConfiguration(
+ configuration.getProxyConfiguration().getProxyHost(),
+ configuration.getProxyConfiguration().getProxyPassword(),
+ configuration.getProxyConfiguration().getProxyPort(),
+ configuration.getProxyConfiguration().getProxyUser() );
this.generalConfiguration.setProxyConfiguration( proxyConfiguration );
}
if ( StringUtils.isNotEmpty( configuration.getReleaseOutputDirectory() ) )
{
// TODO take care if file exists?
- this.generalConfiguration.setReleaseOutputDirectory(
- new File( configuration.getReleaseOutputDirectory() ) );
+ this.generalConfiguration.setReleaseOutputDirectory( new File(
+ configuration.getReleaseOutputDirectory() ) );
}
-
+
// set the configuration for diistributedBuildEnabled
this.generalConfiguration.setDistributedBuildEnabled( configuration.isDistributedBuildEnabled() );
-
+
if ( configuration.getBuildAgents() != null )
{
List<BuildAgentConfiguration> buildAgents = new ArrayList<BuildAgentConfiguration>();
@@ -172,8 +172,9 @@ public class DefaultContinuumConfigurati
configuration.getBuildAgents();
for ( org.apache.continuum.configuration.model.BuildAgentConfiguration agent : agents )
{
- BuildAgentConfiguration buildAgent =
- new BuildAgentConfiguration( agent.getUrl(), agent.getDescription(), agent.isEnabled() );
+ BuildAgentConfiguration buildAgent = new BuildAgentConfiguration( agent.getUrl(),
+ agent.getDescription(),
+ agent.isEnabled() );
buildAgents.add( buildAgent );
}
@@ -192,14 +193,14 @@ public class DefaultContinuumConfigurati
group.getBuildAgents();
for ( org.apache.continuum.configuration.model.BuildAgentConfiguration modelAgent : modelAgents )
{
- BuildAgentConfiguration buildAgent =
- new BuildAgentConfiguration( modelAgent.getUrl(), modelAgent.getDescription(),
- modelAgent.isEnabled() );
+ BuildAgentConfiguration buildAgent = new BuildAgentConfiguration( modelAgent.getUrl(),
+ modelAgent.getDescription(),
+ modelAgent.isEnabled() );
agents.add( buildAgent );
}
- BuildAgentGroupConfiguration groupAgent =
- new BuildAgentGroupConfiguration( group.getName(), agents );
+ BuildAgentGroupConfiguration groupAgent = new BuildAgentGroupConfiguration( group.getName(),
+ agents );
buildAgentGroups.add( groupAgent );
}
@@ -268,10 +269,10 @@ public class DefaultContinuumConfigurati
configurationModel.setReleaseOutputDirectory(
this.generalConfiguration.getReleaseOutputDirectory().getPath() );
}
-
+
// set configuration for distributedBuildEnabled.
configurationModel.setDistributedBuildEnabled( this.generalConfiguration.isDistributedBuildEnabled() );
-
+
if ( this.generalConfiguration.getBuildAgents() != null )
{
List<org.apache.continuum.configuration.model.BuildAgentConfiguration> buildAgents =
Modified: continuum/trunk/continuum-base/continuum-configuration/src/main/mdo/continuum-configuration.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-configuration/src/main/mdo/continuum-configuration.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-base/continuum-configuration/src/main/mdo/continuum-configuration.xml (original)
+++ continuum/trunk/continuum-base/continuum-configuration/src/main/mdo/continuum-configuration.xml Mon Aug 13 04:29:09 2012
@@ -47,7 +47,7 @@
<name>deploymentRepositoryDirectory</name>
<version>1.1.0+</version>
<type>String</type>
- </field>
+ </field>
<field>
<name>workingDirectory</name>
<version>1.1.0+</version>
@@ -59,8 +59,8 @@
<association>
<type>ProxyConfiguration</type>
<multiplicity>1</multiplicity>
- </association>
- </field>
+ </association>
+ </field>
<field>
<name>releaseOutputDirectory</name>
<version>1.1.0+</version>
@@ -117,12 +117,12 @@
<name>proxyUser</name>
<version>1.1.0+</version>
<type>String</type>
- </field>
+ </field>
<field>
<name>proxyPassword</name>
<version>1.1.0+</version>
<type>String</type>
- </field>
+ </field>
</fields>
</class>
<class xml.tagName="buildagent-configuration">
@@ -164,6 +164,6 @@
</association>
</field>
</fields>
- </class>
+ </class>
</classes>
</model>
Modified: continuum/trunk/continuum-base/continuum-configuration/src/test/java/org/apache/continuum/configuration/TestDefaultContinuumConfiguration.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-configuration/src/test/java/org/apache/continuum/configuration/TestDefaultContinuumConfiguration.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-base/continuum-configuration/src/test/java/org/apache/continuum/configuration/TestDefaultContinuumConfiguration.java (original)
+++ continuum/trunk/continuum-base/continuum-configuration/src/test/java/org/apache/continuum/configuration/TestDefaultContinuumConfiguration.java Mon Aug 13 04:29:09 2012
@@ -19,15 +19,15 @@ package org.apache.continuum.configurati
* under the License.
*/
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import org.codehaus.plexus.util.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
* @version $Id$
@@ -61,8 +61,8 @@ public class TestDefaultContinuumConfigu
public void testLoad()
throws Exception
{
- ContinuumConfiguration configuration =
- (ContinuumConfiguration) lookup( ContinuumConfiguration.class, "default" );
+ ContinuumConfiguration configuration = (ContinuumConfiguration) lookup( ContinuumConfiguration.class,
+ "default" );
assertNotNull( configuration );
GeneralConfiguration generalConfiguration = configuration.getGeneralConfiguration();
assertNotNull( generalConfiguration );
@@ -76,7 +76,7 @@ public class TestDefaultContinuumConfigu
assertEquals( "http://buildagent/xmlrpc", buildAgentConfig.getUrl() );
assertEquals( "linux", buildAgentConfig.getDescription() );
assertTrue( buildAgentConfig.isEnabled() );
-
+
// agent group tests
assertNotNull( "agent group", generalConfiguration.getBuildAgentGroups() );
BuildAgentGroupConfiguration buildAgentGroupConfig = generalConfiguration.getBuildAgentGroups().get( 0 );
@@ -94,8 +94,8 @@ public class TestDefaultContinuumConfigu
{
conf.delete();
}
- ContinuumConfiguration configuration =
- (ContinuumConfiguration) lookup( ContinuumConfiguration.class, "default" );
+ ContinuumConfiguration configuration = (ContinuumConfiguration) lookup( ContinuumConfiguration.class,
+ "default" );
assertNotNull( configuration );
GeneralConfiguration generalConfiguration = new GeneralConfiguration();
generalConfiguration.setBaseUrl( "http://test/zloug" );
@@ -146,18 +146,17 @@ public class TestDefaultContinuumConfigu
assertEquals( 8080, configuration.getGeneralConfiguration().getProxyConfiguration().getProxyPort() );
assertEquals( targetDir.getPath(),
configuration.getGeneralConfiguration().getBuildOutputDirectory().getPath() );
- assertEquals( "http://buildagent/test",
- configuration.getGeneralConfiguration().getBuildAgents().get( 0 ).getUrl() );
+ assertEquals( "http://buildagent/test", configuration.getGeneralConfiguration().getBuildAgents().get(
+ 0 ).getUrl() );
assertFalse( configuration.getGeneralConfiguration().getBuildAgents().get( 0 ).isEnabled() );
- assertEquals( "http://buildagent-node-2/test",
- configuration.getGeneralConfiguration().getBuildAgents().get( 1 ).getUrl() );
+ assertEquals( "http://buildagent-node-2/test", configuration.getGeneralConfiguration().getBuildAgents().get(
+ 1 ).getUrl() );
assertTrue( configuration.getGeneralConfiguration().getBuildAgents().get( 1 ).isEnabled() );
- assertEquals( "secret-agent",
- configuration.getGeneralConfiguration().getBuildAgentGroups().get( 0 ).getName() );
- assertEquals( "http://buildagent/test",
- configuration.getGeneralConfiguration().getBuildAgentGroups().get( 0 ).getBuildAgents().get(
- 0 ).getUrl() );
+ assertEquals( "secret-agent", configuration.getGeneralConfiguration().getBuildAgentGroups().get(
+ 0 ).getName() );
+ assertEquals( "http://buildagent/test", configuration.getGeneralConfiguration().getBuildAgentGroups().get(
+ 0 ).getBuildAgents().get( 0 ).getUrl() );
assertEquals( "http://buildagent-node-2/test",
configuration.getGeneralConfiguration().getBuildAgentGroups().get( 0 ).getBuildAgents().get(
1 ).getUrl() );
Modified: continuum/trunk/continuum-base/continuum-scm/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-scm/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-base/continuum-scm/pom.xml (original)
+++ continuum/trunk/continuum-base/continuum-scm/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@ KIND, either express or implied. See th
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">
<parent>
<artifactId>continuum-base</artifactId>
<groupId>org.apache.continuum</groupId>
@@ -56,7 +57,7 @@ under the License.
<dependency>
<groupId>org.codehaus.redback</groupId>
<artifactId>plexus-spring</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
@@ -73,13 +74,13 @@ under the License.
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-cvsjava</artifactId>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-cvsexe</artifactId>
- <scope>test</scope>
- </dependency>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -110,7 +111,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
+ <artifactId>objenesis</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/ContinuumScm.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/ContinuumScm.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/ContinuumScm.java (original)
+++ continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/ContinuumScm.java Mon Aug 13 04:29:09 2012
@@ -19,8 +19,6 @@ package org.apache.continuum.scm;
* under the License.
*/
-import java.io.IOException;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
import org.apache.maven.scm.command.checkout.CheckOutScmResult;
@@ -28,6 +26,8 @@ import org.apache.maven.scm.command.upda
import org.apache.maven.scm.manager.NoSuchScmProviderException;
import org.apache.maven.scm.repository.ScmRepositoryException;
+import java.io.IOException;
+
/**
* Component that manages SCM interactions and checkouts within Continuum.
*
Modified: continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/ContinuumScmConfiguration.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/ContinuumScmConfiguration.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/ContinuumScmConfiguration.java (original)
+++ continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/ContinuumScmConfiguration.java Mon Aug 13 04:29:09 2012
@@ -24,14 +24,15 @@ import java.util.Date;
/**
* Configuration for a project's source control.
- *
- * @todo JAXB for persistence
- *
+ *
* @version $Id$
+ * @todo JAXB for persistence
*/
public class ContinuumScmConfiguration
{
- /** The SCM URL, in the format specified by Maven SCM. */
+ /**
+ * The SCM URL, in the format specified by Maven SCM.
+ */
private String url;
/**
@@ -41,33 +42,35 @@ public class ContinuumScmConfiguration
/**
* The SCM password to use in connecting.
- *
+ *
* @todo using some service to obtain this rather than configuring it would be preferable
*/
private String password;
- /** The tag, branch, or equivalent to check out from. */
+ /**
+ * The tag, branch, or equivalent to check out from.
+ */
private String tag;
/**
* The location of the working directory.
- *
+ *
* @todo is this a File that is absolute, or is it a relative path under the working directories? How will JAXB
- * manage? Don't want to store absolute path in the config unless that's what the user configured, so the base
- * can be relocated.
+ * manage? Don't want to store absolute path in the config unless that's what the user configured, so the base
+ * can be relocated.
*/
private File workingDirectory;
/**
* For SCM clients that support it, use cached credentials on the system to avoid needing to pass them in.
- *
+ *
* @todo using some service to obtain them rather than configuring it would be preferable
*/
private boolean useCredentialsCache;
/**
* What was the last time this checkout was updated.
- *
+ *
* @todo we need to improve on the techniques to achieve this
*/
private Date latestUpdateDate;
@@ -136,7 +139,7 @@ public class ContinuumScmConfiguration
{
return latestUpdateDate;
}
-
+
public void setLatestUpdateDate( Date latestUpdateDate )
{
this.latestUpdateDate = latestUpdateDate;
Modified: continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/ContinuumScmUtils.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/ContinuumScmUtils.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/ContinuumScmUtils.java (original)
+++ continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/ContinuumScmUtils.java Mon Aug 13 04:29:09 2012
@@ -25,15 +25,14 @@ import org.apache.maven.scm.provider.git
/**
* @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>
- * @version
*/
public class ContinuumScmUtils
{
public static final String GIT_SCM_PROVIDERTYPE = "git";
// CONTINUUM-2628
- public static ContinuumScmConfiguration setSCMCredentialsforSSH( ContinuumScmConfiguration config,
- String scmUrl, String scmUsername, String scmPassword )
+ public static ContinuumScmConfiguration setSCMCredentialsforSSH( ContinuumScmConfiguration config, String scmUrl,
+ String scmUsername, String scmPassword )
{
String sshScmUsername = "";
String sshScmPassword = "";
@@ -41,7 +40,8 @@ public class ContinuumScmUtils
String scmSpecificUrl = scmUrl.substring( providerType.length() + 5 );
- if( providerType.contains( GIT_SCM_PROVIDERTYPE ) && scmSpecificUrl.startsWith( GitScmProviderRepository.PROTOCOL_SSH ) )
+ if ( providerType.contains( GIT_SCM_PROVIDERTYPE ) && scmSpecificUrl.startsWith(
+ GitScmProviderRepository.PROTOCOL_SSH ) )
{
scmSpecificUrl = scmSpecificUrl.substring( GitScmProviderRepository.PROTOCOL_SSH.length() + 3 );
@@ -55,7 +55,7 @@ public class ContinuumScmUtils
// password is specified in the url
if ( indexPwdSep < 0 )
{
- sshScmUsername = userInfo.substring( indexPwdSep + 1);
+ sshScmUsername = userInfo.substring( indexPwdSep + 1 );
}
else
{
@@ -65,7 +65,7 @@ public class ContinuumScmUtils
}
}
- if( StringUtils.isBlank( sshScmUsername ) )
+ if ( StringUtils.isBlank( sshScmUsername ) )
{
config.setUsername( scmUsername );
config.setPassword( scmPassword );
@@ -73,7 +73,7 @@ public class ContinuumScmUtils
else
{
config.setUsername( sshScmUsername );
- if( !StringUtils.isBlank( sshScmPassword ) )
+ if ( !StringUtils.isBlank( sshScmPassword ) )
{
config.setPassword( sshScmPassword );
}
Modified: continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/DefaultContinuumScm.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/DefaultContinuumScm.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/DefaultContinuumScm.java (original)
+++ continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/DefaultContinuumScm.java Mon Aug 13 04:29:09 2012
@@ -19,13 +19,6 @@ package org.apache.continuum.scm;
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.util.Calendar;
-import java.util.Date;
-
-import javax.annotation.Resource;
-
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.scm.ScmException;
@@ -41,12 +34,18 @@ import org.apache.maven.scm.repository.S
import org.apache.maven.scm.repository.ScmRepositoryException;
import org.springframework.stereotype.Service;
+import java.io.File;
+import java.io.IOException;
+import java.util.Calendar;
+import java.util.Date;
+import javax.annotation.Resource;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
* @todo consider folding some of this into Maven SCM itself
*/
-@Service("continuumScm")
+@Service( "continuumScm" )
public class DefaultContinuumScm
implements ContinuumScm
{
Modified: continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/manager/ScmManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/manager/ScmManager.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/manager/ScmManager.java (original)
+++ continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/manager/ScmManager.java Mon Aug 13 04:29:09 2012
@@ -19,23 +19,22 @@ package org.apache.continuum.scm.manager
* under the License.
*/
-import java.util.Map;
-
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.manager.AbstractScmManager;
+import java.util.Map;
+
/**
* Default implementation of the SCM manager.
- *
- * @todo move to maven-scm as the default
- *
+ *
* @version $Id$
+ * @todo move to maven-scm as the default
*/
public class ScmManager
extends AbstractScmManager
{
private ScmLogger scmLogger;
-
+
@Override
protected ScmLogger getScmLogger()
{
Modified: continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/manager/Slf4jScmLogger.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/manager/Slf4jScmLogger.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/manager/Slf4jScmLogger.java (original)
+++ continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/manager/Slf4jScmLogger.java Mon Aug 13 04:29:09 2012
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Se
* @version $Id$
* @todo move to maven-scm?
*/
-@Service("scmLogger")
+@Service( "scmLogger" )
public class Slf4jScmLogger
implements ScmLogger
{
Modified: continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/manager/spring/ScmProviderFactoryBean.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/manager/spring/ScmProviderFactoryBean.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/manager/spring/ScmProviderFactoryBean.java (original)
+++ continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/manager/spring/ScmProviderFactoryBean.java Mon Aug 13 04:29:09 2012
@@ -19,8 +19,6 @@ package org.apache.continuum.scm.manager
* under the License.
*/
-import java.util.Map;
-
import org.apache.maven.scm.provider.ScmProvider;
import org.codehaus.plexus.spring.PlexusToSpringUtils;
import org.springframework.beans.BeansException;
@@ -28,6 +26,8 @@ import org.springframework.beans.factory
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
+import java.util.Map;
+
/**
* <p>
* Factory bean to inject all beans of type {@link ScmProvider}
@@ -78,8 +78,8 @@ public class ScmProviderFactoryBean
}
providers.put( provider.getScmType(), provider );
}*/
- providers =
- PlexusToSpringUtils.lookupMap( PlexusToSpringUtils.buildSpringId( ScmProvider.class ), applicationContext );
+ providers = PlexusToSpringUtils.lookupMap( PlexusToSpringUtils.buildSpringId( ScmProvider.class ),
+ applicationContext );
return providers;
}
Modified: continuum/trunk/continuum-base/continuum-scm/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-scm/src/main/resources/META-INF/spring-context.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-base/continuum-scm/src/main/resources/META-INF/spring-context.xml (original)
+++ continuum/trunk/continuum-base/continuum-scm/src/main/resources/META-INF/spring-context.xml Mon Aug 13 04:29:09 2012
@@ -25,11 +25,11 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-2.5.xsd">
- <context:annotation-config />
+ <context:annotation-config/>
<context:component-scan base-package="org.apache.continuum.scm"/>
<bean id="scmManager" class="org.apache.continuum.scm.manager.ScmManager">
- <property name="scmLogger" ref="scmLogger" />
+ <property name="scmLogger" ref="scmLogger"/>
<property name="scmProviders">
<bean class="org.apache.continuum.scm.manager.spring.ScmProviderFactoryBean"/>
</property>
Modified: continuum/trunk/continuum-base/continuum-scm/src/test/java/org/apache/continuum/scm/ContinuumScmUtilsTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-scm/src/test/java/org/apache/continuum/scm/ContinuumScmUtilsTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-base/continuum-scm/src/test/java/org/apache/continuum/scm/ContinuumScmUtilsTest.java (original)
+++ continuum/trunk/continuum-base/continuum-scm/src/test/java/org/apache/continuum/scm/ContinuumScmUtilsTest.java Mon Aug 13 04:29:09 2012
@@ -24,7 +24,6 @@ import org.apache.commons.lang.StringUti
/**
* @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>
- * @version
*/
public class ContinuumScmUtilsTest
extends TestCase
@@ -35,7 +34,8 @@ public class ContinuumScmUtilsTest
ContinuumScmConfiguration scmConfiguration = new ContinuumScmConfiguration();
scmConfiguration = ContinuumScmUtils.setSCMCredentialsforSSH( scmConfiguration,
- "scm:git:ssh://sshUser@gitrepo.com/myproject.git", "dummyuser", "dummypassword" );
+ "scm:git:ssh://sshUser@gitrepo.com/myproject.git",
+ "dummyuser", "dummypassword" );
assertEquals( "sshUser", scmConfiguration.getUsername() );
assertTrue( StringUtils.isBlank( scmConfiguration.getPassword() ) );
@@ -47,8 +47,9 @@ public class ContinuumScmUtilsTest
ContinuumScmConfiguration scmConfiguration = new ContinuumScmConfiguration();
scmConfiguration = ContinuumScmUtils.setSCMCredentialsforSSH( scmConfiguration,
- "scm:git:ssh://sshUser:sshPassword@gitrepo.com/myproject.git", "dummyuser", "dummypassword" );
-
+ "scm:git:ssh://sshUser:sshPassword@gitrepo.com/myproject.git",
+ "dummyuser", "dummypassword" );
+
assertEquals( "sshUser", scmConfiguration.getUsername() );
assertEquals( "sshPassword", scmConfiguration.getPassword() );
}
@@ -59,7 +60,8 @@ public class ContinuumScmUtilsTest
ContinuumScmConfiguration scmConfiguration = new ContinuumScmConfiguration();
scmConfiguration = ContinuumScmUtils.setSCMCredentialsforSSH( scmConfiguration,
- "scm:git:ssh://gitrepo.com/myproject.git", "dummyuser", "dummypassword" );
+ "scm:git:ssh://gitrepo.com/myproject.git",
+ "dummyuser", "dummypassword" );
assertEquals( "dummyuser", scmConfiguration.getUsername() );
assertEquals( "dummypassword", scmConfiguration.getPassword() );
@@ -71,7 +73,8 @@ public class ContinuumScmUtilsTest
ContinuumScmConfiguration scmConfiguration = new ContinuumScmConfiguration();
scmConfiguration = ContinuumScmUtils.setSCMCredentialsforSSH( scmConfiguration,
- "scm:svn:ssh://svnrepo.com/repos/myproject/trunk", "dummyuser", "dummypassword" );
+ "scm:svn:ssh://svnrepo.com/repos/myproject/trunk",
+ "dummyuser", "dummypassword" );
assertEquals( "dummyuser", scmConfiguration.getUsername() );
assertEquals( "dummypassword", scmConfiguration.getPassword() );
@@ -83,7 +86,8 @@ public class ContinuumScmUtilsTest
ContinuumScmConfiguration scmConfiguration = new ContinuumScmConfiguration();
scmConfiguration = ContinuumScmUtils.setSCMCredentialsforSSH( scmConfiguration,
- "scm:git:https://gitrepo.com/myproject.git", "dummyuser", "dummypassword" );
+ "scm:git:https://gitrepo.com/myproject.git",
+ "dummyuser", "dummypassword" );
assertEquals( "dummyuser", scmConfiguration.getUsername() );
assertEquals( "dummypassword", scmConfiguration.getPassword() );
Modified: continuum/trunk/continuum-base/continuum-scm/src/test/java/org/apache/continuum/scm/DefaultContinuumScmTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-scm/src/test/java/org/apache/continuum/scm/DefaultContinuumScmTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-base/continuum-scm/src/test/java/org/apache/continuum/scm/DefaultContinuumScmTest.java (original)
+++ continuum/trunk/continuum-base/continuum-scm/src/test/java/org/apache/continuum/scm/DefaultContinuumScmTest.java Mon Aug 13 04:29:09 2012
@@ -1,19 +1,19 @@
package org.apache.continuum.scm;
-import java.io.File;
-import java.util.Date;
import junit.framework.TestCase;
-
import org.apache.continuum.scm.manager.ScmManager;
-import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.scm.ScmBranch;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmVersion;
+import org.apache.maven.scm.repository.ScmRepository;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit3.JUnit3Mockery;
import org.jmock.lib.legacy.ClassImposteriser;
+import java.io.File;
+import java.util.Date;
+
public class DefaultContinuumScmTest
extends TestCase
{
@@ -48,10 +48,10 @@ public class DefaultContinuumScmTest
{
{
one( scmManager ).makeScmRepository( config.getUrl() );
- one( scmManager ).changeLog( with( any( ScmRepository.class ) ), with( any( ScmFileSet.class ) ),
- with( any( ScmVersion.class ) ), with( any( ScmVersion.class ) ) );
+ one( scmManager ).changeLog( with( any( ScmRepository.class ) ), with( any( ScmFileSet.class ) ), with(
+ any( ScmVersion.class ) ), with( any( ScmVersion.class ) ) );
}
- });
+ } );
continuumScm.changeLog( config );
@@ -67,11 +67,11 @@ public class DefaultContinuumScmTest
{
{
one( scmManager ).makeScmRepository( config.getUrl() );
- one( scmManager ).changeLog( with( any( ScmRepository.class ) ), with( any( ScmFileSet.class ) ),
- with( any( Date.class ) ), with( aNull( Date.class) ), with( equal( 0 ) ),
- with( aNull( ScmBranch.class) ), with( aNull( String.class ) ) );
+ one( scmManager ).changeLog( with( any( ScmRepository.class ) ), with( any( ScmFileSet.class ) ), with(
+ any( Date.class ) ), with( aNull( Date.class ) ), with( equal( 0 ) ), with( aNull(
+ ScmBranch.class ) ), with( aNull( String.class ) ) );
}
- });
+ } );
continuumScm.changeLog( config );
context.assertIsSatisfied();
Modified: continuum/trunk/continuum-base/continuum-scm/src/test/java/org/apache/continuum/scm/manager/ScmManagerTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-scm/src/test/java/org/apache/continuum/scm/manager/ScmManagerTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-base/continuum-scm/src/test/java/org/apache/continuum/scm/manager/ScmManagerTest.java (original)
+++ continuum/trunk/continuum-base/continuum-scm/src/test/java/org/apache/continuum/scm/manager/ScmManagerTest.java Mon Aug 13 04:29:09 2012
@@ -19,8 +19,7 @@ package org.apache.continuum.scm.manager
* under the License.
*/
-import java.util.Properties;
-
+import junit.framework.TestCase;
import org.apache.maven.scm.manager.NoSuchScmProviderException;
import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.scm.provider.cvslib.cvsexe.CvsExeScmProvider;
@@ -30,7 +29,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
-import junit.framework.TestCase;
+import java.util.Properties;
/**
* @version $Id$
Modified: continuum/trunk/continuum-base/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-base/pom.xml (original)
+++ continuum/trunk/continuum-base/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@ KIND, either express or implied. See th
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">
<parent>
<artifactId>continuum</artifactId>
<groupId>org.apache.continuum</groupId>
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-api/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-api/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-api/pom.xml (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-api/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@ KIND, either express or implied. See th
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>
@@ -27,7 +28,7 @@ under the License.
<artifactId>continuum-buildagent-api</artifactId>
<name>Continuum :: Distributed Build :: Build Agent API</name>
-
+
<build>
<plugins>
<plugin>
@@ -67,7 +68,7 @@ under the License.
<configuration>
<outputDirectory>${project.build.outputDirectory}/META-INF/continuum/xsd</outputDirectory>
</configuration>
- </execution>
+ </execution>
</executions>
</plugin>
</plugins>