You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by oc...@apache.org on 2009/04/21 10:44:21 UTC
svn commit: r767073 - in /continuum/trunk/continuum-webapp/src/main:
java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
resources/localization/Continuum.properties
Author: oching
Date: Tue Apr 21 08:44:21 2009
New Revision: 767073
URL: http://svn.apache.org/viewvc?rev=767073&view=rev
Log:
merged -r 767071 from 1.3.x branch (CONTINUUM-2186)
Modified:
continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java?rev=767073&r1=767072&r2=767073&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java Tue Apr 21 08:44:21 2009
@@ -126,7 +126,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;
}
@@ -160,7 +160,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;
}
@@ -248,7 +248,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;
}
}
@@ -304,7 +304,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/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java?rev=767073&r1=767072&r2=767073&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java Tue Apr 21 08:44:21 2009
@@ -178,17 +178,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();
@@ -316,7 +327,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/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=767073&r1=767072&r2=767073&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Tue Apr 21 08:44:21 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}