continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From och...@apache.org
Subject svn commit: r767071 - in /continuum/branches/continuum-1.3.x/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/ resources/localization/
Date Tue, 21 Apr 2009 08:41:04 GMT
Author: oching
Date: Tue Apr 21 08:41:04 2009
New Revision: 767071

URL: http://svn.apache.org/viewvc?rev=767071&view=rev
Log:
[CONTINUUM-2186]
o add action error when release:prepare input fails
o updated release prepare message properties for distributed builds

Modified:
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/localization/Continuum.properties

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java?rev=767071&r1=767070&r2=767071&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
(original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
Tue Apr 21 08:41:04 2009
@@ -124,7 +124,7 @@
             List<String> args = new ArrayList<String>();
             args.add( e.getMessage() );
 
-            addActionError( getText( "releasePerform.input.error", args ) ) ;
+            addActionError( getText( "distributedBuild.releasePerform.input.error", args
) ) ;
             return ERROR;
         }
 
@@ -158,7 +158,7 @@
             List<String> args = new ArrayList<String>();
             args.add( e.getMessage() );
 
-            addActionError( getText( "releasePerform.input.error", args ) ) ;
+            addActionError( getText( "distributedBuild.releasePerform.input.error", args
) ) ;
             return ERROR;
         }
 
@@ -242,7 +242,7 @@
                 List<String> args = new ArrayList<String>();
                 args.add( e.getMessage() );
 
-                addActionError( getText( "releasePerform.release.error", args ) );
+                addActionError( getText( "distributedBuild.releasePerform.release.error",
args ) );
                 return ERROR;
             }
         }
@@ -292,7 +292,7 @@
                 List<String> args = new ArrayList<String>();
                 args.add( e.getMessage() );
 
-                addActionError( getText( "releasePerform.release.error", args ) );
+                addActionError( getText( "distributedBuild.releasePerform.release.error",
args ) );
                 return ERROR;
             }
 

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java?rev=767071&r1=767070&r2=767071&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
(original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
Tue Apr 21 08:41:04 2009
@@ -176,17 +176,28 @@
                 List<String> args = new ArrayList<String>();
                 args.add( e.getMessage() );
 
-                addActionError( getText( "releasePrepare.input.error", args ) );
+                addActionError( getText( "distributedBuild.releasePrepare.input.error", args
) );
                 return ERROR;
             }
         }
         else
         {
-            String workingDirectory = getContinuum().getWorkingDirectory( project.getId()
).getPath();
-    
-            getReleasePluginParameters( workingDirectory, "pom.xml" );
-    
-            processProject( workingDirectory, "pom.xml" );
+            try
+            {
+                String workingDirectory = getContinuum().getWorkingDirectory( project.getId()
).getPath();
+        
+                getReleasePluginParameters( workingDirectory, "pom.xml" );
+        
+                processProject( workingDirectory, "pom.xml" );
+            }
+            catch ( Exception e )
+            {   
+                List<String> args = new ArrayList<String>();
+                args.add( e.getMessage() );
+
+                addActionError( getText( "releasePrepare.input.error", args ) );
+                return ERROR;
+            }
         }
 
         profiles = this.getContinuum().getProfileService().getAllProfiles();
@@ -314,7 +325,7 @@
                 List<String> args = new ArrayList<String>();
                 args.add( e.getMessage() );
 
-                addActionError( getText( "releasePrepare.release.error", args ) );
+                addActionError( getText( "distributedBuild.releasePrepare.release.error",
args ) );
                 return ERROR;
             }
         }

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=767071&r1=767070&r2=767071&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/localization/Continuum.properties
Tue Apr 21 08:41:04 2009
@@ -1221,3 +1221,4 @@
 # ----------------------------------------------------------------------
 releaseError.page.title=Continuum - Release Error
 releaseError.section.title=Release Error
+releasePrepare.input.error = Unable to get release plugin parameters and process project
- {0}



Mime
View raw message