You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by hu...@apache.org on 2007/01/15 14:58:25 UTC
svn commit: r496318 - in /struts/struts2/trunk/apps/showcase/src/main:
java/org/apache/struts2/showcase/filedownload/ resources/ webapp/
webapp/WEB-INF/decorators/ webapp/ajax/ webapp/filedownload/ webapp/images/
webapp/validation/
Author: husted
Date: Mon Jan 15 05:58:24 2007
New Revision: 496318
URL: http://svn.apache.org/viewvc?view=rev&rev=496318
Log:
WW-1588 - Fix second filedownload example. Add Ajax back to menu bar, since only remove form is broken. now.
Added:
struts/struts2/trunk/apps/showcase/src/main/webapp/images/struts-gif.zip
- copied unchanged from r496221, struts/struts2/trunk/apps/showcase/src/main/webapp/images/images.zip
Removed:
struts/struts2/trunk/apps/showcase/src/main/webapp/images/images.zip
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java
struts/struts2/trunk/apps/showcase/src/main/resources/struts-filedownload.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/filedownload/index.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/validation/index.jsp
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java?view=diff&rev=496318&r1=496317&r2=496318
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java Mon Jan 15 05:58:24 2007
@@ -34,13 +34,13 @@
*/
public class FileDownloadAction implements Action {
- private String filePath;
- public void setFilePath(String value) {
- filePath = value;
+ private String inputPath;
+ public void setInputPath(String value) {
+ inputPath = value;
}
- public InputStream getImageStream() throws Exception {
- return ServletActionContext.getServletContext().getResourceAsStream(filePath);
+ public InputStream getInputStream() throws Exception {
+ return ServletActionContext.getServletContext().getResourceAsStream(inputPath);
}
public String execute() throws Exception {
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-filedownload.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-filedownload.xml?view=diff&rev=496318&r1=496317&r2=496318
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-filedownload.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-filedownload.xml Mon Jan 15 05:58:24 2007
@@ -10,23 +10,24 @@
<default-action-ref name="download"/>
<action name="download" class="org.apache.struts2.showcase.filedownload.FileDownloadAction">
- <param name="filePath">\images\struts.gif</param>
+ <param name="inputPath">\images\struts.gif</param>
<result name="success" type="stream">
- <param name="contentType">image/jpeg</param>
- <param name="inputName">imageStream</param>
+ <param name="contentType">image/gif</param>
+ <param name="inputName">inputStream</param>
<param name="contentDisposition">filename="struts.gif"</param>
<param name="bufferSize">4096</param>
</result>
</action>
<action name="download2" class="org.apache.struts2.showcase.filedownload.FileDownloadAction">
- <param name="filePath">\images\struts.zip</param>
+ <param name="inputPath">\images\struts-gif.zip</param>
<result name="success" type="stream">
<param name="contentType">application/zip</param>
- <param name="inputName">imageStream</param>
+ <param name="inputName">inputStream</param>
<param name="contentDisposition">filename="struts-gif.zip"</param>
<param name="bufferSize">4096</param>
</result>
</action>
+
</package>
</struts>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp?view=diff&rev=496318&r1=496317&r2=496318
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp Mon Jan 15 05:58:24 2007
@@ -78,6 +78,8 @@
<h2 class="accessibility">Navigation</h2>
<ul class="clearfix">
<li><a href="<s:url value="/showcase.jsp"/>">Home</a></li>
+ <li><a href="<s:url value="/ajax/index.jsp"/>">Ajax</a></li>
+ <li><a href="<s:url value="/chat/index.jsp"/>">Ajax Chat</a></li>
<li><a href="<s:url action="actionChain1!input" namespace="/actionchaining" includeParams="none" />">Action Chaining</a></li>
<li><a href="<s:url action="index" namespace="/config-browser" includeParams="none" />">Config Browser</a></li>
<li><a href="<s:url value="/conversion/index.jsp"/>">Conversion</a></li>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp?view=diff&rev=496318&r1=496317&r2=496318
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp Mon Jan 15 05:58:24 2007
@@ -5,7 +5,9 @@
<h1>AJAX Example</h1>
+<p>
Note: The Ajax tags are experimental. These examples have only been tested under FireFox 1.5 and IE 6.
+</p>
<ul>
<li><a href="autocompleter">Autocompleter combobox tag</a></li>
@@ -13,9 +15,9 @@
<li><a href="remotediv">Remote div tag</a></li>
<li><a href="remotelink">Remote link tag</a></li>
<li><a href="tabbedpanel">Tabbed panel</a></li>
- <li>(broken) <a href="remoteforms">Remote forms</a></li>
- <li>(broken) <a href="widgets">Widgets </a> (may not work in all browsers!)
+ <li><a href="widgets">Widgets </a> (may not work in all browsers!)
see the <a href="http://www.dojotoolkit.org">dojo website</a> for more information</li>
+ <li>(broken) <a href="remoteforms">Remote forms</a></li>
</ul>
</body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/filedownload/index.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/filedownload/index.jsp?view=diff&rev=496318&r1=496317&r2=496318
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/filedownload/index.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/filedownload/index.jsp Mon Jan 15 05:58:24 2007
@@ -13,8 +13,8 @@
The browser should display the Struts logo.
</li>
<li>
- (broken) <s:url id="url" action="download2"/><s:a href="%{url}">Download ZIP file.</s:a>
- The browser should prompt for a location to save the ZIP file.
+ <s:url id="url" action="download2"/><s:a href="%{url}">Download ZIP file.</s:a>
+ The browser should prompt for a location to save the ZIP file.
</li>
</ul>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp?view=diff&rev=496318&r1=496317&r2=496318
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp Mon Jan 15 05:58:24 2007
@@ -33,6 +33,8 @@
<%-- THIS LIST IS MAINTAINED IN WEB-INF/decorators/main.jsp TO CREATE THE MENU BAR -- EDIT THERE AND COPY HERE --%>
<ul>
<li><a href="<s:url value="/showcase.jsp"/>">Home</a></li>
+ <li><a href="<s:url value="/ajax/index.jsp" />">Ajax Theme for Struts Tags</a></li>
+ <li><a href="<s:url value="/chat/index.jsp"/>">Ajax Chat</a>
<li><a href="<s:url action="actionChain1!input" namespace="/actionchaining" includeParams="none" />">Action Chaining</a></li>
<li><a href="<s:url action="index" namespace="/config-browser" includeParams="none" />">Config Browser</a></li>
<li><a href="<s:url value="/conversion/index.jsp"/>">Conversion</a></li>
@@ -56,12 +58,7 @@
These examples are under development and may not be fully operational.
</p>
<ul>
- <li><a href="<s:url value="/ajax/index.jsp" />">Ajax Theme for Struts Tags</a></li>
- <li><a href="<s:url value="/chat/index.jsp"/>">Ajax Chat</a>
<li><a href="<s:url action="guess" namespace="/continuations" />">Continuations</a></li>
- <li>
- Filedownload / ZIP file
- </li>
</ul>
</p>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/index.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/index.jsp?view=diff&rev=496318&r1=496317&r2=496318
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/index.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/index.jsp Mon Jan 15 05:58:24 2007
@@ -26,15 +26,15 @@
<s:url id="storeMessageAcrossRequestExample" value="/validation/storeErrorsAcrossRequestExample.jsp" />
<ul>
+ <li><s:a href="%{fieldValidatorUrl}">Field Validators</s:a></li>
+ <li><s:a href="%{clientSideValidationUrl}">Field Validators with client-side JavaScript</s:a></li>
+ <li><s:a href="%{nonFieldValidatorUrl}">Non Field Validator</s:a></li>
+ <li><s:a href="%{storeMessageAcrossRequestExample}">Store across request using MessageStoreInterceptor (Example)</s:a></li>
+ <li>(broken) <s:a href="%{quizAjax}">Validation (ajax)</s:a></li>
<li><s:a href="%{quizBasic}">Validation (basic)</s:a></li>
<li><s:a href="%{quizClient}">Validation (client)</s:a></li>
<li><s:a href="%{quizClientCss}">Validation (client using css_xhtml theme)</s:a></li>
- <li>(broken) <s:a href="%{quizAjax}">Validation (ajax)</s:a></li>
- <li><s:a href="%{fieldValidatorUrl}">Field Validators</s:a></li>
- <li><s:a href="%{nonFieldValidatorUrl}">Non Field Validator</s:a></li>
<li><s:a href="%{visitorValidatorUrl}">Visitor Validator</s:a></li>
- <li><s:a href="%{clientSideValidationUrl}">Client side validation using JavaScript</s:a></li>
- <li><s:a href="%{storeMessageAcrossRequestExample}">Store across request using MessageStoreInterceptor (Example)</s:a></li>
<li><s:a href="%{backToShowcase}">Back To Showcase</s:a>
</ul>
</body>