svn commit: r440031 - /struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/ImportAttributeTag.java
Author: apetrelli
Date: Mon Sep 4 04:24:14 2006
New Revision: 440031
URL: http://svn.apache.org/viewvc?view=rev&rev=440031
Log:
SB-34
Now if the value is an instance of ComponentAttribute, the "real" value is the
the one that ComponentAttribute.getValue() returns
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/ImportAttributeTag.java
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/ImportAttributeTag.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/ImportAttributeTag.java?view=diff&rev=440031&r1=440030&r2=440031
==
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/ImportAttributeTag.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/ImportAttributeTag.java
Mon Sep 4 04:24:14 2006
@@ -26,6 +26,7 @@
import javax.servlet.jsp.tagext.TagSupport;
import org.apache.tiles.taglib.util.TagUtils;
+import org.apache.tiles.ComponentAttribute;
import org.apache.tiles.ComponentContext;
@@ -152,11 +153,14 @@
{
Object value = compContext.getAttribute(name);
// Check if value exist and if we must send a runtime exception
- if( value == null )
+ if( value == null ) {
if(!isErrorIgnored)
throw new JspException ( "Error - tag importAttribute : property '"+
name + "' not found in context. Check tag syntax" );
else
return SKIP_BODY;
+ } else if (value instanceof ComponentAttribute) {
+value = ((ComponentAttribute) value).getValue();
+ }
pageContext.setAttribute(name, value, scope);
}
@@ -180,6 +184,8 @@
throw new JspException ( "Error - tag importAttribute : property
'"+ name + "' has a value of 'null'" );
else
return SKIP_BODY;
+} else if (value instanceof ComponentAttribute) {
+ value = ((ComponentAttribute) value).getValue();
}
pageContext.setAttribute(name, value, scope);
} // end loop
svn commit: r440083 - /struts/sandbox/trunk/tiles/pom.xml
Author: wsmoak Date: Mon Sep 4 07:14:12 2006 New Revision: 440083 URL: http://svn.apache.org/viewvc?view=rev&rev=440083 Log: Add the apache.snapshots repository to the tiles-parent pom. This is necessary so Maven can find the snapshot of the struts-master pom. Modified: struts/sandbox/trunk/tiles/pom.xml Modified: struts/sandbox/trunk/tiles/pom.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/pom.xml?view=diff&rev=440083&r1=440082&r2=440083 == --- struts/sandbox/trunk/tiles/pom.xml (original) +++ struts/sandbox/trunk/tiles/pom.xml Mon Sep 4 07:14:12 2006 @@ -154,4 +154,18 @@ + + + +apache.snapshots +http://people.apache.org/repo/m2-snapshot-repository + +true + + +true + + + +
svn commit: r440118 - /struts/struts1/trunk/pom.xml
Author: wsmoak Date: Mon Sep 4 09:39:45 2006 New Revision: 440118 URL: http://svn.apache.org/viewvc?view=rev&rev=440118 Log: Re-enable the DTDDoc plugin. Use -U on the command line to get the latest snapshot version. Modified: struts/struts1/trunk/pom.xml Modified: struts/struts1/trunk/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/pom.xml?view=diff&rev=440118&r1=440117&r2=440118 == --- struts/struts1/trunk/pom.xml (original) +++ struts/struts1/trunk/pom.xml Mon Sep 4 09:39:45 2006 @@ -98,7 +98,7 @@ dtddoc - +true
svn commit: r440152 - in /struts/struts2/trunk/apps/blank/src: main/java/example/ main/java/org/apache/struts2/example/ main/resources/ main/webapp/ main/webapp/WEB-INF/pages/ main/webapp/example/ tes
Author: husted
Date: Mon Sep 4 12:00:33 2006
New Revision: 440152
URL: http://svn.apache.org/viewvc?view=rev&rev=440152
Log:
WW-1340 Streamline and extend "blank" for use with tutorial.
Added:
struts/struts2/trunk/apps/blank/src/main/java/example/
struts/struts2/trunk/apps/blank/src/main/java/example/Welcome.java
(contents, props changed)
- copied, changed from r439371,
struts/struts2/trunk/apps/blank/src/main/java/org/apache/struts2/example/HomeAction.java
struts/struts2/trunk/apps/blank/src/main/webapp/example/
- copied from r439371,
struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/pages/
struts/struts2/trunk/apps/blank/src/main/webapp/example/Welcome.jsp (with
props)
struts/struts2/trunk/apps/blank/src/test/java/example/
struts/struts2/trunk/apps/blank/src/test/java/example/WelcomeTest.java
Removed:
struts/struts2/trunk/apps/blank/src/main/java/org/apache/struts2/example/
struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/pages/
struts/struts2/trunk/apps/blank/src/main/webapp/example/home.jsp
struts/struts2/trunk/apps/blank/src/test/java/org/apache/struts2/example/
Modified:
struts/struts2/trunk/apps/blank/src/main/resources/struts.xml
struts/struts2/trunk/apps/blank/src/main/webapp/index.jsp
Copied: struts/struts2/trunk/apps/blank/src/main/java/example/Welcome.java
(from r439371,
struts/struts2/trunk/apps/blank/src/main/java/org/apache/struts2/example/HomeAction.java)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/java/example/Welcome.java?view=diff&rev=440152&p1=struts/struts2/trunk/apps/blank/src/main/java/org/apache/struts2/example/HomeAction.java&r1=439371&p2=struts/struts2/trunk/apps/blank/src/main/java/example/Welcome.java&r2=440152
==
---
struts/struts2/trunk/apps/blank/src/main/java/org/apache/struts2/example/HomeAction.java
(original)
+++ struts/struts2/trunk/apps/blank/src/main/java/example/Welcome.java Mon Sep
4 12:00:33 2006
@@ -15,24 +15,43 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts2.example;
+package example;
import com.opensymphony.xwork2.ActionSupport;
/**
- * HomeAction
+ * Set welcome message.
*
*/
-public class HomeAction extends ActionSupport {
+public class Welcome extends ActionSupport {
private static final long serialVersionUID = -3881551454078687096L;
- /**
- * A default implementation that does nothing an returns "success".
- *
- * @return [EMAIL PROTECTED] #SUCCESS}
- */
+public static final String MESSAGE = "Struts is up and running ...";
+
public String execute() throws Exception {
+setMessage(MESSAGE);
return SUCCESS;
+}
+
+/**
+ * Field for Message property.
+ */
+private String message;
+
+/**
+ * Return Message property.
+ * @return Message property
+ */
+public String getMessage() {
+return message;
+}
+
+/**
+ * Set Message property.
+ * @param message Text to display on Welcome page.
+ */
+public void setMessage(String message){
+this.message = message;
}
}
Propchange: struts/struts2/trunk/apps/blank/src/main/java/example/Welcome.java
--
svn:eol-style = native
Propchange: struts/struts2/trunk/apps/blank/src/main/java/example/Welcome.java
--
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/apps/blank/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/resources/struts.xml?view=diff&rev=440152&r1=440151&r2=440152
==
--- struts/struts2/trunk/apps/blank/src/main/resources/struts.xml (original)
+++ struts/struts2/trunk/apps/blank/src/main/resources/struts.xml Mon Sep 4
12:00:33 2006
@@ -5,12 +5,10 @@
-
+
-
-
-
-/WEB-INF/pages/home.jsp
+
+/example/{1}.jsp
Added: struts/struts2/trunk/apps/blank/src/main/webapp/example/Welcome.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/webapp/example/Welcome.jsp?view=auto&rev=440152
==
--- struts/struts2/trunk/apps/blank/src/main/webapp/example/Welcome.jsp (added)
+++ struts/struts2/trunk/apps/blank/src/main/webapp/example/Welcome.jsp Mon Sep
4 12:00:33 2006
@@ -0,0 +1,10 @@
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+
+
+Welcome
+
+
+
+
+
Propchange: struts/struts2/trunk/apps/blank/src/main/webapp/example/Welcome.jsp
--
[Struts Wiki] Update of "PoweredBy" by DavidFriedman
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Struts Wiki" for change
notification.
The following page has been changed by DavidFriedman:
http://wiki.apache.org/struts/PoweredBy
--
=== Examples of websites built using Struts ===
+ * [http://www.boston.com] - Boston MA, USA Newspaper (''The Boston Globe'')
portal (owned by the '''NY Times Co.''') Their login pages are an obvious
Struts application on a Sun Application server v8.1 at their
[http://members.boston.com/reg/login.do] url.
* [http://bof-web.com] - Best of five. Managing your
Squash/Badminton/Tennis Championships. Using STRUTS on Tomcat.
* [http://www.elasticpath.com] Elastic Path - eCommerce software utilizing
Struts, Velocity, Hibernate
* [http://www.unclassified.com.au] - Unclassified is Australia's 100% FREE
online classifieds service (struts/tiles,hibernate,lucene)
svn commit: r440188 - in /struts/struts1/trunk/src/site: site.xml xdoc/dtddoc/ xdoc/dtddoc/index.xml xdoc/userGuide/building_controller.xml xdoc/userGuide/configuration.xml
Author: wsmoak Date: Mon Sep 4 14:02:25 2006 New Revision: 440188 URL: http://svn.apache.org/viewvc?view=rev&rev=440188 Log: Remove links to LiveDTD generated documentation and switch to DTDDoc. STR-2942 Added: struts/struts1/trunk/src/site/xdoc/dtddoc/ struts/struts1/trunk/src/site/xdoc/dtddoc/index.xml (with props) Modified: struts/struts1/trunk/src/site/site.xml struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml struts/struts1/trunk/src/site/xdoc/userGuide/configuration.xml Modified: struts/struts1/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/site.xml?view=diff&rev=440188&r1=440187&r2=440188 == --- struts/struts1/trunk/src/site/site.xml (original) +++ struts/struts1/trunk/src/site/site.xml Mon Sep 4 14:02:25 2006 @@ -50,6 +50,10 @@ + http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/dtddoc/index.xml?view=auto&rev=440188 == --- struts/struts1/trunk/src/site/xdoc/dtddoc/index.xml (added) +++ struts/struts1/trunk/src/site/xdoc/dtddoc/index.xml Mon Sep 4 14:02:25 2006 @@ -0,0 +1,41 @@ + + + + + + + Struts - DTDDoc + + + + + + + + + + Struts Core + + + Struts Tiles + + + + + + Propchange: struts/struts1/trunk/src/site/xdoc/dtddoc/index.xml -- svn:eol-style = native Propchange: struts/struts1/trunk/src/site/xdoc/dtddoc/index.xml -- svn:keywords = Date Author Id Revision HeadURL Modified: struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml?view=diff&rev=440188&r1=440187&r2=440188 == --- struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml (original) +++ struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml Mon Sep 4 14:02:25 2006 @@ -2057,7 +2057,7 @@ action element, see the configuration DTD or the online -http://struts.apache.org/dtds/struts-config/1_3";>LiveDTD +DTDDoc docs, and the ActionMapping documentation. Modified: struts/struts1/trunk/src/site/xdoc/userGuide/configuration.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/configuration.xml?view=diff&rev=440188&r1=440187&r2=440188 == --- struts/struts1/trunk/src/site/xdoc/userGuide/configuration.xml (original) +++ struts/struts1/trunk/src/site/xdoc/userGuide/configuration.xml Mon Sep 4 14:02:25 2006 @@ -107,8 +107,8 @@ different modules in the same web application to be configured differently. For full details on available parameters see the -http://struts.apache.org/dtds/struts-config_1_3.dtd";> -struts-config_1_3.dtd + +struts-config DTDDoc or the list below.
svn commit: r440193 - /struts/struts2/branches/able/
Author: mrdon Date: Mon Sep 4 15:02:15 2006 New Revision: 440193 URL: http://svn.apache.org/viewvc?view=rev&rev=440193 Log: Creating able branch Added: struts/struts2/branches/able/ - copied from r440192, struts/struts2/trunk/
svn commit: r440206 - in /struts/struts1/trunk/taglib/src/main: java/org/apache/struts/taglib/html/ resources/META-INF/tld/
Author: pbenedict
Date: Mon Sep 4 17:00:46 2006
New Revision: 440206
URL: http://svn.apache.org/viewvc?view=rev&rev=440206
Log:
STR-746: New html:param tag; nestable in frame,link,rewrite tags.
Added:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/ParamTag.java
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FrameTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/LinkTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/LocalStrings.properties
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/RewriteTag.java
struts/struts1/trunk/taglib/src/main/resources/META-INF/tld/struts-html.tld
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FrameTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FrameTag.java?view=diff&rev=440206&r1=440205&r2=440206
==
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FrameTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FrameTag.java
Mon Sep 4 17:00:46 2006
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -138,11 +138,20 @@
// - Public Methods
/**
- * Render the appropriately encoded URI.
+ * Evaluate the body for any parameters.
*
* @throws JspException if a JSP exception has occurred
*/
public int doStartTag() throws JspException {
+return (EVAL_BODY_TAG);
+}
+
+/**
+ * Render the appropriately encoded URI.
+ *
+ * @throws JspException if a JSP exception has occurred
+ */
+public int doEndTag() throws JspException {
// Print this element to our output writer
StringBuffer results = new StringBuffer("http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/LinkTag.java?view=diff&rev=440206&r1=440205&r2=440206
==
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/LinkTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/LinkTag.java
Mon Sep 4 17:00:46 2006
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -136,6 +136,11 @@
* Include transaction token (if any) in the hyperlink?
*/
protected boolean transaction = false;
+
+/**
+ * Additional parameters included programatically.
+ */
+protected Map parameters = null;
/**
* Name of parameter to generate to hold index number
@@ -302,29 +307,6 @@
* @throws JspException if a JSP exception has occurred
*/
public int doStartTag() throws JspException {
-// Generate the opening anchor element
-StringBuffer results = new StringBuffer("");
-
-TagUtils.getInstance().write(pageContext, results.toString());
-
// Evaluate the body of this tag
this.text = null;
@@ -354,15 +336,34 @@
* @throws JspException if a JSP exception has occurred
*/
public int doEndTag() throws JspException {
-// Prepare the textual content and ending element of this hyperlink
-StringBuffer results = new StringBuffer();
+// Generate the opening anchor element
+StringBuffer results = new StringBuffer("");
+
+TagUtils.getInstance().write(pageContext, results.toString());
+
+// Prepare the textual content and ending element of this hyperlink
if (text != null) {
results.append(text);
}
-
results.append("");
-
TagUtils.getInstance().write(pageContext, results.toString());
return (EVAL_PAGE);
@@ -385,6 +386,7 @@
paramName = null;
paramProperty = null;
paramScope = null;
+parameters = null;
property = null;
scope = null;
target = null;
@@ -409,6 +411,14 @@
TagUtils.getInstance().computeParameters(pageContext, paramId,
paramName, paramProperty, paramScope, name, property, scope,
transaction);
+
+// Add parameters collected from the tag's inner body
+if (this.parameters != null) {
+if (pa
svn commit: r440214 - /struts/site/pom.xml
Author: wsmoak
Date: Mon Sep 4 18:35:22 2006
New Revision: 440214
URL: http://svn.apache.org/viewvc?view=rev&rev=440214
Log:
Update the dtds whenever the top-level site is published.
STR-2944
Modified:
struts/site/pom.xml
Modified: struts/site/pom.xml
URL:
http://svn.apache.org/viewvc/struts/site/pom.xml?view=diff&rev=440214&r1=440213&r2=440214
==
--- struts/site/pom.xml (original)
+++ struts/site/pom.xml Mon Sep 4 18:35:22 2006
@@ -64,16 +64,50 @@
scp://people.apache.org/www/struts.apache.org/
-
+
-
-
-
-maven-site-plugin
-2.0-beta-4
-
-
-
+
+
+maven-site-plugin
+2.0-beta-4
+
+
+maven-antrun-plugin
+false
+
+
+get-dtds
+site
+
+
+
+http://svn.apache.org/repos/asf/struts/struts1/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_0.dtd";
+
dest="${project.build.directory}/site/dtds/struts-config_1_0.dtd"
+ ignoreerrors="true"/>
+http://svn.apache.org/repos/asf/struts/struts1/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_1.dtd";
+
dest="${project.build.directory}/site/dtds/struts-config_1_1.dtd"
+ ignoreerrors="true"/>
+http://svn.apache.org/repos/asf/struts/struts1/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_2.dtd";
+
dest="${project.build.directory}/site/dtds/struts-config_1_2.dtd"
+ ignoreerrors="true"/>
+http://svn.apache.org/repos/asf/struts/struts1/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_3.dtd";
+
dest="${project.build.directory}/site/dtds/struts-config_1_3.dtd"
+ ignoreerrors="true"/>
+http://svn.apache.org/repos/asf/struts/struts1/trunk/tiles/src/main/resources/org/apache/struts/resources/tiles-config_1_1.dtd";
+
dest="${project.build.directory}/site/dtds/tiles-config_1_1.dtd"
+ ignoreerrors="true"/>
+http://svn.apache.org/repos/asf/struts/struts1/trunk/tiles/src/main/resources/org/apache/struts/resources/tiles-config_1_3.dtd";
+
dest="${project.build.directory}/site/dtds/tiles-config_1_3.dtd"
+ ignoreerrors="true"/>
+
+
+
+run
+
+
+
+
+
-
+
svn commit: r440219 - /struts/site/pom.xml
Author: wsmoak
Date: Mon Sep 4 19:01:26 2006
New Revision: 440219
URL: http://svn.apache.org/viewvc?view=rev&rev=440219
Log:
Update the Struts 2.0 dtd when the top-level Struts site is published.
STR-2944
Modified:
struts/site/pom.xml
Modified: struts/site/pom.xml
URL:
http://svn.apache.org/viewvc/struts/site/pom.xml?view=diff&rev=440219&r1=440218&r2=440219
==
--- struts/site/pom.xml (original)
+++ struts/site/pom.xml Mon Sep 4 19:01:26 2006
@@ -99,6 +99,9 @@
http://svn.apache.org/repos/asf/struts/struts1/trunk/tiles/src/main/resources/org/apache/struts/resources/tiles-config_1_3.dtd";
dest="${project.build.directory}/site/dtds/tiles-config_1_3.dtd"
ignoreerrors="true"/>
+http://svn.apache.org/repos/asf/struts/struts2/trunk/core/src/main/resources/struts-2.0.dtd";
+
dest="${project.build.directory}/site/dtds/struts-2.0.dtd"
+ ignoreerrors="true"/>
svn commit: r440278 - in /struts/struts2/trunk: apps/blank/src/test/java/example/ apps/showcase/ apps/starter/ core/src/main/java/org/apache/struts2/jsf/ core/src/main/resources/
Author: mrdon
Date: Mon Sep 4 23:40:29 2006
New Revision: 440278
URL: http://svn.apache.org/viewvc?view=rev&rev=440278
Log:
Enhancing jsf variable resolver to look in stack, added ability to
configure jsf from struts.xml, added support for more struts-like
navigation for jsf result, updated to new jetty plugin, fixed bad unit
test in blank app
WW-1415
WW-1416
WW-1414
WW-1349
--This line, and those below, will be ignored--
Mapps/starter/pom.xml
Mapps/blank/src/test/java/example/WelcomeTest.java
Mapps/showcase/pom.xml
Mcore/src/main/java/org/apache/struts2/jsf/FacesResult.java
Mcore/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java
AM core/src/main/java/org/apache/struts2/jsf/FacesRender.java
Mcore/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java
Mcore/src/main/resources/struts-default.xml
Added:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesRender.java
(with props)
Modified:
struts/struts2/trunk/apps/blank/src/test/java/example/WelcomeTest.java
struts/struts2/trunk/apps/showcase/pom.xml
struts/struts2/trunk/apps/starter/pom.xml
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesResult.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java
struts/struts2/trunk/core/src/main/resources/struts-default.xml
Modified: struts/struts2/trunk/apps/blank/src/test/java/example/WelcomeTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/test/java/example/WelcomeTest.java?view=diff&rev=440278&r1=440277&r2=440278
==
--- struts/struts2/trunk/apps/blank/src/test/java/example/WelcomeTest.java
(original)
+++ struts/struts2/trunk/apps/blank/src/test/java/example/WelcomeTest.java Mon
Sep 4 23:40:29 2006
@@ -28,9 +28,9 @@
public class WelcomeTest extends TestCase {
public void testWelcome() throws Exception {
-Action welcome = new Welcome();
+Welcome welcome = new Welcome();
String result = welcome.execute();
-assertTrue(ActionSupport.SUCCESS.equals(result));
-assertTrue(welcome.equals(Welcome.MESSAGE));
+assertEquals(ActionSupport.SUCCESS, result);
+assertEquals(welcome.getMessage(), Welcome.MESSAGE);
}
}
Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?view=diff&rev=440278&r1=440277&r2=440278
==
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Mon Sep 4 23:40:29 2006
@@ -68,7 +68,8 @@
org.mortbay.jetty
-maven-jetty6-plugin
+maven-jetty-plugin
+6.0.0rc3
10
Modified: struts/struts2/trunk/apps/starter/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/starter/pom.xml?view=diff&rev=440278&r1=440277&r2=440278
==
--- struts/struts2/trunk/apps/starter/pom.xml (original)
+++ struts/struts2/trunk/apps/starter/pom.xml Mon Sep 4 23:40:29 2006
@@ -26,7 +26,8 @@
org.mortbay.jetty
-maven-jetty6-plugin
+maven-jetty-plugin
+6.0.0rc3
10
Added:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesRender.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesRender.java?view=auto&rev=440278
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesRender.java
(added)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesRender.java
Mon Sep 4 23:40:29 2006
@@ -0,0 +1,76 @@
+/*
+ * $Id: PlainTextResult.java 394468 2006-04-16 12:16:03Z tmjee $
+ *
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+package org.apache.struts2.jsf;
+
+import java.io.IOException;
