continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r782523 - in /continuum/branches/continuum-1.3.x/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/ resources/ resources/localization/
Date Mon, 08 Jun 2009 04:57:47 GMT
Author: evenisse
Date: Mon Jun  8 04:57:46 2009
New Revision: 782523

URL: http://svn.apache.org/viewvc?rev=782523&view=rev
Log:
[CONTINUUM-2248] Don't print the stacktrace when project group id isn't valid and redirect
to the summary page

Modified:
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/localization/Continuum.properties
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/localization/Continuum_fr.properties
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/struts.xml

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?rev=782523&r1=782522&r2=782523&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
(original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
Mon Jun  8 04:57:46 2009
@@ -156,6 +156,12 @@
             addActionError( authzE.getMessage() );
             return REQUIRES_AUTHORIZATION;
         }
+        catch ( ContinuumException e )
+        {
+            addActionError( getText( "projectGroup.invalid.id", "Invalid Project Group Id:
" + projectGroupId,
+                                     Integer.toString( projectGroupId ) ) );
+            return "to_summary_page";
+        }
 
         projectGroup = getContinuum().getProjectGroupWithProjects( projectGroupId );
 
@@ -304,7 +310,7 @@
             {
                 logger.error( "Error while removing project group with id " + projectGroupId,
e );
                 addActionError( getText( "projectGroup.delete.error", "Unable to remove project
group",
-                                new Integer( projectGroupId ).toString() ) );
+                                         new Integer( projectGroupId ).toString() ) );
             }
         }
         else

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=782523&r1=782522&r2=782523&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
Mon Jun  8 04:57:46 2009
@@ -197,6 +197,7 @@
 projectGroup.scmRoot.title = Project Group Scm Root
 projectGroup.scmRoot.label = Scm Root URL
 projectGroup.cancelGroupBuild = Cancel Group Build
+projectGroup.invalid.id = Invalid Project Group Id: {0}
 
 # ----------------------------------------------------------------------
 # Page: Project Group - Members

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/localization/Continuum_fr.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/localization/Continuum_fr.properties?rev=782523&r1=782522&r2=782523&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/localization/Continuum_fr.properties
(original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/localization/Continuum_fr.properties
Mon Jun  8 04:57:46 2009
@@ -198,6 +198,7 @@
 projectGroup.scmRoot.title = Racine SCM du groupe de projet
 projectGroup.scmRoot.label = URL de la racine SCM
 projectGroup.cancelGroupBuild = Annuler la construction du groupe
+projectGroup.invalid.id = Id du groupe de projets invalide : {0}
 
 # ----------------------------------------------------------------------
 # Page: Project Group - Members

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/struts.xml?rev=782523&r1=782522&r2=782523&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/struts.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/struts.xml Mon
Jun  8 04:57:46 2009
@@ -320,8 +320,12 @@
     * project group actions
     -->
     <action name="projectGroupSummary" class="projectGroup" method="summary">
+      <interceptor-ref name="storeStack"/>
       <interceptor-ref name="retrieveStack"/>
       <result name="success">/WEB-INF/jsp/projectGroupSummary.jsp</result>
+      <result name="to_summary_page" type="redirect-action">
+        <param name="actionName">groupSummary</param>
+      </result>
     </action>
 
     <action name="projectGroupMembers" class="projectGroup" method="members">



Mime
View raw message