continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcconn...@apache.org
Subject svn commit: r452709 - in /maven/continuum/trunk/continuum-webapp/src/main: resources/xwork.xml webapp/components/buildDefinitionGroupSummaryComponent.jsp
Date Wed, 04 Oct 2006 03:20:49 GMT
Author: jmcconnell
Date: Tue Oct  3 20:20:49 2006
New Revision: 452709

URL: http://svn.apache.org/viewvc?view=rev&rev=452709
Log:
continuum-951, fixing up relative patchs to jsps that were causing some problems, and also
a fix to a mistype in a jsp. thanks for the patch christian

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
    maven/continuum/trunk/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?view=diff&rev=452709&r1=452708&r2=452709
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Tue Oct  3 20:20:49
2006
@@ -48,12 +48,12 @@
     </action>
 
     <action name="editConfiguration" class="configuration" method="edit">
-      <result name="success">configurationEdit.jsp</result>
+      <result name="success">/configurationEdit.jsp</result>
     </action>
 
     <action name="configuration" class="configuration" method="save">
-      <result name="input">configurationEdit.jsp</result>
-      <result name="success">configuration.jsp</result>
+      <result name="input">/configurationEdit.jsp</result>
+      <result name="success">/configuration.jsp</result>
     </action>
 
     <action name="companyInfo" class="configuration">
@@ -61,34 +61,34 @@
     </action>
 
     <action name="summary" class="summary">
-      <result name="success">summary.jsp</result>
+      <result name="success">/summary.jsp</result>
     </action>
 
     <action name="groupSummary" class="groupSummary">
-      <result name="success">groupSummary.jsp</result>
+      <result name="success">/groupSummary.jsp</result>
     </action>
 
     <action name="addMavenTwoProject" class="addMavenTwoProject">
-      <result name="input">addMavenTwoProject.jsp</result>
+      <result name="input">/addMavenTwoProject.jsp</result>
       <result name="success" type="chain">groupSummary</result>
     </action>
 
     <action name="addMavenOneProject" class="addMavenOneProject">
-      <result name="input">addMavenOneProject.jsp</result>
+      <result name="input">/addMavenOneProject.jsp</result>
       <result name="success" type="chain">groupSummary</result>
     </action>
 
     <action name="addProjectInput" class="addProject" method="input">
-      <result name="success">addProject.jsp</result>
+      <result name="success">/addProject.jsp</result>
     </action>
 
     <action name="addProject" class="addProject" method="add">
-      <result name="input">addProject.jsp</result>
+      <result name="input">/addProject.jsp</result>
       <result name="success" type="chain">groupSummary</result>
     </action>
 
     <action name="deleteProject" class="deleteProject">
-      <result name="delete">deleteProject.jsp</result>
+      <result name="delete">/deleteProject.jsp</result>
       <result name="success" type="chain">groupSummary</result>
     </action>
 
@@ -97,24 +97,24 @@
     </action>
 
     <action name="projectView" class="projectView">
-      <result name="success">projectView.jsp</result>
+      <result name="success">/projectView.jsp</result>
     </action>
 
     <action name="projectEdit" class="projectEdit" method="edit">
-      <result name="success">projectEdit.jsp</result>
+      <result name="success">/projectEdit.jsp</result>
     </action>
 
     <action name="projectSave" class="projectEdit" method="save">
+      <result name="input">/projectEdit.jsp</result>
       <result name="success" type="chain">projectView</result>
-      <result name="input">projectEdit.jsp</result>
     </action>
 
     <!--
     * Session Influencing actions
     -->
     <action name="login" class="session" method="login">
-      <result name="input">login.jsp</result>
-      <result name="error">login.jsp</result>
+      <result name="input">/login.jsp</result>
+      <result name="error">/login.jsp</result>
       <result name="success" type="chain">groupSummary</result>
     </action>
 
@@ -127,58 +127,58 @@
     * user management actions
     -->
     <action name="users" class="userManagement" method="summary">
-      <result name="success">users.jsp</result>
+      <result name="success">/users.jsp</result>
     </action>
 
     <action name="user" class="userManagement" method="input">
-      <result name="success">user.jsp</result>
+      <result name="success">/user.jsp</result>
     </action>
 
     <action name="saveUser" class="userManagement" method="save">
-      <result name="input">user.jsp</result>
+      <result name="input">/user.jsp</result>
       <result name="success" type="chain">users</result>
     </action>
 
     <action name="removeUser" class="userManagement" method="remove">
+      <result name="confirm">/confirmation.jsp</result>
       <result name="success" type="chain">users</result>
-      <result name="confirm">confirmation.jsp</result>
     </action>
 
     <!--
     * user group management actions
     -->
     <action name="userGroups" class="userGroupManagement" method="summary">
-      <result name="success">userGroups.jsp</result>
+      <result name="success">/userGroups.jsp</result>
     </action>
 
     <action name="userGroup" class="userGroupManagement" method="input">
-      <result name="success">userGroup.jsp</result>
+      <result name="success">/userGroup.jsp</result>
     </action>
 
     <action name="saveUserGroup" class="userGroupManagement" method="save">
-      <result name="input">userGroup.jsp</result>
+      <result name="input">/userGroup.jsp</result>
       <result name="success" type="chain">userGroups</result>
     </action>
 
     <action name="removeUserGroup" class="userGroupManagement" method="remove">
+      <result name="confirm">/confirmation.jsp</result>
       <result name="success" type="chain">userGroups</result>
-      <result name="confirm">confirmation.jsp</result>
     </action>
 
     <!--
     * build definition actions
     -->
     <action name="buildDefinition" class="buildDefinition" method="input">
-      <result name="input">buildDefinitionEdit.jsp</result>
+      <result name="success">/buildDefinitionEdit.jsp</result>
     </action>
 
     <action name="saveProjectBuildDefinition" class="buildDefinition" method="saveToProject">
-      <result name="input">buildDefinitionEdit.jsp</result>
+      <result name="input">/buildDefinitionEdit.jsp</result>
       <result name="success" type="chain">projectView</result>
     </action>
 
     <action name="removeProjectBuildDefinition" class="buildDefinition" method="removeFromProject">
-      <result name="confirm">deleteBuildDefinition.jsp</result>
+      <result name="confirm">/deleteBuildDefinition.jsp</result>
       <result name="success" type="chain">projectView</result>
     </action>
 
@@ -187,7 +187,7 @@
     </action>
 
     <action name="removeGroupBuildDefinition" class="buildDefinition" method="removeFromProjectGroup">
-      <result name="confirm">confirmBuildDefinitionRemoval.jsp</result>
+      <result name="confirm">/confirmBuildDefinitionRemoval.jsp</result>
       <result name="success" type="chain">projectGroupBuildDefinition</result>
     </action>
 
@@ -196,19 +196,19 @@
     * project group actions
     -->
     <action name="projectGroupSummary" class="projectGroup" method="summary">
-      <result name="success">projectGroupSummary.jsp</result>
+      <result name="success">/projectGroupSummary.jsp</result>
     </action>
 
     <action name="projectGroupMembers" class="projectGroup" method="members">
-      <result name="success">projectGroupMembers.jsp</result>
+      <result name="success">/projectGroupMembers.jsp</result>
     </action>
 
     <action name="projectGroupBuildDefinition" class="projectGroup" method="buildDefinitions">
-      <result name="success">projectGroupBuildDefinition.jsp</result>
+      <result name="success">/projectGroupBuildDefinition.jsp</result>
     </action>
 
     <action name="projectGroupNotifier" class="projectGroup" method="notifiers">
-      <result name="success">projectGroupNotifier.jsp</result>
+      <result name="success">/projectGroupNotifier.jsp</result>
     </action>
 
     <action name="buildProjectGroup" class="projectGroup" method="build">
@@ -216,7 +216,7 @@
     </action>
 
     <action name="removeProjectGroup" class="projectGroup" method="remove">
-      <result name="confirm">confirmGroupRemoval.jsp</result>
+      <result name="confirm">/confirmGroupRemoval.jsp</result>
       <result name="success" type="chain">groupSummary</result>
     </action>
 
@@ -224,88 +224,88 @@
     * notifier actions
     -->
     <action name="deleteNotifier" class="deleteNotifier">
-      <result name="delete">deleteNotifier.jsp</result>
+      <result name="delete">/deleteNotifier.jsp</result>
       <result name="success" type="chain">projectView</result>
     </action>
 
     <action name="addNotifier" class="addNotifier">
-      <result name="input">notifierSelectType.jsp</result>
-      <result name="mail_input">notifierMail.jsp</result>
-      <result name="irc_input">notifierIrc.jsp</result>
-      <result name="msn_input">notifierMsn.jsp</result>
-      <result name="jabber_input">notifierJabber.jsp</result>
+      <result name="input">/notifierSelectType.jsp</result>
+      <result name="mail_input">/notifierMail.jsp</result>
+      <result name="irc_input">/notifierIrc.jsp</result>
+      <result name="msn_input">/notifierMsn.jsp</result>
+      <result name="jabber_input">/notifierJabber.jsp</result>
     </action>
 
     <action name="mailNotifierEdit" class="mailNotifierEdit" method="edit">
-      <result name="success">notifierMail.jsp</result>
+      <result name="success">/notifierMail.jsp</result>
     </action>
 
     <action name="mailNotifierSave" class="mailNotifierEdit" method="save">
-      <result name="input">notifierMail.jsp</result>
+      <result name="input">/notifierMail.jsp</result>
       <result name="success" type="chain">projectView</result>
     </action>
 
     <action name="ircNotifierEdit" class="ircNotifierEdit" method="edit">
-      <result name="success">notifierIrc.jsp</result>
+      <result name="success">/notifierIrc.jsp</result>
     </action>
 
     <action name="ircNotifierSave" class="ircNotifierEdit" method="save">
-      <result name="input">notifierIrc.jsp</result>
+      <result name="input">/notifierIrc.jsp</result>
       <result name="success" type="chain">projectView</result>
     </action>
 
     <action name="jabberNotifierEdit" class="jabberNotifierEdit" method="edit">
-      <result name="success">notifierJabber.jsp</result>
+      <result name="success">/notifierJabber.jsp</result>
     </action>
 
     <action name="jabberNotifierSave" class="jabberNotifierEdit" method="save">
-      <result name="input">notifierJabber.jsp</result>
+      <result name="input">/notifierJabber.jsp</result>
       <result name="success" type="chain">projectView</result>
     </action>
 
     <action name="msnNotifierEdit" class="msnNotifierEdit" method="edit">
-      <result name="success">notifierMsn.jsp</result>
+      <result name="success">/notifierMsn.jsp</result>
     </action>
 
     <action name="msnNotifierSave" class="msnNotifierEdit" method="save">
-      <result name="input">notifierMsn.jsp</result>
+      <result name="input">/notifierMsn.jsp</result>
       <result name="success" type="chain">projectView</result>
     </action>
 
     <action name="buildResults" class="buildResults">
-      <result name="success">buildResults.jsp</result>
+      <result name="success">/buildResults.jsp</result>
     </action>
 
     <action name="buildResult" class="buildResult">
-      <result name="success">buildResult.jsp</result>
+      <result name="success">/buildResult.jsp</result>
     </action>
 
     <action name="surefireReport" class="surefireReport">
-      <result name="success">surefireReport.jsp</result>
+      <result name="success">/surefireReport.jsp</result>
     </action>
 
     <action name="workingCopy" class="workingCopy">
-      <result name="success">workingCopy.jsp</result>
+      <result name="success">/workingCopy.jsp</result>
     </action>
 
     <!--
     * schedule actions
     -->
     <action name="schedules" class="schedule" method="summary">
-      <result name="success">schedules.jsp</result>
+      <result name="success">/schedules.jsp</result>
     </action>
 
     <action name="schedule" class="schedule" method="input">
-      <result name="success">editSchedule.jsp</result>
+      <result name="success">/editSchedule.jsp</result>
     </action>
 
     <action name="saveSchedule" class="schedule" method="save">
-      <result name="input">editSchedule.jsp</result>
+      <result name="input">/editSchedule.jsp</result>
       <result name="success" type="chain">schedules</result>
       <result name="error" type="chain">schedule</result>
     </action>
     <action name="removeSchedule" class="schedule" method="remove">
-      <result name="confirm">confirmation.jsp</result>
+      <result name="confirm">/confirmation.jsp</result>
       <result name="success" type="chain">schedules</result>
     </action>
 
@@ -317,7 +317,7 @@
     - continuum release
     -->
     <action name="releasePromptGoal" class="releaseProject" method="promptReleaseGoal">
-      <result name="success">releaseProject.jsp</result>
+      <result name="success">/releaseProject.jsp</result>
     </action>
 
     <action name="releaseProject" class="releaseProject">
@@ -337,7 +337,7 @@
     </action>
 
     <action name="releasePrepareInput" class="releasePrepare" method="input">
-      <result name="success">releasePrepare.jsp</result>
+      <result name="success">/releasePrepare.jsp</result>
     </action>
 
     <action name="releasePrepare" class="releasePrepare">
@@ -350,7 +350,7 @@
     </action>
 
     <action name="releasePerformInput" class="releasePerform" method="input">
-      <result name="success">releasePerform.jsp</result>
+      <result name="success">/releasePerform.jsp</result>
     </action>
 
     <action name="releasePerform" class="releasePerform">
@@ -363,7 +363,7 @@
     </action>
 
     <action name="releasePerformFromScmInput" class="releasePerform" method="inputFromScm">
-      <result name="success">releasePerformFromScm.jsp</result>
+      <result name="success">/releasePerformFromScm.jsp</result>
     </action>
 
     <action name="releasePerformFromScm" class="releasePerform" method="executeFromScm">
@@ -375,9 +375,9 @@
     </action>
 
     <action name="releaseInProgress" class="releaseInProgress">
-      <result name="initialized">releaseInitialized.jsp</result>
-      <result name="inProgress">releaseInProgress.jsp</result>
-      <result name="success">releaseFinished.jsp</result>
+      <result name="initialized">/releaseInitialized.jsp</result>
+      <result name="inProgress">/releaseInProgress.jsp</result>
+      <result name="success">/releaseFinished.jsp</result>
     </action>
 
     <action name="releaseCleanup" class="releaseCleanup">
@@ -386,7 +386,7 @@
     </action>
 
     <action name="releaseViewResult" class="releaseInProgress" method="viewResult">
-      <result name="success">releaseViewResult.jsp</result>
+      <result name="success">/releaseViewResult.jsp</result>
     </action>
 
   </package>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp?view=diff&rev=452709&r1=452708&r2=452709
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp
Tue Oct  3 20:20:49 2006
@@ -43,7 +43,7 @@
   </ec:table>
   <div class="functnbar3">
     <ww:form action="buildDefinition" method="post">
-      <input type="hidden" name="projectGroupId" value="<ww:property value="projectGroupid"/>"/>
+      <input type="hidden" name="projectGroupId" value="<ww:property value="projectGroupId"/>"/>
       <ww:submit value="%{getText('add')}"/>
     </ww:form>
   </div>



Mime
View raw message