continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r548742 [3/3] - in /maven/continuum/trunk: continuum-api/src/main/java/org/apache/maven/continuum/ continuum-api/src/main/java/org/apache/maven/continuum/execution/ continuum-api/src/main/java/org/apache/maven/continuum/installation/ contin...
Date Tue, 19 Jun 2007 14:40:57 GMT
Modified: maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java (original)
+++ maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java Tue Jun 19 07:40:51 2007
@@ -19,23 +19,6 @@
  * under the License.
  */
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.jdo.Extent;
-import javax.jdo.FetchPlan;
-import javax.jdo.JDOHelper;
-import javax.jdo.JDOUserException;
-import javax.jdo.PersistenceManager;
-import javax.jdo.PersistenceManagerFactory;
-import javax.jdo.Query;
-import javax.jdo.Transaction;
-
 import org.apache.maven.continuum.model.project.BuildDefinition;
 import org.apache.maven.continuum.model.project.BuildResult;
 import org.apache.maven.continuum.model.project.Project;
@@ -62,12 +45,28 @@
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.codehaus.plexus.util.StringUtils;
 
+import javax.jdo.Extent;
+import javax.jdo.FetchPlan;
+import javax.jdo.JDOHelper;
+import javax.jdo.JDOUserException;
+import javax.jdo.PersistenceManager;
+import javax.jdo.PersistenceManagerFactory;
+import javax.jdo.Query;
+import javax.jdo.Transaction;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  * @version $Id$
  * @plexus.component role="org.apache.maven.continuum.store.ContinuumStore"
- *                   role-hint="jdo"
+ * role-hint="jdo"
  */
 public class JdoContinuumStore
     extends AbstractContinuumStore
@@ -208,7 +207,7 @@
     /**
      * get the combined list of projectId and build definitions, including the
      * ones inherited by their project group
-     * 
+     *
      * @param scheduleId
      * @return
      * @throws ContinuumStoreException
@@ -1058,8 +1057,9 @@
                 {
                     Profile profile = iterator.next();
                     List newEnvironmentVariables = new ArrayList<Installation>();
-                    for ( Iterator<Installation> iteInstallation = profile.getEnvironmentVariables().iterator(); iteInstallation
-                        .hasNext(); )
+                    for ( Iterator<Installation> iteInstallation = profile.getEnvironmentVariables().iterator();
+                          iteInstallation
+                              .hasNext(); )
                     {
                         Installation current = iteInstallation.next();
                         if ( !StringUtils.equals( current.getName(), installation.getName() ) )
@@ -1141,8 +1141,8 @@
         {
             tx.begin();
 
-            Query query = pm.newQuery( "SELECT FROM " + BuildResult.class.getName()
-                + " WHERE project.id == projectId PARAMETERS int projectId ORDER BY endTime DESC" );
+            Query query = pm.newQuery( "SELECT FROM " + BuildResult.class.getName() +
+                " WHERE project.id == projectId PARAMETERS int projectId ORDER BY endTime DESC" );
 
             query.declareImports( "import java.lang.Integer" );
 
@@ -1562,8 +1562,8 @@
         }
         catch ( ContinuumStoreException e )
         {
-            throw new ContinuumObjectNotFoundException( "unable to find project group containing project with id: "
-                + projectId );
+            throw new ContinuumObjectNotFoundException(
+                "unable to find project group containing project with id: " + projectId );
 
         }
     }
@@ -1591,7 +1591,7 @@
         else if ( systemConfs.size() > 1 )
         {
             throw new ContinuumStoreException(
-                                               "Database is corrupted. There are more than one systemConfiguration object." );
+                "Database is corrupted. There are more than one systemConfiguration object." );
         }
         else
         {
@@ -1621,13 +1621,10 @@
 
     public Collection getAllProjectGroupsWithTheLot()
     {
-        List fetchGroups = Arrays.asList( new String[] {
-            PROJECT_WITH_BUILDS_FETCH_GROUP,
-            PROJECTGROUP_PROJECTS_FETCH_GROUP,
-            BUILD_RESULT_WITH_DETAILS_FETCH_GROUP,
-            PROJECT_WITH_CHECKOUT_RESULT_FETCH_GROUP,
-            PROJECT_ALL_DETAILS_FETCH_GROUP,
-            PROJECT_BUILD_DETAILS_FETCH_GROUP } );
+        List fetchGroups = Arrays.asList( new String[]{PROJECT_WITH_BUILDS_FETCH_GROUP,
+            PROJECTGROUP_PROJECTS_FETCH_GROUP, BUILD_RESULT_WITH_DETAILS_FETCH_GROUP,
+            PROJECT_WITH_CHECKOUT_RESULT_FETCH_GROUP, PROJECT_ALL_DETAILS_FETCH_GROUP,
+            PROJECT_BUILD_DETAILS_FETCH_GROUP} );
         return PlexusJdoUtils.getAllObjectsDetached( getPersistenceManager(), ProjectGroup.class, "name ascending",
                                                      fetchGroups );
     }
@@ -1655,9 +1652,8 @@
 
     /**
      * Close the PersistenceManagerFactory.
-     * 
-     * @param numTry
-     *            The number of try. The maximum try is 5.
+     *
+     * @param numTry The number of try. The maximum try is 5.
      */
     private void closePersistenceManagerFactory( PersistenceManagerFactory pmf, int numTry )
     {

Modified: maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java (original)
+++ maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java Tue Jun 19 07:40:51 2007
@@ -65,15 +65,15 @@
         getStore();
 
         setUpConfigurationService( (ConfigurationService) lookup( ConfigurationService.ROLE ) );
-        
+
         Collection projectGroups = store.getAllProjectGroupsWithProjects();
 
         assertEquals( 0, projectGroups.size() );
 
         createDefaultProjectGroup();
-        
+
         projectGroups = store.getAllProjectGroupsWithProjects();
-        
+
         assertEquals( 1, projectGroups.size() );
     }
 
@@ -164,7 +164,8 @@
             System.setProperty( (String) entry.getKey(), (String) entry.getValue() );
         }
 
-        SchemaTool.createSchemaTables( new URL[]{getClass().getResource( "/META-INF/package.jdo" )}, new URL[] {}, null, false, null );
+        SchemaTool.createSchemaTables( new URL[]{getClass().getResource( "/META-INF/package.jdo" )}, new URL[]{}, null,
+                                       false, null );
 
         // ----------------------------------------------------------------------
         // Check the configuration

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AboutAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AboutAction.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AboutAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AboutAction.java Tue Jun 19 07:40:51 2007
@@ -24,10 +24,8 @@
  *
  * @author: Jesse McConnell <jmcconnell@apache.org>
  * @version: $ID:$
- *
- * @plexus.component
- *   role="com.opensymphony.xwork.Action"
- *   role-hint="about"
+ * @plexus.component role="com.opensymphony.xwork.Action"
+ * role-hint="about"
  */
 public class AboutAction
     extends ContinuumActionSupport

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java Tue Jun 19 07:40:51 2007
@@ -36,7 +36,8 @@
     extends AddMavenProjectAction
 {
 
-    protected ContinuumProjectBuildingResult doExecute( String pomUrl, int selectedProjectGroup, boolean checkProtocol, boolean scmUseCache )
+    protected ContinuumProjectBuildingResult doExecute( String pomUrl, int selectedProjectGroup, boolean checkProtocol,
+                                                        boolean scmUseCache )
         throws ContinuumException
     {
         return getContinuum().addMavenOneProject( pomUrl, selectedProjectGroup, checkProtocol, scmUseCache );

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java Tue Jun 19 07:40:51 2007
@@ -20,7 +20,6 @@
  */
 
 import org.apache.maven.continuum.ContinuumException;
-import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
@@ -51,7 +50,8 @@
 
     public static final String FILE_SCHEME = "file:/";
 
-    protected ContinuumProjectBuildingResult doExecute( String pomUrl, int selectedProjectGroup, boolean checkProtocol, boolean scmUseCache )
+    protected ContinuumProjectBuildingResult doExecute( String pomUrl, int selectedProjectGroup, boolean checkProtocol,
+                                                        boolean scmUseCache )
         throws ContinuumException
     {
         ContinuumProjectBuildingResult result = null;

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java Tue Jun 19 07:40:51 2007
@@ -47,7 +47,8 @@
         {
             addActionError( "projectGroup.error.name.required" );
         }
-        else if ( name != null && name.trim().equals( "" ) ) {
+        else if ( name != null && name.trim().equals( "" ) )
+        {
             addActionError( "projectGroup.error.name.cannot.be.spaces" );
         }
         else if ( name != null && !name.equals( "" ) )

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java Tue Jun 19 07:40:51 2007
@@ -19,12 +19,6 @@
  * under the License.
  */
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.BuildDefinition;
 import org.apache.maven.continuum.model.project.Project;
@@ -33,6 +27,12 @@
 import org.apache.maven.continuum.profile.ProfileException;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
 import org.apache.maven.continuum.web.exception.ContinuumActionException;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 /**
  * BuildDefinitionAction:

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumConfirmAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumConfirmAction.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumConfirmAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumConfirmAction.java Tue Jun 19 07:40:51 2007
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-public class ContinuumConfirmAction 
+public class ContinuumConfirmAction
     extends ContinuumActionSupport
 {
 
@@ -37,8 +37,8 @@
 
     protected String action;
 
-    protected void setConfirmationInfo( String title, String actionName, String displayString, 
-                                        String propertyName, String propertyValue )
+    protected void setConfirmationInfo( String title, String actionName, String displayString, String propertyName,
+                                        String propertyValue )
     {
         action = actionName;
         confirmationTitle = title;

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java Tue Jun 19 07:40:51 2007
@@ -250,7 +250,7 @@
             addActionError( authzE.getMessage() );
             return REQUIRES_AUTHORIZATION;
         }
-        
+
         if ( name != null && name.equals( "" ) )
         {
             addActionError( "projectGroup.error.name.required" );
@@ -270,7 +270,7 @@
         {
             try
             {
-            	roleManager.updateRole( "project-administrator", projectGroup.getName(), name );
+                roleManager.updateRole( "project-administrator", projectGroup.getName(), name );
                 roleManager.updateRole( "project-developer", projectGroup.getName(), name );
                 roleManager.updateRole( "project-user", projectGroup.getName(), name );
 
@@ -468,7 +468,7 @@
                 for ( Iterator j = effectiveRoles.iterator(); j.hasNext(); )
                 {
                     Role role = (Role) j.next();
-                    
+
                     if ( role.getName().indexOf( projectGroup.getName() ) > -1 )
                     {
                         pgUser.setRoles( effectiveRoles );

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java Tue Jun 19 07:40:51 2007
@@ -90,7 +90,7 @@
             getLogger().info( "baseUrl='" + baseUrl + "'" );
         }
     }
-    
+
     public String input()
     {
         return INPUT;
@@ -167,5 +167,5 @@
         bundle.addRequiredAuthorization( ContinuumRoleConstants.CONTINUUM_MANAGE_CONFIGURATION, Resource.GLOBAL );
 
         return bundle;
-     }
+    }
 }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java Tue Jun 19 07:40:51 2007
@@ -35,6 +35,7 @@
 import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
 import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;
 import org.codehaus.plexus.registry.RegistryException;
+
 import java.io.IOException;
 
 /**

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java Tue Jun 19 07:40:51 2007
@@ -24,10 +24,8 @@
 import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
 import org.apache.maven.continuum.execution.maven.m2.MavenBuilderHelper;
 import org.apache.maven.continuum.execution.maven.m2.SettingsConfigurationException;
-import org.apache.maven.continuum.web.action.ContinuumActionSupport;
-import org.apache.maven.continuum.web.exception.AuthenticationRequiredException;
-import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
 import org.apache.maven.continuum.security.ContinuumRoleConstants;
+import org.apache.maven.continuum.web.action.ContinuumActionSupport;
 import org.apache.maven.model.Model;
 import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.shared.app.company.CompanyPomHandler;
@@ -132,5 +130,5 @@
         bundle.addRequiredAuthorization( ContinuumRoleConstants.CONTINUUM_MANAGE_CONFIGURATION, Resource.GLOBAL );
 
         return bundle;
-     }
+    }
 }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java Tue Jun 19 07:40:51 2007
@@ -1,17 +1,16 @@
 package org.apache.maven.continuum.web.action.admin;
 
+import com.opensymphony.xwork.Preparable;
+import org.apache.maven.continuum.installation.InstallationService;
+import org.apache.maven.continuum.model.system.Installation;
+import org.apache.maven.continuum.web.action.ContinuumActionSupport;
+
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
 
-import org.apache.maven.continuum.installation.InstallationService;
-import org.apache.maven.continuum.model.system.Installation;
-import org.apache.maven.continuum.web.action.ContinuumActionSupport;
-
-import com.opensymphony.xwork.Preparable;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -32,9 +31,9 @@
  */
 /**
  * @author <a href="mailto:olamy@codehaus.org">olamy</a>
- * @since 14 juin 07
  * @version $Id$
  * @plexus.component role="com.opensymphony.xwork.Action" role-hint="installation"
+ * @since 14 juin 07
  */
 public class InstallationAction
     extends ContinuumActionSupport

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java Tue Jun 19 07:40:51 2007
@@ -1,18 +1,17 @@
 package org.apache.maven.continuum.web.action.admin;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
 import org.apache.maven.continuum.installation.InstallationService;
 import org.apache.maven.continuum.model.system.Installation;
 import org.apache.maven.continuum.model.system.Profile;
 import org.apache.maven.continuum.profile.ProfileService;
 import org.apache.maven.continuum.web.action.ContinuumActionSupport;
-import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
 import org.codehaus.plexus.util.StringUtils;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -33,9 +32,9 @@
  */
 /**
  * @author <a href="mailto:olamy@codehaus.org">olamy</a>
- * @since 7 juin 07
  * @version $Id$
  * @plexus.component role="com.opensymphony.xwork.Action" role-hint="profileAdministration"
+ * @since 7 juin 07
  */
 public class ProfileAction
     extends ContinuumActionSupport
@@ -123,9 +122,9 @@
         {
             profileService.setJdkInProfile( profile, installation );
         }
-        else if ( InstallationService.MAVEN1_TYPE.equals( installation.getType() )
-            || InstallationService.MAVEN2_TYPE.equals( installation.getType() )
-            || InstallationService.ANT_TYPE.equals( installation.getType() ) )
+        else if ( InstallationService.MAVEN1_TYPE.equals( installation.getType() ) ||
+            InstallationService.MAVEN2_TYPE.equals( installation.getType() ) ||
+            InstallationService.ANT_TYPE.equals( installation.getType() ) )
         {
             profileService.setBuilderInProfile( profile, installation );
         }
@@ -147,9 +146,9 @@
         {
             stored.setJdk( null );
         }
-        else if ( InstallationService.MAVEN1_TYPE.equals( installation.getType() )
-            || InstallationService.MAVEN2_TYPE.equals( installation.getType() )
-            || InstallationService.ANT_TYPE.equals( installation.getType() ) )
+        else if ( InstallationService.MAVEN1_TYPE.equals( installation.getType() ) ||
+            InstallationService.MAVEN2_TYPE.equals( installation.getType() ) ||
+            InstallationService.ANT_TYPE.equals( installation.getType() ) )
         {
             stored.setBuilder( null );
         }
@@ -215,25 +214,26 @@
 
     public List<Installation> getProfileInstallations()
     {
-        if (this.profile != null)
+        if ( this.profile != null )
         {
-        if ( this.profileInstallations == null )
-        {
-            this.profileInstallations = new ArrayList<Installation>();
-            if ( this.profile.getJdk() != null )
-            {
-                this.profileInstallations.add( this.profile.getJdk() );
-            }
-            if ( this.profile.getBuilder() != null )
+            if ( this.profileInstallations == null )
             {
-                this.profileInstallations.add( this.profile.getBuilder() );
-            }
-            if ( this.profile.getEnvironmentVariables() != null && !this.profile.getEnvironmentVariables().isEmpty() )
-            {
-                this.profileInstallations.addAll( this.profile.getEnvironmentVariables() );
+                this.profileInstallations = new ArrayList<Installation>();
+                if ( this.profile.getJdk() != null )
+                {
+                    this.profileInstallations.add( this.profile.getJdk() );
+                }
+                if ( this.profile.getBuilder() != null )
+                {
+                    this.profileInstallations.add( this.profile.getBuilder() );
+                }
+                if ( this.profile.getEnvironmentVariables() != null &&
+                    !this.profile.getEnvironmentVariables().isEmpty() )
+                {
+                    this.profileInstallations.addAll( this.profile.getEnvironmentVariables() );
+                }
             }
-        }
-        return profileInstallations;
+            return profileInstallations;
         }
         return Collections.EMPTY_LIST;
     }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java Tue Jun 19 07:40:51 2007
@@ -54,7 +54,7 @@
     private List groupBuildDefinitionSummaries = new ArrayList();
 
     private List allBuildDefinitionSummaries = new ArrayList();
-    
+
     //profileName
 
     public String summarizeForProject()

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/ContinuumTabAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/ContinuumTabAction.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/ContinuumTabAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/ContinuumTabAction.java Tue Jun 19 07:40:51 2007
@@ -22,24 +22,21 @@
 import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 /**
- * 
- * @plexus.component
- *   role="com.opensymphony.xwork.Action" role-hint="continuumTab"
- *   
-**/
+ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="continuumTab"
+ */
 
 public class ContinuumTabAction
     extends PlexusActionSupport
 {
     protected String tabName;
-    
+
     public String getTabName()
     {
         return tabName;
     }
-    
+
     public void setTabName( String name )
     {
         tabName = name;
-    }    
+    }
 }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/bean/ProjectGroupUserBean.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/bean/ProjectGroupUserBean.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/bean/ProjectGroupUserBean.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/bean/ProjectGroupUserBean.java Tue Jun 19 07:40:51 2007
@@ -23,46 +23,44 @@
 import org.codehaus.plexus.redback.rbac.Role;
 import org.codehaus.plexus.redback.users.User;
 
-
 import java.util.Collection;
 import java.util.Iterator;
 
 public class ProjectGroupUserBean
 {
     public static final String ROLE_ADMINISTRATOR = "Group Project Administrator";
-    
+
     public static final String ROLE_DEVELOPER = "Project Developer";
-    
+
     public static final String ROLE_USER = "Project User";
-    
+
     private User user;
-    
+
     private ProjectGroup projectGroup;
-    
+
     private Collection roles;
 
     /*
      * these booleans should be set on the addition of roles to this bean, see setRoles and addRole 
-     */
-    boolean isAdministrator = false;
+     */ boolean isAdministrator = false;
 
     boolean isDeveloper = false;
 
     boolean isUser = false;
-    
+
     public boolean isAdministrator()
     {
-       return isAdministrator;
+        return isAdministrator;
     }
 
     public boolean isDeveloper()
     {
-       return isDeveloper;
+        return isDeveloper;
     }
 
     public boolean isUser()
     {
-       return isUser;
+        return isUser;
     }
 
     public ProjectGroup getProjectGroup()
@@ -92,9 +90,9 @@
         if ( role.indexOf( ROLE_USER ) != -1 )
         {
             isUser = true;
-        }        
+        }
     }
-    
+
     public Collection getRoles()
     {
         return roles;
@@ -106,7 +104,7 @@
 
         for ( Iterator i = roles.iterator(); i.hasNext(); )
         {
-            Role role = (Role)i.next();
+            Role role = (Role) i.next();
 
             if ( role.getName().indexOf( ROLE_ADMINISTRATOR ) != -1 )
             {
@@ -134,17 +132,17 @@
     {
         this.user = user;
     }
-    
+
     public String getUsername()
     {
         return user.getUsername();
     }
-    
+
     public String getUserFullName()
     {
         return user.getFullName();
     }
-    
+
     public String getUserEmail()
     {
         return user.getEmail();
@@ -152,7 +150,8 @@
 
     public String toString()
     {
-        return user.getUsername() + ": " + roles + ": "+(isAdministrator()?"A":"-") + (isDeveloper()?"D":"-") + (isUser()?"U":"-"); 
+        return user.getUsername() + ": " + roles + ": " + ( isAdministrator() ? "A" : "-" ) +
+            ( isDeveloper() ? "D" : "-" ) + ( isUser() ? "U" : "-" );
     }
 
 }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java Tue Jun 19 07:40:51 2007
@@ -19,26 +19,24 @@
  * under the License.
  */
 
+import org.apache.maven.continuum.Continuum;
+import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.redback.role.RoleManager;
 import org.codehaus.plexus.redback.role.RoleManagerException;
 import org.codehaus.plexus.redback.system.check.EnvironmentCheck;
-import org.apache.maven.continuum.model.project.ProjectGroup;
-import org.apache.maven.continuum.Continuum;
 
-import java.util.List;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 
 /**
  * RoleProfileEnvironmentCheck:
  *
  * @author: Jesse McConnell <jmcconnell@apache.org>
  * @version: $ID:$
- *
- * @plexus.component
- *   role="org.codehaus.plexus.security.system.check.EnvironmentCheck"
- *   role-hint="continuum-role-profile-check"
+ * @plexus.component role="org.codehaus.plexus.security.system.check.EnvironmentCheck"
+ * role-hint="continuum-role-profile-check"
  */
 public class RoleProfileEnvironmentCheck
     extends AbstractLogEnabled
@@ -74,7 +72,7 @@
                 {
                     roleManager.createTemplatedRole( "project-developer", group.getName() );
                 }
-                
+
                 if ( !roleManager.templatedRoleExists( "project-user", group.getName() ) )
                 {
                     roleManager.createTemplatedRole( "project-user", group.getName() );

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/components/Data.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/components/Data.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/components/Data.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/components/Data.java Tue Jun 19 07:40:51 2007
@@ -33,7 +33,7 @@
     extends UIBean
 {
     private static final String TEMPLATE = "data";
-    
+
     protected String valueLink;
 
     public Data( OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response )
@@ -45,23 +45,23 @@
     {
         return TEMPLATE;
     }
-    
+
     public void setValueLink( String _link )
     {
-        valueLink = _link;                
+        valueLink = _link;
     }
-    
+
     public String getValueLink()
     {
         return valueLink;
     }
-    
+
     protected void evaluateExtraParams()
     {
-        if (this.valueLink != null) 
+        if ( this.valueLink != null )
         {
-            valueLink = findString(this.valueLink);
-            addParameter("valueLink", valueLink);
-        }        
+            valueLink = findString( this.valueLink );
+            addParameter( "valueLink", valueLink );
+        }
     }
 }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/exception/AuthenticationRequiredException.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/exception/AuthenticationRequiredException.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/exception/AuthenticationRequiredException.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/exception/AuthenticationRequiredException.java Tue Jun 19 07:40:51 2007
@@ -24,7 +24,6 @@
  * checks within action classes
  *
  * @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>
- * @version
  */
 public class AuthenticationRequiredException
     extends Exception

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/exception/AuthorizationRequiredException.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/exception/AuthorizationRequiredException.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/exception/AuthorizationRequiredException.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/exception/AuthorizationRequiredException.java Tue Jun 19 07:40:51 2007
@@ -23,12 +23,11 @@
  * Thrown when authorization check fails
  *
  * @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>
- * @version
  */
 public class AuthorizationRequiredException
     extends Exception
 {
-     public AuthorizationRequiredException( String string )
+    public AuthorizationRequiredException( String string )
     {
         super( string );
     }
@@ -36,5 +35,5 @@
     public AuthorizationRequiredException( String string, Throwable throwable )
     {
         super( string, throwable );
-    }     
+    }
 }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/exception/ContinuumActionException.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/exception/ContinuumActionException.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/exception/ContinuumActionException.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/exception/ContinuumActionException.java Tue Jun 19 07:40:51 2007
@@ -18,7 +18,7 @@
  * under the License.
  */
 
-/**                                                                                          
+/**
  * ContinuumActionException:
  *
  * @author Jesse McConnell <jmcconnell@apache.org>

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/filter/FilterToComponentProxy.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/filter/FilterToComponentProxy.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/filter/FilterToComponentProxy.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/filter/FilterToComponentProxy.java Tue Jun 19 07:40:51 2007
@@ -23,19 +23,19 @@
 
 /**
  * <p>Delegates <code>Filter</code> requests to a Plexus component.</p>
- * 
+ * <p/>
  * <p>This class acts as a proxy on behalf of a
  * target {@link Filter} that is instantiated by the Plexus container. It is necessary to specify which target
  * {@link Filter} should be proxied as a filter initialization parameter.</p>
- * 
+ * <p/>
  * <p>To use this filter, it is necessary to specify the following filter initialization parameter:
- *  <ul>
- *      <li><code>component</code> indicates the name of the target <code>Filter</code> defined in the container.
- *      The only requirements are that this component implements the <code>javax.servlet.Filter</code>
- *      interface and is available in the <code>Container</code> under that name.</li>
- *  </ul>
+ * <ul>
+ * <li><code>component</code> indicates the name of the target <code>Filter</code> defined in the container.
+ * The only requirements are that this component implements the <code>javax.servlet.Filter</code>
+ * interface and is available in the <code>Container</code> under that name.</li>
+ * </ul>
  * </p>
- * 
+ * <p/>
  * <p>A final optional initialization parameter, <code>lifecycle</code>, determines whether the servlet container
  * or the IoC container manages the lifecycle of the proxied filter. When possible you should write your filters to be
  * managed via the IoC container interfaces. If you cannot control the filters you wish to proxy (eg
@@ -43,13 +43,12 @@
  * javax.servlet.Filter#init(javax.servlet.FilterConfig)} and {@link javax.servlet.Filter#destroy()} methods. If this
  * case, set the <code>lifecycle</code> initialization parameter to <code>servlet-container-managed</code>. If the
  * parameter is any other value, servlet container lifecycle methods will not be delegated through to the proxy.</p>
- * 
- * @deprecated use {@link org.codehaus.plexus.xwork.filter.FilterToComponentProxy}
- * 
+ *
  * @author Ben Alex
  * @author Emmanuel Venisse (evenisse at apache dot org)
  * @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
  * @version $Id$
+ * @deprecated use {@link org.codehaus.plexus.xwork.filter.FilterToComponentProxy}
  */
 public class FilterToComponentProxy
     extends org.codehaus.plexus.xwork.filter.FilterToComponentProxy

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/interceptor/ForceContinuumConfigurationInterceptor.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/interceptor/ForceContinuumConfigurationInterceptor.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/interceptor/ForceContinuumConfigurationInterceptor.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/interceptor/ForceContinuumConfigurationInterceptor.java Tue Jun 19 07:40:51 2007
@@ -30,9 +30,8 @@
  *
  * @author: Jesse McConnell <jmcconnell@apache.org>
  * @version: $ID:$
- * @plexus.component
- *   role="com.opensymphony.xwork.interceptor.Interceptor"
- *   role-hint="forceContinuumConfigurationInterceptor"
+ * @plexus.component role="com.opensymphony.xwork.interceptor.Interceptor"
+ * role-hint="forceContinuumConfigurationInterceptor"
  */
 public class ForceContinuumConfigurationInterceptor
     extends AbstractLogEnabled

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/StateGenerator.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/StateGenerator.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/StateGenerator.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/StateGenerator.java Tue Jun 19 07:40:51 2007
@@ -28,9 +28,13 @@
 public class StateGenerator
 {
     public static final String NEW = "NEW";
+
     public static final String BUILDING = "Building";
+
     public static final String UPDATING = "Updating";
+
     public static final String CHECKING_OUT = "Checking Out";
+
     public static final String UNKNOWN = "Unknown";
 
     public static String generate( int state, String contextPath )
@@ -41,19 +45,23 @@
         }
         else if ( state == ContinuumProjectState.OK )
         {
-            return "<img src=\"" + contextPath + "/images/icon_success_sml.gif\" alt=\"Success\" title=\"Success\" border=\"0\" />";
+            return "<img src=\"" + contextPath +
+                "/images/icon_success_sml.gif\" alt=\"Success\" title=\"Success\" border=\"0\" />";
         }
         else if ( state == ContinuumProjectState.FAILED )
         {
-            return "<img src=\"" + contextPath + "/images/icon_warning_sml.gif\" alt=\"Failed\" title=\"Failed\" border=\"0\" />";
+            return "<img src=\"" + contextPath +
+                "/images/icon_warning_sml.gif\" alt=\"Failed\" title=\"Failed\" border=\"0\" />";
         }
         else if ( state == ContinuumProjectState.ERROR )
         {
-            return "<img src=\"" + contextPath + "/images/icon_error_sml.gif\" alt=\"Error\" title=\"Error\" border=\"0\" />";
+            return "<img src=\"" + contextPath +
+                "/images/icon_error_sml.gif\" alt=\"Error\" title=\"Error\" border=\"0\" />";
         }
         else if ( state == ContinuumProjectState.BUILDING )
         {
-            return "<img src=\"" + contextPath + "/images/building.gif\" alt=\"Building\" title=\"Building\" border=\"0\" />";
+            return "<img src=\"" + contextPath +
+                "/images/building.gif\" alt=\"Building\" title=\"Building\" border=\"0\" />";
         }
         else if ( state == ContinuumProjectState.UPDATING )
         {

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/WorkingCopyContentGenerator.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/WorkingCopyContentGenerator.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/WorkingCopyContentGenerator.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/WorkingCopyContentGenerator.java Tue Jun 19 07:40:51 2007
@@ -69,17 +69,20 @@
             print( obj, indent, baseUrl, buf );
         }
     }
+
     private void print( Object obj, String indent, String baseUrl, StringBuffer buf )
     {
         if ( obj instanceof File )
         {
-            File f = (File) obj;;
+            File f = (File) obj;
+            ;
 
             if ( !f.isDirectory() )
             {
                 String fileName = f.getName();
 
-                if ( !".cvsignore".equals( fileName ) && !"vssver.scc".equals( fileName ) && !".DS_Store".equals( fileName ) )
+                if ( !".cvsignore".equals( fileName ) && !"vssver.scc".equals( fileName ) &&
+                    !".DS_Store".equals( fileName ) )
                 {
                     String userDirectory = null;
 
@@ -89,25 +92,29 @@
                     }
                     else
                     {
-                        userDirectory = f.getParentFile().getAbsolutePath().substring( basedir.getAbsolutePath().length() + 1 );
+                        userDirectory =
+                            f.getParentFile().getAbsolutePath().substring( basedir.getAbsolutePath().length() + 1 );
                     }
 
                     userDirectory = StringUtils.replace( userDirectory, "\\", "/" );
 
-                    buf.append( indent + "&nbsp;&nbsp;&nbsp;<a href=\"" + baseUrl + urlParamSeparator + "userDirectory=" + userDirectory + "&file=" + fileName + "\">" + fileName + "</a><br />" );
+                    buf.append( indent + "&nbsp;&nbsp;&nbsp;<a href=\"" + baseUrl + urlParamSeparator +
+                        "userDirectory=" + userDirectory + "&file=" + fileName + "\">" + fileName + "</a><br />" );
                 }
             }
             else
             {
                 String directoryName = f.getName();
 
-                if ( !"CVS".equals( directoryName ) && !".svn".equals( directoryName ) && !"SCCS".equals( directoryName ) )
+                if ( !"CVS".equals( directoryName ) && !".svn".equals( directoryName ) &&
+                    !"SCCS".equals( directoryName ) )
                 {
                     String userDirectory = f.getAbsolutePath().substring( basedir.getAbsolutePath().length() + 1 );
 
                     userDirectory = StringUtils.replace( userDirectory, "\\", "/" );
 
-                    buf.append( indent + "+&nbsp;<a href=\"" + baseUrl + urlParamSeparator + "userDirectory=" + userDirectory + "\">" + directoryName + "</a><br />" );
+                    buf.append( indent + "+&nbsp;<a href=\"" + baseUrl + urlParamSeparator + "userDirectory=" +
+                        userDirectory + "\">" + directoryName + "</a><br />" );
                 }
             }
         }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/CronExpressionValidator.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/CronExpressionValidator.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/CronExpressionValidator.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/CronExpressionValidator.java Tue Jun 19 07:40:51 2007
@@ -19,15 +19,11 @@
  * under the License.
  */
 
-import com.opensymphony.xwork.validator.validators.ValidatorSupport;
 import com.opensymphony.xwork.validator.ValidationException;
 import com.opensymphony.xwork.validator.ValidatorContext;
-import org.quartz.CronTrigger;
-
-import java.text.ParseException;
+import com.opensymphony.xwork.validator.validators.ValidatorSupport;
 
 /**
- *
  * Validator class for the cron expression in the continuum schedules.
  */
 public class CronExpressionValidator
@@ -37,16 +33,16 @@
     public void validate( Object object )
         throws ValidationException
     {
-        String second = ( String ) getFieldValue( "second", object);
-        String minute = ( String ) getFieldValue( "minute", object );
-        String hour = ( String ) getFieldValue( "hour", object );
-        String dayOfMonth = ( String ) getFieldValue( "dayOfMonth", object );
-        String month = ( String ) getFieldValue( "month", object );
-        String dayOfWeek = ( String ) getFieldValue( "dayOfWeek", object );
-        String year = ( String ) getFieldValue( "year", object );
+        String second = (String) getFieldValue( "second", object );
+        String minute = (String) getFieldValue( "minute", object );
+        String hour = (String) getFieldValue( "hour", object );
+        String dayOfMonth = (String) getFieldValue( "dayOfMonth", object );
+        String month = (String) getFieldValue( "month", object );
+        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();

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/WagonUrlValidator.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/WagonUrlValidator.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/WagonUrlValidator.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/WagonUrlValidator.java Tue Jun 19 07:40:51 2007
@@ -19,16 +19,15 @@
  * under the License.
  */
 
-import com.opensymphony.xwork.validator.validators.ValidatorSupport;
 import com.opensymphony.xwork.validator.ValidationException;
+import com.opensymphony.xwork.validator.validators.ValidatorSupport;
 
-import java.net.URL;
 import java.net.MalformedURLException;
+import java.net.URL;
 
 /**
- *
  * Validator class for Wagon URLs
- * 
+ *
  * @author <a href="mailto:hisidro@exist.com">Henry Isidro</a>
  */
 public class WagonUrlValidator
@@ -38,24 +37,24 @@
     public void validate( Object object )
         throws ValidationException
     {
-        String url = ( String ) getFieldValue( "url", object);
+        String url = (String) getFieldValue( "url", object );
 
         if ( ( url == null ) || ( url.length() == 0 ) )
         {
             return;
         }
-        
+
         if ( url.startsWith( "dav:" ) )
         {
             url = url.substring( 4 );
         }
-        
+
         if ( ( url.startsWith( "scp://" ) ) || ( url.startsWith( "sftp://" ) ) )
         {
             // URL doesn't understand these protocols, hack it
-            url = "http://" + url.substring( url.indexOf( "://" ) + 3 ) ;
+            url = "http://" + url.substring( url.indexOf( "://" ) + 3 );
         }
-        
+
         try
         {
             new URL( url );

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java Tue Jun 19 07:40:51 2007
@@ -21,8 +21,8 @@
 
 import com.opensymphony.webwork.views.util.UrlHelper;
 import com.opensymphony.xwork.ActionContext;
-import org.apache.maven.continuum.web.model.ProjectSummary;
 import org.apache.maven.continuum.security.ContinuumRoleConstants;
+import org.apache.maven.continuum.web.model.ProjectSummary;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.redback.authorization.AuthorizationException;

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildStatusCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildStatusCell.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildStatusCell.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildStatusCell.java Tue Jun 19 07:40:51 2007
@@ -27,14 +27,12 @@
 import org.extremecomponents.table.core.TableModel;
 
 /**
- * 
- * @deprecated use of cells is discouraged due to lack of i18n and design in java code.
- *             Use jsp:include instead.
- * 
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ * @deprecated use of cells is discouraged due to lack of i18n and design in java code.
+ *             Use jsp:include instead.
  */
-public class BuildStatusCell 
+public class BuildStatusCell
     extends DisplayCell
 {
     protected String getCellValue( TableModel tableModel, Column column )
@@ -43,10 +41,11 @@
 
         String success = StateGenerator.generate( ContinuumProjectState.OK, tableModel.getContext().getContextPath() );
 
-        String failed = StateGenerator.generate( ContinuumProjectState.FAILED, tableModel.getContext().getContextPath() );
-        
+        String failed =
+            StateGenerator.generate( ContinuumProjectState.FAILED, tableModel.getContext().getContextPath() );
+
         String error = StateGenerator.generate( ContinuumProjectState.ERROR, tableModel.getContext().getContextPath() );
-        
+
         StringBuffer cellContent = new StringBuffer();
         cellContent.append( success );
         cellContent.append( "&nbsp;" );
@@ -59,7 +58,7 @@
         cellContent.append( error );
         cellContent.append( "&nbsp;" );
         cellContent.append( group.getNumErrors() );
-        
+
         return cellContent.toString();
     }
 }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java Tue Jun 19 07:40:51 2007
@@ -23,9 +23,9 @@
 import com.opensymphony.webwork.views.util.UrlHelper;
 import com.opensymphony.xwork.ActionContext;
 import org.apache.maven.continuum.project.ContinuumProjectState;
+import org.apache.maven.continuum.security.ContinuumRoleConstants;
 import org.apache.maven.continuum.web.model.ProjectSummary;
 import org.apache.maven.continuum.web.util.StateGenerator;
-import org.apache.maven.continuum.security.ContinuumRoleConstants;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.redback.authorization.AuthorizationException;

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/buildresults/StateCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/buildresults/StateCell.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/buildresults/StateCell.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/buildresults/StateCell.java Tue Jun 19 07:40:51 2007
@@ -30,11 +30,10 @@
 /**
  * Used in BuildResults
  *
- * @deprecated use of cells is discouraged due to lack of i18n and design in java code.
- *             Use jsp:include instead.
- *
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ * @deprecated use of cells is discouraged due to lack of i18n and design in java code.
+ *             Use jsp:include instead.
  */
 public class StateCell
     extends DisplayCell

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/commons/DateCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/commons/DateCell.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/commons/DateCell.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/commons/DateCell.java Tue Jun 19 07:40:51 2007
@@ -30,12 +30,10 @@
 import java.util.Locale;
 
 /**
- * 
- * @deprecated use of cells is discouraged due to lack of i18n and design in java code.
- *             Use jsp:include instead.
- * 
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ * @deprecated use of cells is discouraged due to lack of i18n and design in java code.
+ *             Use jsp:include instead.
  */
 public class DateCell
     extends DisplayCell

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DataTag.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DataTag.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DataTag.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DataTag.java Tue Jun 19 07:40:51 2007
@@ -34,24 +34,24 @@
 public class DataTag
     extends AbstractUITag
 {
-    
+
     protected String valueLink;
-    
+
     public Component getBean( OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res )
     {
         return new Data( stack, req, res );
     }
-    
+
     public void setValueLink( String _link )
     {
-        valueLink = _link;    
+        valueLink = _link;
     }
-    
+
     protected void populateParams()
     {
         super.populateParams();
-        
-        Data dataBean = ( Data ) this.component;
+
+        Data dataBean = (Data) this.component;
         dataBean.setValueLink( valueLink );
     }
 }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java Tue Jun 19 07:40:51 2007
@@ -25,7 +25,6 @@
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.jsp.JspException;
-
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -39,7 +38,7 @@
  * format a date by using either a specified format attribute, or by falling
  * back on to a globally defined 'webwork.date' property.
  * When nice="true" is specified, it will return a human readable string (in 2 hours, 3 minutes).
- *
+ * <p/>
  * From http://jira.opensymphony.com/browse/WW-805
  *
  * @author <a href="mailto:philip.luppens@gmail.com">Philip Luppens</a>
@@ -54,27 +53,47 @@
     public final static String DATETAG_PROPERTY = "webwork.date";
 
     public final static String DATETAG_PROPERTY_PAST = "webwork.date.format.past";
+
     public final static String DATETAG_DEFAULT_PAST = "{0} ago";
+
     public final static String DATETAG_PROPERTY_FUTURE = "webwork.date.format.future";
+
     public final static String DATETAG_DEFAULT_FUTURE = "in {0}";
 
     public final static String DATETAG_PROPERTY_SECONDS = "webwork.date.format.seconds";
+
     public final static String DATETAG_DEFAULT_SECONDS = "an instant";
+
     public final static String DATETAG_PROPERTY_MINUTES = "webwork.date.format.minutes";
+
     public final static String DATETAG_DEFAULT_MINUTES = "{0,choice,1#one minute|1<{0} minutes}";
+
     public final static String DATETAG_PROPERTY_HOURS = "webwork.date.format.hours";
-    public final static String DATETAG_DEFAULT_HOURS = "{0,choice,1#one hour|1<{0} hours}{1,choice,0#|1#, one minute|1<, {1} minutes}";
+
+    public final static String DATETAG_DEFAULT_HOURS =
+        "{0,choice,1#one hour|1<{0} hours}{1,choice,0#|1#, one minute|1<, {1} minutes}";
+
     public final static String DATETAG_PROPERTY_DAYS = "webwork.date.format.days";
-    public final static String DATETAG_DEFAULT_DAYS = "{0,choice,1#one day|1<{0} days}{1,choice,0#|1#, one hour|1<, {1} hours}";
+
+    public final static String DATETAG_DEFAULT_DAYS =
+        "{0,choice,1#one day|1<{0} days}{1,choice,0#|1#, one hour|1<, {1} hours}";
+
     public final static String DATETAG_PROPERTY_YEARS = "webwork.date.format.years";
-    public final static String DATETAG_DEFAULT_YEARS = "{0,choice,1#one year|1<{0} years}{1,choice,0#|1#, one day|1<, {1} days}";
+
+    public final static String DATETAG_DEFAULT_YEARS =
+        "{0,choice,1#one year|1<{0} years}{1,choice,0#|1#, one day|1<, {1} days}";
 
     //our optional format parameter
     private String format;
+
     private String actualName;
+
     private String nameAttr;
+
     private boolean nice;
+
     private Date date;
+
     private TextProvider tp;
 
     public int doEndTag()
@@ -95,7 +114,7 @@
             else if ( dateObj instanceof Long )
             {
                 Calendar cal = Calendar.getInstance();
-                cal.setTimeInMillis( ( (Long) dateObj).longValue() );
+                cal.setTimeInMillis( ( (Long) dateObj ).longValue() );
                 date = cal.getTime();
             }
             else
@@ -129,7 +148,8 @@
 
                     if ( globalFormat != null )
                     {
-                        msg = new SimpleDateFormat( globalFormat, ActionContext.getContext().getLocale() ).format( date );
+                        msg =
+                            new SimpleDateFormat( globalFormat, ActionContext.getContext().getLocale() ).format( date );
                     }
                     else
                     {
@@ -215,8 +235,8 @@
         {
             args.add( new Long( hour ) );
             args.add( new Long( min ) );
-            args.add( sb);
-            args.add( null);
+            args.add( sb );
+            args.add( null );
             sb.append( tp.getText( DATETAG_PROPERTY_HOURS, DATETAG_DEFAULT_HOURS, args ) );
         }
         else if ( years == 0 )
@@ -229,8 +249,8 @@
         }
         else
         {
-            args.add( new Object[]{ new Long( years ) } );
-            args.add( new Object[]{ new Long( day ) } );
+            args.add( new Object[]{new Long( years )} );
+            args.add( new Object[]{new Long( day )} );
             args.add( sb );
             args.add( null );
 
@@ -242,7 +262,9 @@
         {
             //looks like this date is passed
             return tp.getText( DATETAG_PROPERTY_PAST, DATETAG_DEFAULT_PAST, args );
-        } else {
+        }
+        else
+        {
             return tp.getText( DATETAG_PROPERTY_FUTURE, DATETAG_DEFAULT_FUTURE, args );
         }
     }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierEventCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierEventCell.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierEventCell.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierEventCell.java Tue Jun 19 07:40:51 2007
@@ -20,19 +20,18 @@
  */
 
 import org.apache.maven.continuum.model.project.ProjectNotifier;
+import org.codehaus.plexus.util.StringUtils;
 import org.extremecomponents.table.bean.Column;
 import org.extremecomponents.table.cell.DisplayCell;
 import org.extremecomponents.table.core.TableModel;
-import org.codehaus.plexus.util.StringUtils;
 
 /**
  * Used in Project view
  *
- * @deprecated use of cells is discouraged due to lack of i18n and design in java code.
- *             Use jsp:include instead.
- *
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ * @deprecated use of cells is discouraged due to lack of i18n and design in java code.
+ *             Use jsp:include instead.
  */
 public class NotifierEventCell
     extends DisplayCell

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierFromCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierFromCell.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierFromCell.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierFromCell.java Tue Jun 19 07:40:51 2007
@@ -27,11 +27,10 @@
 /**
  * Used in Project view
  *
- * @deprecated use of cells is discouraged due to lack of i18n and design in java code.
- *             Use jsp:include instead.
- *
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ * @deprecated use of cells is discouraged due to lack of i18n and design in java code.
+ *             Use jsp:include instead.
  */
 public class NotifierFromCell
     extends DisplayCell

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierRecipientCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierRecipientCell.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierRecipientCell.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierRecipientCell.java Tue Jun 19 07:40:51 2007
@@ -27,11 +27,10 @@
 /**
  * Used in Project view
  *
- * @deprecated use of cells is discouraged due to lack of i18n and design in java code.
- *             Use jsp:include instead.
- *
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ * @deprecated use of cells is discouraged due to lack of i18n and design in java code.
+ *             Use jsp:include instead.
  */
 public class NotifierRecipientCell
     extends DisplayCell
@@ -65,9 +64,9 @@
         {
             if ( "wagon".equals( notifier.getType() ) )
             {
-                return notifier.getConfiguration().get( "url" ).toString(); 
+                return notifier.getConfiguration().get( "url" ).toString();
             }
-            
+
             if ( notifier.getConfiguration().get( "address" ) == null )
             {
                 return "";

Modified: maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ContinuumActionLoggingTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ContinuumActionLoggingTest.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ContinuumActionLoggingTest.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ContinuumActionLoggingTest.java Tue Jun 19 07:40:51 2007
@@ -41,7 +41,8 @@
     StringBuffer testOutput = new StringBuffer();
 
 
-    public void setUp() throws Exception
+    public void setUp()
+        throws Exception
     {
         super.setUp();
 
@@ -84,7 +85,7 @@
         public void write( byte byteArray[] )
             throws IOException
         {
-            testOutput.append( new String ( byteArray ) );
+            testOutput.append( new String( byteArray ) );
             stream.write( byteArray );
         }
 

Modified: maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ReleasePrepareActionTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ReleasePrepareActionTest.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ReleasePrepareActionTest.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ReleasePrepareActionTest.java Tue Jun 19 07:40:51 2007
@@ -21,18 +21,12 @@
 
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.model.project.Project;
-import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.jmock.Mock;
 import org.jmock.MockObjectTestCase;
 
-import java.util.Map;
-import java.util.HashMap;
-
-import com.opensymphony.xwork.ActionContext;
-
 /**
  * Test for {@link ReleasePrepareAction}
- * 
+ *
  * @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
  * @version $Id$
  */
@@ -61,7 +55,7 @@
 
     /**
      * Test that the tag base url for Subversion is correctly constructed
-     * 
+     *
      * @throws Exception
      */
     public void testScmTagBaseSvn()
@@ -75,7 +69,7 @@
         //continuumMock.expects( once() ).method( "getProjectGroupByProjectId" ).will( returnValue( projectGroup ) );
         Project project = new Project();
         project.setScmUrl( scmUrl );
-        project.setWorkingDirectory(".");
+        project.setWorkingDirectory( "." );
         continuumMock.expects( once() ).method( "getProject" ).will( returnValue( project ) );
         action.input();
         assertEquals( svnUrl + "/tags", action.getScmTagBase() );
@@ -84,7 +78,7 @@
 
     /**
      * Test that tag base url for non Subverson SCMs is empty
-     * 
+     *
      * @throws Exception
      */
     public void testScmTagBaseNonSvn()
@@ -94,7 +88,7 @@
 
         Project project = new Project();
         project.setScmUrl( "scm:cvs:xxx" );
-        project.setWorkingDirectory(".");
+        project.setWorkingDirectory( "." );
         continuumMock.expects( once() ).method( "getProject" ).will( returnValue( project ) );
         action.input();
         assertEquals( "", action.getScmTagBase() );

Modified: maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/AbstractContinuumSecureService.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/AbstractContinuumSecureService.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/AbstractContinuumSecureService.java (original)
+++ maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/AbstractContinuumSecureService.java Tue Jun 19 07:40:51 2007
@@ -392,8 +392,7 @@
     /**
      * Check if the current user is authorized to manage the application's configuration
      *
-     * @throws ContinuumException
-     *                                if the user isn't authorized if the user isn't authenticated
+     * @throws ContinuumException if the user isn't authorized if the user isn't authenticated
      * @throws ContinuumException if the user isn't authorized if the user isn't authorized
      */
     protected void checkManageConfigurationAuthorization()
@@ -410,8 +409,7 @@
     /**
      * Check if the current user is authorized to manage the project build schedules
      *
-     * @throws ContinuumException
-     *                                if the user isn't authorized if the user isn't authenticated
+     * @throws ContinuumException if the user isn't authorized if the user isn't authenticated
      * @throws ContinuumException if the user isn't authorized if the user isn't authorized
      */
     protected void checkManageSchedulesAuthorization()

Modified: maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcConfig.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcConfig.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcConfig.java (original)
+++ maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcConfig.java Tue Jun 19 07:40:51 2007
@@ -32,7 +32,7 @@
     extends XmlRpcHttpRequestConfigImpl
 {
     private HttpServletRequest httpServletRequest;
-    
+
     private SecuritySession securitySession;
 
     public HttpServletRequest getHttpServletRequest()
@@ -54,6 +54,6 @@
     {
         this.securitySession = securitySession;
     }
-    
-    
+
+
 }

Modified: maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcServlet.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcServlet.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcServlet.java (original)
+++ maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcServlet.java Tue Jun 19 07:40:51 2007
@@ -21,7 +21,6 @@
 
 import org.apache.xmlrpc.XmlRpcException;
 import org.apache.xmlrpc.XmlRpcRequest;
-import org.apache.xmlrpc.common.XmlRpcHttpRequestConfig;
 import org.apache.xmlrpc.server.AbstractReflectiveHandlerMapping;
 import org.apache.xmlrpc.server.PropertyHandlerMapping;
 import org.apache.xmlrpc.server.RequestProcessorFactoryFactory;
@@ -61,7 +60,7 @@
     private ContinuumXmlRpcServletServer server;
 
     private SecuritySystem securitySystem;
-    
+
     public String getServletInfo()
     {
         return "Continuum XMLRPC Servlet";
@@ -100,16 +99,16 @@
         throws ServletException
     {
         server = new ContinuumXmlRpcServletServer();
-        
+
         try
         {
-            securitySystem = (SecuritySystem)getPlexusContainer().lookup( SecuritySystem.ROLE );
+            securitySystem = (SecuritySystem) getPlexusContainer().lookup( SecuritySystem.ROLE );
         }
         catch ( ComponentLookupException e )
         {
             throw new ServletException( "Can't init the xml rpc server, unable to obtain security system", e );
         }
-        
+
         try
         {
             XmlRpcServerConfigImpl cfg = (XmlRpcServerConfigImpl) server.getConfig();
@@ -134,18 +133,18 @@
             new AbstractReflectiveHandlerMapping.AuthenticationHandler()
             {
                 public boolean isAuthorized( XmlRpcRequest pRequest )
-                { 
+                {
                     if ( pRequest.getConfig() instanceof ContinuumXmlRpcConfig )
                     {
                         ContinuumXmlRpcConfig config = (ContinuumXmlRpcConfig) pRequest.getConfig();
-                                                                      
+
                         try
                         {
                             // if username is null, then treat this as a guest user with an empty security session
-                            if (config.getBasicUserName() == null )
+                            if ( config.getBasicUserName() == null )
                             {
                                 config.setSecuritySession( new DefaultSecuritySession() );
-                                
+
                                 return true;
                             }
                             else
@@ -168,12 +167,12 @@
                             return false;
                         }
                         catch ( AccountLockedException e )
-                        {                           
+                        {
                             e.printStackTrace();
                             return false;
                         }
                         catch ( UserNotFoundException e )
-                        {                            
+                        {
                             e.printStackTrace();
                             return false;
                         }



Mime
View raw message