continuum-commits mailing list archives

Author: evenisse
Date: Tue Oct  2 03:14:25 2007
New Revision: 581182

URL: http://svn.apache.org/viewvc?rev=581182&view=rev
Log:
[CONTINUUM-1502] Trim project group name

Modified:
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=581182&r1=581181&r2=581182&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
Tue Oct  2 03:14:25 2007
@@ -309,6 +309,8 @@
 
         if ( pg == null )
         {
+            //CONTINUUM-1502
+            projectGroup.setName( projectGroup.getName().trim() );
             try
             {
                 ProjectGroup new_pg = store.addProjectGroup( projectGroup );
@@ -552,8 +554,8 @@
         {
             buildDefinitionLabel = buildDefinition.getGoals();
         }
-        BuildProjectTask buildProjectTask = new BuildProjectTask( projectId, buildDefinitionId,
trigger, projectName,
-                                                                  buildDefinitionLabel );
+        BuildProjectTask buildProjectTask =
+            new BuildProjectTask( projectId, buildDefinitionId, trigger, projectName, buildDefinitionLabel
);
         return this.buildQueue.remove( buildProjectTask );
     }
 
@@ -685,15 +687,13 @@
                 checkoutQueue.remove( task );
             }
         }
-    }    
-    
+    }
 
     // ----------------------------------------------------------------------
     //
     // ----------------------------------------------------------------------
 
 
-
     public void removeProject( int projectId )
         throws ContinuumException
     {
@@ -1149,8 +1149,8 @@
             if ( StringUtils.isEmpty( buildDefinitionLabel ) )
             {
                 buildDefinitionLabel = buildDefinition.getGoals();
-            }            
-            
+            }
+
             getLogger().info(
                 "Enqueuing '" + project.getName() + "' (Build definition id=" + buildDefinitionId
+ ")." );
 
@@ -2139,12 +2139,12 @@
         catch ( ContinuumObjectNotFoundException cne )
         {
             throw new ContinuumException( "Project Group (id=" + projectGroupId +
-            " doens't have a default build definition, this should be impossible, it should
always have a default definition set." );
+                " doens't have a default build definition, this should be impossible, it
should always have a default definition set." );
         }
         catch ( ContinuumStoreException cse )
         {
             throw new ContinuumException( "Project Group (id=" + projectGroupId +
-            " doens't have a default build definition, this should be impossible, it should
always have a default definition set." );
+                " doens't have a default build definition, this should be impossible, it
should always have a default definition set." );
         }
     }
 
@@ -2908,6 +2908,8 @@
     public void updateProjectGroup( ProjectGroup projectGroup )
         throws ContinuumException
     {
+        //CONTINUUM-1502
+        projectGroup.setName( projectGroup.getName().trim() );
         try
         {
             store.updateProjectGroup( projectGroup );