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 2009/04/15 23:56:49 UTC
svn commit: r765385 [3/3] - in /continuum/trunk:
continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/
continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/manager/
continuum-base/continuum-scm/src/main/java/org/apache/con...
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java Wed Apr 15 21:56:46 2009
@@ -19,6 +19,15 @@
* under the License.
*/
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+
+import javax.activation.MimetypesFileTypeMap;
+
import org.apache.continuum.builder.distributed.manager.DistributedBuildManager;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.Project;
@@ -28,14 +37,6 @@
import org.apache.struts2.views.util.UrlHelper;
import org.codehaus.plexus.util.StringUtils;
-import javax.activation.MimetypesFileTypeMap;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.List;
-
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
@@ -72,7 +73,7 @@
private String mimeType = "application/octet-stream";
- private static String FILE_SEPARATOR = System.getProperty( "file.separator" );
+ private static final String FILE_SEPARATOR = System.getProperty( "file.separator" );
private String projectGroupName = "";
@@ -97,23 +98,25 @@
projectName = project.getName();
- HashMap params = new HashMap();
+ HashMap<String, Object> params = new HashMap<String, Object>();
- params.put( "projectId", new Integer( projectId ) );
+ params.put( "projectId", projectId );
params.put( "projectName", projectName );
String baseUrl = UrlHelper.buildUrl( "/workingCopy.action", ServletActionContext.getRequest(),
ServletActionContext.getResponse(), params );
- String imagesBaseUrl = UrlHelper.buildUrl( "/images/", ServletActionContext.getRequest(),
- ServletActionContext.getResponse(), params );
+ String imagesBaseUrl =
+ UrlHelper.buildUrl( "/images/", ServletActionContext.getRequest(), ServletActionContext.getResponse(),
+ params );
imagesBaseUrl = imagesBaseUrl.substring( 0, imagesBaseUrl.indexOf( "/images/" ) + "/images/".length() );
if ( getContinuum().getConfiguration().isDistributedBuildEnabled() )
{
- output = distributedBuildManager.generateWorkingCopyContent( projectId, userDirectory, baseUrl, imagesBaseUrl );
+ output =
+ distributedBuildManager.generateWorkingCopyContent( projectId, userDirectory, baseUrl, imagesBaseUrl );
if ( currentFile != null && !currentFile.equals( "" ) )
{
@@ -128,18 +131,19 @@
{
List<File> files = getContinuum().getFiles( projectId, userDirectory );
- output = generator.generate( files, baseUrl, imagesBaseUrl, getContinuum().getWorkingDirectory( projectId ) );
-
+ output =
+ generator.generate( files, baseUrl, imagesBaseUrl, getContinuum().getWorkingDirectory( projectId ) );
+
if ( currentFile != null && !currentFile.equals( "" ) )
{
String dir;
-
+
//TODO: maybe create a plexus component for this so that additional mimetypes can be easily added
MimetypesFileTypeMap mimeTypesMap = new MimetypesFileTypeMap();
mimeTypesMap.addMimeTypes( "application/java-archive jar war ear" );
mimeTypesMap.addMimeTypes( "application/java-class class" );
mimeTypesMap.addMimeTypes( "image/png png" );
-
+
if ( FILE_SEPARATOR.equals( userDirectory ) )
{
dir = userDirectory;
@@ -148,16 +152,16 @@
{
dir = FILE_SEPARATOR + userDirectory + FILE_SEPARATOR;
}
-
+
downloadFile = new File( getContinuum().getWorkingDirectory( projectId ) + dir + currentFile );
mimeType = mimeTypesMap.getContentType( downloadFile );
-
+
if ( ( mimeType.indexOf( "image" ) >= 0 ) || ( mimeType.indexOf( "java-archive" ) >= 0 ) ||
( mimeType.indexOf( "java-class" ) >= 0 ) || ( downloadFile.length() > 100000 ) )
{
return "stream";
}
-
+
currentFileContent = getContinuum().getFileContent( projectId, userDirectory, currentFile );
}
else
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java Wed Apr 15 21:56:46 2009
@@ -19,10 +19,11 @@
* under the License.
*/
+import com.opensymphony.xwork2.Preparable;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -42,13 +43,11 @@
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException;
-import com.opensymphony.xwork2.Preparable;
-
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
- * @since 16 sept. 07
* @version $Id$
* @plexus.component role="com.opensymphony.xwork2.Action" role-hint="buildDefinitionTemplates"
+ * @since 16 sept. 07
*/
public class BuildDefinitionTemplateAction
extends AbstractBuildDefinitionAction
@@ -67,11 +66,11 @@
private Collection<Schedule> schedules;
private List<Profile> profiles;
-
+
private List<String> selectedBuildDefinitionIds;
-
+
private List<BuildDefinition> buildDefinitions;
-
+
// -------------------------------------------------------
// Webwork Methods
// -------------------------------------------------------
@@ -108,16 +107,15 @@
public String edit()
throws Exception
{
- this.buildDefinitionTemplate = getContinuum().getBuildDefinitionService()
- .getBuildDefinitionTemplate( this.buildDefinitionTemplate.getId() );
+ this.buildDefinitionTemplate = getContinuum().getBuildDefinitionService().getBuildDefinitionTemplate(
+ this.buildDefinitionTemplate.getId() );
this.setBuildDefinitions( getContinuum().getBuildDefinitionService().getAllTemplates() );
this.selectedBuildDefinitionIds = new ArrayList<String>();
if ( this.buildDefinitionTemplate.getBuildDefinitions() != null )
{
- for ( Iterator<BuildDefinition> iterator = this.buildDefinitionTemplate.getBuildDefinitions().iterator(); iterator
- .hasNext(); )
+ for ( BuildDefinition bd : (List<BuildDefinition>) buildDefinitionTemplate.getBuildDefinitions() )
{
- this.selectedBuildDefinitionIds.add( Integer.toString( iterator.next().getId() ) );
+ this.selectedBuildDefinitionIds.add( Integer.toString( bd.getId() ) );
}
}
List<BuildDefinition> nonUsedBuildDefinitions = new ArrayList<BuildDefinition>();
@@ -145,8 +143,8 @@
else
{
buildDefinitionTemplate.setBuildDefinitions( selectedBuildDefinitions );
- this.buildDefinitionTemplate = this.getContinuum().getBuildDefinitionService()
- .addBuildDefinitionTemplate( buildDefinitionTemplate );
+ this.buildDefinitionTemplate =
+ this.getContinuum().getBuildDefinitionService().addBuildDefinitionTemplate( buildDefinitionTemplate );
triggerAuditEvent( getPrincipal(), AuditLogConstants.TEMPLATE, buildDefinitionTemplate.getName(), AuditLogConstants.ADD_TEMPLATE );
}
@@ -158,9 +156,8 @@
{
if ( confirmed )
{
- buildDefinitionTemplate =
- getContinuum().getBuildDefinitionService().getBuildDefinitionTemplate(
- this.buildDefinitionTemplate.getId() );
+ buildDefinitionTemplate = getContinuum().getBuildDefinitionService().getBuildDefinitionTemplate(
+ this.buildDefinitionTemplate.getId() );
triggerAuditEvent( getPrincipal(), AuditLogConstants.TEMPLATE, buildDefinitionTemplate.getName(), AuditLogConstants.REMOVE_TEMPLATE );
this.getContinuum().getBuildDefinitionService().removeBuildDefinitionTemplate( buildDefinitionTemplate );
}
@@ -170,7 +167,7 @@
}
return SUCCESS;
}
-
+
private List<BuildDefinition> getBuildDefinitionsFromSelectedBuildDefinitions()
throws ContinuumException
{
@@ -181,8 +178,8 @@
List<BuildDefinition> selectedBuildDefinitions = new ArrayList<BuildDefinition>();
for ( String selectedBuildDefinitionId : selectedBuildDefinitionIds )
{
- BuildDefinition buildDefinition = getContinuum()
- .getBuildDefinition( Integer.parseInt( selectedBuildDefinitionId ) );
+ BuildDefinition buildDefinition =
+ getContinuum().getBuildDefinition( Integer.parseInt( selectedBuildDefinitionId ) );
selectedBuildDefinitions.add( buildDefinition );
}
return selectedBuildDefinitions;
@@ -196,13 +193,12 @@
{
return INPUT;
}
-
+
public String editBuildDefinition()
throws Exception
{
- this.buildDefinition = getContinuum().getBuildDefinitionService().getBuildDefinition(
- this.buildDefinition
- .getId() );
+ this.buildDefinition =
+ getContinuum().getBuildDefinitionService().getBuildDefinition( this.buildDefinition.getId() );
return SUCCESS;
}
@@ -228,15 +224,15 @@
buildDefinition.setSchedule( getContinuum().getSchedule( buildDefinition.getSchedule().getId() ) );
}
}
-
-
+
if ( this.buildDefinition.getId() > 0 )
{
this.getContinuum().getBuildDefinitionService().updateBuildDefinition( buildDefinition );
}
else
{
- this.buildDefinition = this.getContinuum().getBuildDefinitionService().addBuildDefinition( buildDefinition );
+ this.buildDefinition =
+ this.getContinuum().getBuildDefinitionService().addBuildDefinition( buildDefinition );
}
return SUCCESS;
@@ -247,14 +243,15 @@
{
if ( confirmed )
{
- buildDefinition = getContinuum().getBuildDefinitionService().getBuildDefinition( this.buildDefinition.getId() );
+ buildDefinition =
+ getContinuum().getBuildDefinitionService().getBuildDefinition( this.buildDefinition.getId() );
this.getContinuum().getBuildDefinitionService().removeBuildDefinition( buildDefinition );
}
else
{
return CONFIRM;
}
-
+
return SUCCESS;
}
@@ -278,7 +275,7 @@
public BuildDefinitionTemplate getBuildDefinitionTemplate()
{
- if (buildDefinitionTemplate == null)
+ if ( buildDefinitionTemplate == null )
{
this.buildDefinitionTemplate = new BuildDefinitionTemplate();
}
@@ -353,7 +350,7 @@
{
return schedules;
}
-
+
public List<BuildDefinition> getBuildDefinitions()
{
return buildDefinitions;
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java Wed Apr 15 21:56:46 2009
@@ -19,6 +19,8 @@
* under the License.
*/
+import com.opensymphony.xwork2.Preparable;
+
import java.io.File;
import javax.servlet.http.HttpServletRequest;
@@ -38,8 +40,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.opensymphony.xwork2.Preparable;
-
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
@@ -49,7 +49,7 @@
extends ContinuumActionSupport
implements Preparable, SecureAction
{
- private Logger logger = LoggerFactory.getLogger( this.getClass() );
+ private static final Logger logger = LoggerFactory.getLogger( ConfigurationAction.class );
private String workingDirectory;
@@ -113,7 +113,7 @@
}
String requireRelease = ServletActionContext.getRequest().getParameter( "requireReleaseOutput" );
- setRequireReleaseOutput( new Boolean( requireRelease ) );
+ setRequireReleaseOutput( Boolean.valueOf( requireRelease ) );
distributedBuildEnabled = configuration.isDistributedBuildEnabled();
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java Wed Apr 15 21:56:46 2009
@@ -55,11 +55,6 @@
private MavenAppConfiguration appConfiguration;
/**
- * The configuration.
- */
- private Configuration configuration;
-
- /**
* @plexus.requirement
*/
private CompanyPomHandler companyPomHandler;
@@ -99,7 +94,7 @@
public void prepare()
throws ProjectBuildingException, ArtifactMetadataRetrievalException, SettingsConfigurationException
{
- configuration = appConfiguration.getConfiguration();
+ Configuration configuration = appConfiguration.getConfiguration();
CompanyPom companyPom = configuration.getCompanyPom();
companyModel = companyPomHandler.getCompanyPomModel( companyPom, helper.getLocalRepository() );
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java Wed Apr 15 21:56:46 2009
@@ -53,7 +53,7 @@
extends ContinuumActionSupport
implements Preparable, SecureAction
{
- private Logger logger = LoggerFactory.getLogger( this.getClass() );
+ private static final Logger logger = LoggerFactory.getLogger( ProfileAction.class );
/**
* @plexus.requirement role-hint="default"
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java Wed Apr 15 21:56:46 2009
@@ -26,9 +26,9 @@
import java.util.Set;
import org.apache.commons.lang.ArrayUtils;
-import org.apache.continuum.buildmanager.BuildManagerException;
import org.apache.continuum.builder.distributed.executor.DistributedBuildTaskQueueExecutor;
import org.apache.continuum.builder.distributed.manager.DistributedBuildManager;
+import org.apache.continuum.buildmanager.BuildManagerException;
import org.apache.continuum.model.project.ProjectScmRoot;
import org.apache.continuum.taskqueue.BuildProjectTask;
import org.apache.continuum.taskqueue.CheckOutTask;
@@ -42,7 +42,6 @@
import org.apache.maven.continuum.web.exception.AuthenticationRequiredException;
import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
import org.apache.maven.continuum.web.model.DistributedBuildSummary;
-import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.taskqueue.Task;
import org.codehaus.plexus.taskqueue.TaskQueueException;
@@ -62,7 +61,7 @@
extends ContinuumActionSupport
implements SecureAction
{
- private Logger logger = LoggerFactory.getLogger( this.getClass() );
+ private static final Logger logger = LoggerFactory.getLogger( QueuesAction.class );
private static final String DISTRIBUTED_BUILD_SUCCESS = "distributed-build-success";
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java Wed Apr 15 21:56:46 2009
@@ -20,7 +20,6 @@
*/
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.maven.continuum.ContinuumException;
@@ -43,7 +42,7 @@
public class BuildDefinitionSummaryAction
extends AbstractBuildDefinitionAction
{
- private Logger logger = LoggerFactory.getLogger( this.getClass() );
+ private static final Logger logger = LoggerFactory.getLogger( BuildDefinitionSummaryAction.class );
private int projectGroupId;
@@ -103,9 +102,8 @@
checkViewProjectGroupAuthorization( projectGroup.getName() );
- for ( Iterator i = projectGroup.getProjects().iterator(); i.hasNext(); )
+ for ( Project project : (List<Project>) projectGroup.getProjects() )
{
- Project project = (Project) i.next();
projectBuildDefinitionSummaries.addAll( gatherProjectBuildDefinitionSummaries( project.getId() ) );
}
@@ -154,9 +152,9 @@
List<BuildDefinitionSummary> summaryList = new ArrayList<BuildDefinitionSummary>();
Project project = getContinuum().getProjectWithAllDetails( projectId );
- for ( Iterator i = project.getBuildDefinitions().iterator(); i.hasNext(); )
+ for ( BuildDefinition bd : (List<BuildDefinition>) project.getBuildDefinitions() )
{
- BuildDefinitionSummary bds = generateBuildDefinitionSummary( (BuildDefinition) i.next() );
+ BuildDefinitionSummary bds = generateBuildDefinitionSummary( bd );
bds.setFrom( "PROJECT" );
bds.setProjectId( project.getId() );
bds.setProjectName( project.getName() );
@@ -174,9 +172,9 @@
projectGroup = getContinuum().getProjectGroupWithBuildDetails( projectGroupId );
- for ( Iterator i = projectGroup.getBuildDefinitions().iterator(); i.hasNext(); )
+ for ( BuildDefinition bd : (List<BuildDefinition>) projectGroup.getBuildDefinitions() )
{
- BuildDefinitionSummary bds = generateBuildDefinitionSummary( (BuildDefinition) i.next() );
+ BuildDefinitionSummary bds = generateBuildDefinitionSummary( bd );
bds.setFrom( "GROUP" );
bds.setProjectGroupId( projectGroup.getId() );
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/NotifierSummaryAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/NotifierSummaryAction.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/NotifierSummaryAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/NotifierSummaryAction.java Wed Apr 15 21:56:46 2009
@@ -48,7 +48,7 @@
public class NotifierSummaryAction
extends ContinuumActionSupport
{
- private Logger logger = LoggerFactory.getLogger( this.getClass() );
+ private static final Logger logger = LoggerFactory.getLogger( NotifierSummaryAction.class );
/**
* Identifier for the {@link ProjectGroup} for which the Notifier summary
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java Wed Apr 15 21:56:46 2009
@@ -19,13 +19,13 @@
* under the License.
*/
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.maven.continuum.model.project.ProjectGroup;
import org.apache.maven.continuum.model.project.ProjectNotifier;
import org.apache.maven.continuum.notification.AbstractContinuumNotifier;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* Action that edits a {@link ProjectNotifier} of type 'Jabber' from the
* specified {@link ProjectGroup}.
@@ -71,14 +71,14 @@
address = (String) configuration.get( AbstractContinuumNotifier.ADDRESS_FIELD );
- sslConnection = Boolean.valueOf( (String) configuration.get( "sslConnection" ) ).booleanValue();
+ sslConnection = Boolean.valueOf( (String) configuration.get( "sslConnection" ) );
- group = Boolean.valueOf( (String) configuration.get( "isGroup" ) ).booleanValue();
+ group = Boolean.valueOf( (String) configuration.get( "isGroup" ) );
}
protected void setNotifierConfiguration( ProjectNotifier notifier )
{
- HashMap configuration = new HashMap();
+ HashMap<String, String> configuration = new HashMap<String, String>();
configuration.put( "host", host );
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java Wed Apr 15 21:56:46 2009
@@ -19,13 +19,13 @@
* under the License.
*/
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.project.ProjectNotifier;
import org.apache.maven.continuum.notification.AbstractContinuumNotifier;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* Action that edits a {@link ProjectNotifier} of type 'Jabber' from the
* specified {@link Project}.
@@ -70,14 +70,14 @@
address = (String) configuration.get( AbstractContinuumNotifier.ADDRESS_FIELD );
- sslConnection = Boolean.valueOf( (String) configuration.get( "sslConnection" ) ).booleanValue();
+ sslConnection = Boolean.valueOf( (String) configuration.get( "sslConnection" ) );
- group = Boolean.valueOf( (String) configuration.get( "isGroup" ) ).booleanValue();
+ group = Boolean.valueOf( (String) configuration.get( "isGroup" ) );
}
protected void setNotifierConfiguration( ProjectNotifier notifier )
{
- HashMap configuration = new HashMap();
+ HashMap<String, String> configuration = new HashMap<String, String>();
configuration.put( "host", host );
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/DefaultAppareanceConfiguration.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/DefaultAppareanceConfiguration.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/DefaultAppareanceConfiguration.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/DefaultAppareanceConfiguration.java Wed Apr 15 21:56:46 2009
@@ -36,29 +36,29 @@
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
- * @since 10 nov. 07
* @version $Id$
* @plexus.component role="org.apache.maven.continuum.web.appareance.AppareanceConfiguration" role-hint="default"
+ * @since 10 nov. 07
*/
public class DefaultAppareanceConfiguration
implements AppareanceConfiguration, Initializable
{
- private Logger log = LoggerFactory.getLogger( getClass() );
-
+ private static final Logger log = LoggerFactory.getLogger( DefaultAppareanceConfiguration.class );
+
private String footer;
-
+
public static final String APPEARANCE_FILE_NAME = "continuum-appearance.xml";
-
- private ContinuumAppearance continuumAppearance = new ContinuumAppearance();
-
+
+ private ContinuumAppearance continuumAppearance = new ContinuumAppearance();
+
// ------------------------------------------------
// Plexus Lifecycle
// ------------------------------------------------
-
+
public void initialize()
throws InitializationException
{
-
+
File appearanceConfFile = getAppearanceConfigurationFile();
if ( appearanceConfFile.exists() )
@@ -66,8 +66,7 @@
try
{
ContinuumAppearanceModelsXpp3Reader appearanceReader = new ContinuumAppearanceModelsXpp3Reader();
- this.continuumAppearance = appearanceReader.read( ReaderFactory
- .newXmlReader( appearanceConfFile ) );
+ this.continuumAppearance = appearanceReader.read( ReaderFactory.newXmlReader( appearanceConfFile ) );
if ( continuumAppearance != null )
{
this.footer = continuumAppearance.getFooter();
@@ -75,13 +74,13 @@
}
catch ( IOException e )
{
- log.warn( "skip IOException reading appearance file " + APPEARANCE_FILE_NAME + ", msg "
- + e.getMessage() );
+ log.warn(
+ "skip IOException reading appearance file " + APPEARANCE_FILE_NAME + ", msg " + e.getMessage() );
}
catch ( XmlPullParserException e )
{
- log.warn( "skip XmlPullParserException reading appearance file " + APPEARANCE_FILE_NAME + ", msg "
- + e.getMessage() );
+ log.warn( "skip XmlPullParserException reading appearance file " + APPEARANCE_FILE_NAME + ", msg " +
+ e.getMessage() );
}
}
if ( StringUtils.isEmpty( this.footer ) )
@@ -90,8 +89,8 @@
this.footer = getDefaultFooter();
}
}
-
- /**
+
+ /**
* @see org.apache.maven.continuum.web.appareance.AppareanceConfiguration#getFooter()
*/
public String getFooter()
@@ -99,7 +98,7 @@
return this.footer;
}
- /**
+ /**
* @see org.apache.maven.continuum.web.appareance.AppareanceConfiguration#saveFooter(java.lang.String)
*/
public void saveFooter( String footerHtmlContent )
@@ -108,7 +107,7 @@
continuumAppearance.setFooter( footerHtmlContent );
ContinuumAppearanceModelsXpp3Writer writer = new ContinuumAppearanceModelsXpp3Writer();
File confFile = getAppearanceConfigurationFile();
- if (!confFile.exists())
+ if ( !confFile.exists() )
{
confFile.getParentFile().mkdirs();
}
@@ -124,16 +123,16 @@
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append( "<div class=\"xright\">" );
stringBuilder.append( "Copyright © " );
- stringBuilder.append( String.valueOf( inceptionYear ) + "-" + String.valueOf( currentYear ) );
+ stringBuilder.append( String.valueOf( inceptionYear ) ).append( "-" ).append( String.valueOf( currentYear ) );
stringBuilder.append( " The Apache Software Foundation" );
stringBuilder.append( "</div> <div class=\"clear\"><hr/></div>" );
return stringBuilder.toString();
- }
-
-
+ }
+
+
private File getAppearanceConfigurationFile()
{
- return new File( System.getProperty( "appserver.base" ) + File.separator + "conf" + File.separator
- + APPEARANCE_FILE_NAME );
+ return new File(
+ System.getProperty( "appserver.base" ) + File.separator + "conf" + File.separator + APPEARANCE_FILE_NAME );
}
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java Wed Apr 15 21:56:46 2009
@@ -42,7 +42,7 @@
public class RoleProfileEnvironmentCheck
implements EnvironmentCheck
{
- private Logger log = LoggerFactory.getLogger( RoleProfileEnvironmentCheck.class );
+ private static final Logger log = LoggerFactory.getLogger( RoleProfileEnvironmentCheck.class );
/**
* @plexus.requirement role-hint="default"
@@ -60,12 +60,10 @@
{
log.info( "Checking roles list." );
- Collection projectGroups = continuum.getAllProjectGroups();
+ Collection<ProjectGroup> projectGroups = continuum.getAllProjectGroups();
- for ( Iterator i = projectGroups.iterator(); i.hasNext(); )
+ for ( ProjectGroup group: projectGroups )
{
- ProjectGroup group = (ProjectGroup) i.next();
-
// gets the role, making it if it doesn't exist
//TODO: use continuum.executeAction( "add-assignable-roles", context ); or something like that to avoid code duplication
if ( !roleManager.templatedRoleExists( "project-administrator", group.getName() ) )
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/WorkingCopyContentGenerator.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/WorkingCopyContentGenerator.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/WorkingCopyContentGenerator.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/WorkingCopyContentGenerator.java Wed Apr 15 21:56:46 2009
@@ -19,8 +19,6 @@
* under the License.
*/
-import org.codehaus.plexus.util.StringUtils;
-
import java.io.File;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
@@ -28,6 +26,8 @@
import java.util.Date;
import java.util.List;
+import org.codehaus.plexus.util.StringUtils;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
@@ -38,7 +38,7 @@
private String urlParamSeparator;
- private static DecimalFormat decFormatter = new DecimalFormat( "###.##" );
+ private static final DecimalFormat decFormatter = new DecimalFormat( "###.##" );
private static final long KILO = 1024;
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/CronExpressionValidator.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/CronExpressionValidator.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/CronExpressionValidator.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/CronExpressionValidator.java Wed Apr 15 21:56:46 2009
@@ -19,7 +19,6 @@
* under the License.
*/
-import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.validator.ValidationException;
import com.opensymphony.xwork2.validator.ValidatorContext;
import com.opensymphony.xwork2.validator.validators.ValidatorSupport;
@@ -42,8 +41,9 @@
String dayOfWeek = (String) getFieldValue( "dayOfWeek", object );
String year = (String) getFieldValue( "year", object );
- String cronExpression = ( second + " " + minute + " " + hour + " " + dayOfMonth + " " + month + " " +
- dayOfWeek + " " + year ).trim();
+ String cronExpression =
+ ( second + " " + minute + " " + hour + " " + dayOfMonth + " " + month + " " + dayOfWeek + " " +
+ year ).trim();
org.codehaus.plexus.scheduler.CronExpressionValidator validator =
new org.codehaus.plexus.scheduler.CronExpressionValidator();
@@ -54,7 +54,6 @@
{
// FIXME i18n
ctxt.addActionError( "Invalid cron expression value(s)" );
- return;
}
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java Wed Apr 15 21:56:46 2009
@@ -21,6 +21,7 @@
import com.opensymphony.xwork2.validator.ValidationException;
import com.opensymphony.xwork2.validator.validators.ValidatorSupport;
+
import org.apache.maven.continuum.execution.ExecutorConfigurator;
import org.apache.maven.continuum.installation.InstallationException;
import org.apache.maven.continuum.installation.InstallationService;
@@ -28,8 +29,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.List;
-
/**
* @author <a href="mailto:olamy@codehaus.org">olamy</a>
@@ -42,7 +41,7 @@
{
private String fieldName;
- private Logger logger = LoggerFactory.getLogger( this.getClass() );
+ private static final Logger logger = LoggerFactory.getLogger( InstallationValidator.class );
/**
* @plexus.requirement role-hint="default"
@@ -78,8 +77,7 @@
if ( executorConfigurator.getVersionArgument() != null )
{
// just try to get version infos to validate path is valid
- List<String> versionInfos =
- installationService.getExecutorConfiguratorVersion( varValue, executorConfigurator, null );
+ installationService.getExecutorConfiguratorVersion( varValue, executorConfigurator, null );
}
}
}
@@ -91,7 +89,6 @@
}
}
-
public String getFieldName()
{
return fieldName;
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java Wed Apr 15 21:56:46 2009
@@ -20,6 +20,13 @@
*/
import com.opensymphony.xwork2.ActionContext;
+
+import java.util.HashMap;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.PageContext;
+
import org.apache.maven.continuum.security.ContinuumRoleConstants;
import org.apache.maven.continuum.web.model.ProjectSummary;
import org.apache.struts2.views.util.UrlHelper;
@@ -34,11 +41,6 @@
import org.extremecomponents.table.cell.DisplayCell;
import org.extremecomponents.table.core.TableModel;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
-import java.util.HashMap;
-
/**
* Used in Summary view
*
@@ -76,15 +78,15 @@
{
if ( buildNumber > 0 )
{
- HashMap params = new HashMap();
+ HashMap<String, Object> params = new HashMap<String, Object>();
- params.put( "projectId", new Integer( project.getId() ) );
+ params.put( "projectId", project.getId() );
params.put( "projectName", project.getName() );
- params.put( "buildId", new Integer( project.getBuildInSuccessId() ) );
+ params.put( "buildId", project.getBuildInSuccessId() );
- params.put( "projectGroupId", new Integer( project.getProjectGroupId() ) );
+ params.put( "projectGroupId", project.getProjectGroupId() );
PageContext pageContext = (PageContext) tableModel.getContext().getContextObject();
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java Wed Apr 15 21:56:46 2009
@@ -21,7 +21,7 @@
import com.opensymphony.xwork2.ActionContext;
-import org.apache.continuum.model.project.ProjectScmRoot;
+import java.util.HashMap;
import org.apache.continuum.model.project.ProjectScmRoot;
import org.apache.maven.continuum.project.ContinuumProjectState;
@@ -41,8 +41,6 @@
import org.extremecomponents.table.cell.DisplayCell;
import org.extremecomponents.table.core.TableModel;
-import java.util.HashMap;
-
/**
* Used in Summary view
*
@@ -70,10 +68,11 @@
case ContinuumProjectState.UPDATING:
case ContinuumProjectState.CHECKING_OUT:
{
- String state = StateGenerator.generate( project.getState(), tableModel.getContext().getContextPath() );
+ String state =
+ StateGenerator.generate( project.getState(), tableModel.getContext().getContextPath() );
- if ( project.getLatestBuildId() != -1 && !StateGenerator.NEW.equals( state )
- && project.getState() != ContinuumProjectState.UPDATING )
+ if ( project.getLatestBuildId() != -1 && !StateGenerator.NEW.equals( state ) &&
+ project.getState() != ContinuumProjectState.UPDATING )
{
if ( isAuthorized( project.getProjectGroupName() ) )
{
@@ -96,7 +95,7 @@
}
}
}
- else
+ else
{
ProjectScmRoot projectScmRoot = (ProjectScmRoot) tableModel.getCurrentRowBean();
@@ -106,13 +105,13 @@
case ContinuumProjectState.UPDATED:
case ContinuumProjectState.ERROR:
{
- String state = StateGenerator.generate( projectScmRoot.getState(),
- tableModel.getContext().getContextPath() );
-
+ String state =
+ StateGenerator.generate( projectScmRoot.getState(), tableModel.getContext().getContextPath() );
+
if ( !StateGenerator.NEW.equals( state ) )
{
if ( isAuthorized( projectScmRoot.getProjectGroup().getName() ) &&
- projectScmRoot.getState() == ContinuumProjectState.ERROR )
+ projectScmRoot.getState() == ContinuumProjectState.ERROR )
{
return createActionLink( "scmResult", projectScmRoot, state );
}
@@ -137,31 +136,31 @@
private static String createActionLink( String action, ProjectSummary project, String state )
{
- HashMap params = new HashMap();
+ HashMap<String, Object> params = new HashMap<String, Object>();
- params.put( "projectId", new Integer( project.getId() ) );
+ params.put( "projectId", project.getId() );
params.put( "projectName", project.getName() );
- params.put( "buildId", new Integer( project.getLatestBuildId() ) );
+ params.put( "buildId", project.getLatestBuildId() );
- params.put( "projectGroupId", new Integer( project.getProjectGroupId() ) );
+ params.put( "projectGroupId", project.getProjectGroupId() );
String url = UrlHelper.buildUrl( "/" + action + ".action", ServletActionContext.getRequest(),
ServletActionContext.getResponse(), params );
return "<a href=\"" + url + "\">" + state + "</a>";
}
-
+
private static String createActionLink( String action, ProjectScmRoot scmRoot, String state )
{
- HashMap params = new HashMap();
+ HashMap<String, Object> params = new HashMap<String, Object>();
- params.put( "projectGroupId", new Integer( scmRoot.getProjectGroup().getId() ) );
+ params.put( "projectGroupId", scmRoot.getProjectGroup().getId() );
- params.put( "projectScmRootId", new Integer( scmRoot.getId() ) );
+ params.put( "projectScmRootId", scmRoot.getId() );
- String url = UrlHelper.buildUrl( "/" + action + ".action", ServletActionContext.getRequest(),
+ String url = UrlHelper.buildUrl( "/" + action + ".action", ServletActionContext.getRequest(),
ServletActionContext.getResponse(), params );
return "<a href=\"" + url + "\">" + state + "</a>";
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/buildresults/StateCell.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/buildresults/StateCell.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/buildresults/StateCell.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/buildresults/StateCell.java Wed Apr 15 21:56:46 2009
@@ -19,14 +19,14 @@
* under the License.
*/
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.PageContext;
+
import org.apache.maven.continuum.web.util.StateGenerator;
import org.extremecomponents.table.bean.Column;
import org.extremecomponents.table.cell.DisplayCell;
import org.extremecomponents.table.core.TableModel;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
-
/**
* Used in BuildResults
*
@@ -50,7 +50,7 @@
if ( value instanceof Integer )
{
- state = ( (Integer) value ).intValue();
+ state = (Integer) value;
}
value = StateGenerator.generate( state, request.getContextPath() );
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/commons/DateCell.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/commons/DateCell.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/commons/DateCell.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/commons/DateCell.java Wed Apr 15 21:56:46 2009
@@ -51,7 +51,7 @@
{
Calendar cal = Calendar.getInstance();
- cal.setTimeInMillis( ( (Long) value ).longValue() );
+ cal.setTimeInMillis( (Long) value );
value = cal.getTime();
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java Wed Apr 15 21:56:46 2009
@@ -22,17 +22,18 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.TextProvider;
import com.opensymphony.xwork2.util.ValueStack;
-import org.apache.struts2.views.jsp.ui.TextareaTag;
-import javax.servlet.jsp.JspException;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
-import java.util.Iterator;
import java.util.List;
+import javax.servlet.jsp.JspException;
+
+import org.apache.struts2.views.jsp.ui.TextareaTag;
+
/**
* First attempt at creating a date tag for the webwork framework. The tag will
* format a date by using either a specified format attribute, or by falling
@@ -86,8 +87,6 @@
//our optional format parameter
private String format;
- private String actualName;
-
private String nameAttr;
private boolean nice;
@@ -99,7 +98,7 @@
public int doEndTag()
throws JspException
{
- actualName = findString( nameAttr );
+ String actualName = findString( nameAttr );
String msg = null;
ValueStack stack = getStack();
//find the name on the valueStack, and cast it to a date
@@ -114,7 +113,7 @@
else if ( dateObj instanceof Long )
{
Calendar cal = Calendar.getInstance();
- cal.setTimeInMillis( ( (Long) dateObj ).longValue() );
+ cal.setTimeInMillis( (Long) dateObj );
date = cal.getTime();
}
else
@@ -140,7 +139,7 @@
{
if ( format == null )
{
- String globalFormat = null;
+ String globalFormat;
//if the format is not specified, fall back using the defined
// property DATETAG_PROPERTY
@@ -189,10 +188,8 @@
private TextProvider findProviderInStack()
{
- for ( Iterator iterator = getStack().getRoot().iterator(); iterator.hasNext(); )
+ for ( Object o : getStack().getRoot() )
{
- Object o = iterator.next();
-
if ( o instanceof TextProvider )
{
return (TextProvider) o;
@@ -205,7 +202,7 @@
public String formatTime( Date date )
{
StringBuffer sb = new StringBuffer();
- List args = new ArrayList();
+ List<Object> args = new ArrayList<Object>();
long secs = ( new Date().getTime() - date.getTime() ) / 1000;
long mins = secs / 60;
int min = (int) mins % 60;
@@ -217,7 +214,7 @@
if ( Math.abs( secs ) < 60 )
{
- args.add( new Long( secs ) );
+ args.add( secs );
args.add( sb );
args.add( null );
sb.append( tp.getText( DATETAG_PROPERTY_SECONDS, DATETAG_DEFAULT_SECONDS, args ) );
@@ -225,7 +222,7 @@
}
else if ( hours == 0 )
{
- args.add( new Long( min ) );
+ args.add( (long) min );
args.add( sb );
args.add( null );
sb.append( tp.getText( DATETAG_PROPERTY_MINUTES, DATETAG_DEFAULT_MINUTES, args ) );
@@ -233,24 +230,24 @@
}
else if ( days == 0 )
{
- args.add( new Long( hour ) );
- args.add( new Long( min ) );
+ args.add( (long) hour );
+ args.add( (long) min );
args.add( sb );
args.add( null );
sb.append( tp.getText( DATETAG_PROPERTY_HOURS, DATETAG_DEFAULT_HOURS, args ) );
}
else if ( years == 0 )
{
- args.add( new Long( days ) );
- args.add( new Long( hour ) );
+ args.add( (long) days );
+ args.add( (long) hour );
args.add( sb );
args.add( null );
sb.append( tp.getText( DATETAG_PROPERTY_DAYS, DATETAG_DEFAULT_DAYS, args ) );
}
else
{
- args.add( new Object[]{new Long( years )} );
- args.add( new Object[]{new Long( day )} );
+ args.add( new Object[]{(long) years} );
+ args.add( new Object[]{(long) day} );
args.add( sb );
args.add( null );
@@ -269,12 +266,6 @@
}
}
- public int doStartTag()
- throws JspException
- {
- return super.doStartTag();
- }
-
public void setName( String name )
{
this.nameAttr = name;
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierRecipientCell.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierRecipientCell.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierRecipientCell.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierRecipientCell.java Wed Apr 15 21:56:46 2009
@@ -40,8 +40,6 @@
{
ProjectNotifier notifier = (ProjectNotifier) tableModel.getCurrentRowBean();
- String recipient = GenerateRecipentNotifier.generate( notifier );
-
- return recipient;
+ return GenerateRecipentNotifier.generate( notifier );
}
}
Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ReleasePrepareActionTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ReleasePrepareActionTest.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ReleasePrepareActionTest.java (original)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ReleasePrepareActionTest.java Wed Apr 15 21:56:46 2009
@@ -33,14 +33,9 @@
public class ReleasePrepareActionTest
extends MockObjectTestCase
{
+ private final ReleasePrepareAction action;
- private ReleasePrepareAction action;
-
- private Mock continuumMock;
-
- private Mock securitySessionMock;
-
- private Mock actionContextMock;
+ private final Mock continuumMock;
public ReleasePrepareActionTest()
{
Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java (original)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java Wed Apr 15 21:56:46 2009
@@ -31,7 +31,7 @@
public class TestAction
extends PlexusActionSupport
{
- private Logger logger = LoggerFactory.getLogger( this.getClass() );
+ private static final Logger logger = LoggerFactory.getLogger( TestAction.class );
private String testString;
Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/ContinuumXmlRpcClient.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/ContinuumXmlRpcClient.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/ContinuumXmlRpcClient.java (original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/ContinuumXmlRpcClient.java Wed Apr 15 21:56:46 2009
@@ -45,7 +45,6 @@
import org.apache.maven.continuum.xmlrpc.system.Installation;
import org.apache.maven.continuum.xmlrpc.system.Profile;
import org.apache.maven.continuum.xmlrpc.system.SystemConfiguration;
-import org.apache.xmlrpc.XmlRpcException;
import org.apache.xmlrpc.client.XmlRpcClient;
import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
import org.apache.xmlrpc.client.util.ClientFactory;
@@ -57,22 +56,22 @@
public class ContinuumXmlRpcClient
implements ContinuumService
{
- private ContinuumService continuum;
+ private final ContinuumService continuum;
- private static Hashtable statusMap;
+ private static Hashtable<Integer, String> statusMap;
static
{
- statusMap = new Hashtable();
- statusMap.put( new Integer( ContinuumProjectState.NEW ), "New" );
- statusMap.put( new Integer( ContinuumProjectState.CHECKEDOUT ), "New" );
- statusMap.put( new Integer( ContinuumProjectState.OK ), "OK" );
- statusMap.put( new Integer( ContinuumProjectState.FAILED ), "Failed" );
- statusMap.put( new Integer( ContinuumProjectState.ERROR ), "Error" );
- statusMap.put( new Integer( ContinuumProjectState.BUILDING ), "Building" );
- statusMap.put( new Integer( ContinuumProjectState.CHECKING_OUT ), "Checking out" );
- statusMap.put( new Integer( ContinuumProjectState.UPDATING ), "Updating" );
- statusMap.put( new Integer( ContinuumProjectState.WARNING ), "Warning" );
+ statusMap = new Hashtable<Integer, String>();
+ statusMap.put( ContinuumProjectState.NEW, "New" );
+ statusMap.put( ContinuumProjectState.CHECKEDOUT, "New" );
+ statusMap.put( ContinuumProjectState.OK, "OK" );
+ statusMap.put( ContinuumProjectState.FAILED, "Failed" );
+ statusMap.put( ContinuumProjectState.ERROR, "Error" );
+ statusMap.put( ContinuumProjectState.BUILDING, "Building" );
+ statusMap.put( ContinuumProjectState.CHECKING_OUT, "Checking out" );
+ statusMap.put( ContinuumProjectState.UPDATING, "Updating" );
+ statusMap.put( ContinuumProjectState.WARNING, "Warning" );
}
public ContinuumXmlRpcClient( URL serviceUrl )
@@ -325,13 +324,13 @@
}
public int buildGroup( int projectGroupId )
- throws Exception, XmlRpcException
+ throws Exception
{
return continuum.buildGroup( projectGroupId );
}
public int buildGroup( int projectGroupId, int buildDefinitionId )
- throws Exception, XmlRpcException
+ throws Exception
{
return continuum.buildGroup( projectGroupId, buildDefinitionId );
}
@@ -359,7 +358,7 @@
}
public int removeBuildResult( BuildResult br )
- throws Exception, XmlRpcException
+ throws Exception
{
return continuum.removeBuildResult( br );
}
@@ -492,7 +491,7 @@
public String getProjectStatusAsString( int status )
{
- return (String) statusMap.get( new Integer( status ) );
+ return statusMap.get( new Integer( status ) );
}
// ----------------------------------------------------------------------
Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/AbstractContinuumSecureService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/AbstractContinuumSecureService.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/AbstractContinuumSecureService.java (original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/AbstractContinuumSecureService.java Wed Apr 15 21:56:46 2009
@@ -63,12 +63,8 @@
*/
public boolean isAuthenticated()
{
- if ( getSecuritySession() == null || !getSecuritySession().isAuthenticated() )
- {
- return false;
- }
+ return !( getSecuritySession() == null || !getSecuritySession().isAuthenticated() );
- return true;
}
/**
Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java (original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java Wed Apr 15 21:56:46 2009
@@ -19,6 +19,9 @@
* under the License.
*/
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.xmlrpc.XmlRpcException;
import org.apache.xmlrpc.XmlRpcRequest;
import org.apache.xmlrpc.server.RequestProcessorFactoryFactory;
@@ -33,10 +36,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
@@ -45,23 +44,22 @@
public class ConfiguredBeanProcessorFactory
implements RequestProcessorFactoryFactory, Initializable, Contextualizable
{
- private Logger log = LoggerFactory.getLogger( ConfiguredBeanProcessorFactory.class );
+ private static final Logger log = LoggerFactory.getLogger( ConfiguredBeanProcessorFactory.class );
/**
* @plexus.requirement role="org.apache.maven.continuum.xmlrpc.server.ContinuumXmlRpcComponent"
*/
- private Map xmlrpcComponents;
+ private Map<String, Object> xmlrpcComponents;
- private Map componentsMapping = new HashMap();
+ private Map<String, String> componentsMapping = new HashMap<String, String>();
PlexusContainer container;
public void initialize()
throws InitializationException
{
- for ( Iterator i = xmlrpcComponents.keySet().iterator(); i.hasNext(); )
+ for ( String key : xmlrpcComponents.keySet() )
{
- String key = (String) i.next();
String className = xmlrpcComponents.get( key ).getClass().getName();
componentsMapping.put( className, key );
}
@@ -112,7 +110,7 @@
private String getComponentKey( Class cls )
{
- return (String) componentsMapping.get( cls.getName() );
+ return componentsMapping.get( cls.getName() );
}
private Object getComponent( Class cls )
Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java (original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java Wed Apr 15 21:56:46 2009
@@ -80,7 +80,7 @@
public class ContinuumServiceImpl
extends AbstractContinuumSecureService
{
- private static MapperIF mapper = DozerBeanMapperSingletonWrapper.getInstance();
+ private static final MapperIF mapper = DozerBeanMapperSingletonWrapper.getInstance();
/**
* @plexus.requirement
@@ -1561,29 +1561,24 @@
if ( result.hasErrors() )
{
- for ( Iterator i = result.getErrors().iterator(); i.hasNext(); )
+ for ( String error : result.getErrors() )
{
- String error = (String) i.next();
res.addError( error );
}
}
if ( result.getProjects() != null )
{
- for ( Iterator i = result.getProjects().iterator(); i.hasNext(); )
+ for ( org.apache.maven.continuum.model.project.Project project : result.getProjects() )
{
- org.apache.maven.continuum.model.project.Project project =
- (org.apache.maven.continuum.model.project.Project) i.next();
res.addProject( populateProjectSummary( project ) );
}
}
if ( result.getProjectGroups() != null )
{
- for ( Iterator i = result.getProjectGroups().iterator(); i.hasNext(); )
+ for ( org.apache.maven.continuum.model.project.ProjectGroup projectGroup : result.getProjectGroups() )
{
- org.apache.maven.continuum.model.project.ProjectGroup projectGroup =
- (org.apache.maven.continuum.model.project.ProjectGroup) i.next();
res.addProjectGroup( populateProjectGroupSummary( projectGroup ) );
}
}
Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcMetaDataHandler.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcMetaDataHandler.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcMetaDataHandler.java (original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcMetaDataHandler.java Wed Apr 15 21:56:46 2009
@@ -1,5 +1,8 @@
package org.apache.maven.continuum.xmlrpc.server;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
import org.apache.xmlrpc.XmlRpcException;
import org.apache.xmlrpc.XmlRpcHandler;
import org.apache.xmlrpc.XmlRpcRequest;
@@ -12,9 +15,6 @@
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
@@ -52,7 +52,7 @@
private final String methodHelp;
- private PlexusContainer container;
+ private final PlexusContainer container;
/**
* Creates a new instance.
@@ -109,9 +109,8 @@
args[j] = pRequest.getParameter( j );
}
Object instance = getInstance( pRequest );
- for ( int i = 0; i < methods.length; i++ )
+ for ( MethodData methodData : methods )
{
- MethodData methodData = methods[i];
TypeConverter[] converters = methodData.typeConverters;
if ( args.length == converters.length )
{
Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java?rev=765385&r1=765384&r2=765385&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java (original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java Wed Apr 15 21:56:46 2009
@@ -44,21 +44,20 @@
extends PropertyHandlerMapping
implements Contextualizable
{
- private Logger log = LoggerFactory.getLogger( PropertiesHandlerMapping.class );
+ private static final Logger log = LoggerFactory.getLogger( PropertiesHandlerMapping.class );
/**
* @plexus.requirement role="org.apache.maven.continuum.xmlrpc.server.ContinuumXmlRpcComponent"
*/
- private Map xmlrpcComponents;
+ private Map<String, Object> xmlrpcComponents;
private PlexusContainer container;
public void load()
throws XmlRpcException
{
- for ( Iterator i = xmlrpcComponents.keySet().iterator(); i.hasNext(); )
+ for ( String key : xmlrpcComponents.keySet() )
{
- String key = (String) i.next();
Class cl = xmlrpcComponents.get( key ).getClass();
if ( log.isDebugEnabled() )
{
@@ -71,9 +70,9 @@
if ( log.isDebugEnabled() )
{
String[] methods = getListMethods();
- for ( int i = 0; i < methods.length; i++ )
+ for ( String method : methods )
{
- log.debug( methods[i] );
+ log.debug( method );
}
}
}