You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2007/10/22 20:49:07 UTC
svn commit: r587190 - in
/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum:
execution/maven/m2/ initialization/ project/builder/maven/
Author: evenisse
Date: Mon Oct 22 11:49:06 2007
New Revision: 587190
URL: http://svn.apache.org/viewvc?rev=587190&view=rev
Log:
Remove unused fields
Modified:
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java?rev=587190&r1=587189&r2=587190&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java Mon Oct 22 11:49:06 2007
@@ -46,7 +46,6 @@
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.validation.ModelValidationResult;
-import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.settings.MavenSettingsBuilder;
import org.apache.maven.settings.Mirror;
import org.apache.maven.settings.Proxy;
@@ -108,11 +107,6 @@
* @plexus.configuration default-value="${plexus.home}/local-repository"
*/
private String localRepository;
-
- /**
- * @plexus.requirement
- */
- private ScmManager scmManager;
private PlexusContainer container;
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java?rev=587190&r1=587189&r2=587190&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java Mon Oct 22 11:49:06 2007
@@ -42,12 +42,6 @@
implements ContinuumInitializer
{
// ----------------------------------------------------------------------
- // Default values for the default schedule
- // ----------------------------------------------------------------------
-
- private SystemConfiguration systemConf;
-
- // ----------------------------------------------------------------------
// Requirements
// ----------------------------------------------------------------------
@@ -55,11 +49,11 @@
* @plexus.requirement role-hint="jdo"
*/
private ContinuumStore store;
-
+
/**
* @plexus.requirement
- */
- private BuildDefinitionService buildDefinitionService;
+ */
+ private BuildDefinitionService buildDefinitionService;
// ----------------------------------------------------------------------
//
@@ -87,7 +81,7 @@
try
{
// System Configuration
- systemConf = store.getSystemConfiguration();
+ SystemConfiguration systemConf = store.getSystemConfiguration();
if ( systemConf == null )
{
@@ -102,14 +96,13 @@
{
throw new ContinuumInitializationException( "Can't initialize default schedule.", e );
}
- catch (BuildDefinitionServiceException e)
+ catch ( BuildDefinitionServiceException e )
{
throw new ContinuumInitializationException( "Can't get default build definition", e );
}
getLogger().info( "Continuum initializer end running ..." );
}
-
-
+
private void createDefaultProjectGroup()
throws ContinuumStoreException, BuildDefinitionServiceException
@@ -122,9 +115,9 @@
}
catch ( ContinuumObjectNotFoundException e )
{
-
+
getLogger().info( "create Default Project Group" );
-
+
group = new ProjectGroup();
group.setName( "Default Project Group" );
@@ -133,7 +126,8 @@
group.setDescription( "Contains all projects that do not have a group of their own" );
- group.getBuildDefinitions().addAll( buildDefinitionService.getDefaultMavenTwoBuildDefinitionTemplate().getBuildDefinitions() );
+ group.getBuildDefinitions().addAll(
+ buildDefinitionService.getDefaultMavenTwoBuildDefinitionTemplate().getBuildDefinitions() );
group = store.addProjectGroup( group );
}
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java?rev=587190&r1=587189&r2=587190&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java Mon Oct 22 11:49:06 2007
@@ -19,10 +19,6 @@
* under the License.
*/
-import java.io.File;
-import java.net.URL;
-import java.util.Iterator;
-
import org.apache.maven.continuum.builddefinition.BuildDefinitionService;
import org.apache.maven.continuum.builddefinition.BuildDefinitionServiceException;
import org.apache.maven.continuum.execution.maven.m1.MavenOneBuildExecutor;
@@ -36,9 +32,12 @@
import org.apache.maven.continuum.project.builder.ContinuumProjectBuilder;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuilderException;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
-import org.apache.maven.continuum.store.ContinuumStore;
import org.codehaus.plexus.util.StringUtils;
+import java.io.File;
+import java.net.URL;
+import java.util.Iterator;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
@@ -50,21 +49,16 @@
implements ContinuumProjectBuilder
{
public static final String ID = "maven-one-builder";
-
- /**
- * @plexus.requirement
- */
- private BuildDefinitionService buildDefinitionService;
/**
* @plexus.requirement
*/
- private MavenOneMetadataHelper metadataHelper;
+ private BuildDefinitionService buildDefinitionService;
/**
- * @plexus.requirement role-hint="jdo"
+ * @plexus.requirement
*/
- private ContinuumStore store;
+ private MavenOneMetadataHelper metadataHelper;
// ----------------------------------------------------------------------
// ProjectCreator Implementation
@@ -117,8 +111,9 @@
{
return result;
}
- for ( Iterator<BuildDefinition> iterator = buildDefinitionTemplate.getBuildDefinitions().iterator(); iterator
- .hasNext(); )
+ for ( Iterator<BuildDefinition> iterator = buildDefinitionTemplate.getBuildDefinitions().iterator();
+ iterator
+ .hasNext(); )
{
project.addBuildDefinition( iterator.next() );
}
@@ -130,7 +125,6 @@
result.addError( ContinuumProjectBuildingResult.ERROR_UNKNOWN );
}
-
ProjectGroup projectGroup = new ProjectGroup();