You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ol...@apache.org on 2008/04/12 00:24:18 UTC
svn commit: r647336 - in /continuum/trunk/continuum-webapp/src/main:
resources/localization/Continuum.properties resources/xwork.xml
webapp/WEB-INF/jsp/navigations/Menu.jsp
webapp/WEB-INF/jsp/navigations/wait.jsp webapp/images/wait.gif
Author: olamy
Date: Fri Apr 11 15:24:12 2008
New Revision: 647336
URL: http://svn.apache.org/viewvc?rev=647336&view=rev
Log:
[CONTINUUM-515] Add a wait page when adding a project
Added:
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/wait.jsp (with props)
continuum/trunk/continuum-webapp/src/main/webapp/images/wait.gif (with props)
Modified:
continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
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=647336&r1=647335&r2=647336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Fri Apr 11 15:24:12 2008
@@ -791,3 +791,9 @@
legend.buildInSuccess=Build in Success
legend.buildInFailure=Build in Failure
legend.buildInError=Build in Error
+
+
+# ----------------------------------------------------------------------
+# Page: Wait
+# ----------------------------------------------------------------------
+wait.addprocessing.processing= Adding your project is under process. Please wait ..
\ No newline at end of file
Modified: continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?rev=647336&r1=647335&r2=647336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Fri Apr 11 15:24:12 2008
@@ -172,7 +172,14 @@
<result name="success">/WEB-INF/jsp/groupSummary.jsp</result>
</action>
+ <action name="addMavenTwoProjectInput" class="addMavenTwoProject">
+ <result name="input">/WEB-INF/jsp/addMavenTwoProject.jsp</result>
+ </action>
+
<action name="addMavenTwoProject" class="addMavenTwoProject">
+ <interceptor-ref name="configuredContinuumStack"/>
+ <interceptor-ref name="execAndWait"/>
+ <result name="wait">/WEB-INF/jsp/navigations/wait.jsp</result>
<result name="input">/WEB-INF/jsp/addMavenTwoProject.jsp</result>
<result name="success" type="chain">groupSummary</result>
<result name="projectGroupSummary" type="redirect-action">
@@ -181,7 +188,14 @@
</result>
</action>
+ <action name="addMavenOneProjectInput" class="addMavenOneProject">
+ <result name="input">/WEB-INF/jsp/addMavenOneProject.jsp</result>
+ </action>
+
<action name="addMavenOneProject" class="addMavenOneProject">
+ <interceptor-ref name="configuredContinuumStack"/>
+ <interceptor-ref name="execAndWait"/>
+ <result name="wait">/WEB-INF/jsp/navigations/wait.jsp</result>
<result name="input">/WEB-INF/jsp/addMavenOneProject.jsp</result>
<result name="success" type="chain">groupSummary</result>
<result name="projectGroupSummary" type="redirect-action">
@@ -195,6 +209,9 @@
</action>
<action name="addProject" class="addProject" method="add">
+ <interceptor-ref name="configuredContinuumStack"/>
+ <interceptor-ref name="execAndWait"/>
+ <result name="wait">/WEB-INF/jsp/navigations/wait.jsp</result>
<result name="input">/WEB-INF/jsp/addProject.jsp</result>
<result name="success" type="chain">groupSummary</result>
<result name="projectGroupSummary" type="redirect-action">
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp?rev=647336&r1=647335&r2=647336&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp Fri Apr 11 15:24:12 2008
@@ -48,14 +48,14 @@
</div>
<div>
<div class="body">
- <ww:url id="addMavenTwoProjectUrl" action="addMavenTwoProject" method="input" namespace="/"
+ <ww:url id="addMavenTwoProjectUrl" action="addMavenTwoProjectInput" method="input" namespace="/"
includeParams="none"/>
<ww:a href="%{addMavenTwoProjectUrl}">
<ww:text name="menu.add.m2Project"/>
</ww:a>
</div>
<div class="body">
- <ww:url id="addMavenOneProjectUrl" action="addMavenOneProject" method="input" namespace="/"
+ <ww:url id="addMavenOneProjectUrl" action="addMavenOneProjectInput" method="input" namespace="/"
includeParams="none"/>
<ww:a href="%{addMavenOneProjectUrl}">
<ww:text name="menu.add.m1Project"/>
Added: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/wait.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/wait.jsp?rev=647336&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/wait.jsp (added)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/wait.jsp Fri Apr 11 15:24:12 2008
@@ -0,0 +1,32 @@
+<%--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ --%>
+
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+<html>
+ <ww:i18n name="localization.Continuum">
+ <head>
+ <META HTTP-EQUIV="refresh" CONTENT="2;url=<ww:url includeParams="all"/>"/>
+ </head>
+ <body>
+ <img src="images/wait.gif">
+ <b><ww:text name="wait.addprocessing.processing"/></b>
+ </body>
+ </ww:i18n>
+</html>
\ No newline at end of file
Propchange: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/wait.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/wait.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: continuum/trunk/continuum-webapp/src/main/webapp/images/wait.gif
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/images/wait.gif?rev=647336&view=auto
==============================================================================
Binary file - no diff available.
Propchange: continuum/trunk/continuum-webapp/src/main/webapp/images/wait.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: continuum/trunk/continuum-webapp/src/main/webapp/images/wait.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream