svn commit: r438870 - /struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTag.java
Author: apetrelli Date: Thu Aug 31 04:34:52 2006 New Revision: 438870 URL: http://svn.apache.org/viewvc?rev=438870&view=rev Log: SB-41 Now it creates a complete ComponentAttribute, instead of using a simple string. Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTag.java Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTag.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTag.java?rev=438870&r1=438869&r2=438870&view=diff == --- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTag.java (original) +++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTag.java Thu Aug 31 04:34:52 2006 @@ -247,7 +247,9 @@ return; } - putAttribute(nestedTag.getName(), nestedTag.getRealValue()); +putAttribute(nestedTag.getName(), new ComponentAttribute( +nestedTag.getRealValue(), nestedTag.getRole(), +nestedTag.getType())); } /**
svn commit: r438871 - in /struts/sandbox/trunk/tiles/tiles-test/src/main/webapp: override.jsp testinsertdefinition_inline.jsp testinsertdefinition_override.jsp
Author: apetrelli Date: Thu Aug 31 04:38:59 2006 New Revision: 438871 URL: http://svn.apache.org/viewvc?rev=438871&view=rev Log: SB-41 Added test for the overridden content. SB-40 Added test for the inline content. Added: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/override.jsp struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_override.jsp Added: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/override.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/override.jsp?rev=438871&view=auto == --- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/override.jsp (added) +++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/override.jsp Thu Aug 31 04:38:59 2006 @@ -0,0 +1 @@ +This is an overridden content \ No newline at end of file Added: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp?rev=438871&view=auto == --- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp (added) +++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp Thu Aug 31 04:38:59 2006 @@ -0,0 +1,7 @@ +<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %> + + + + This is an inline content + + Added: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_override.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_override.jsp?rev=438871&view=auto == --- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_override.jsp (added) +++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_override.jsp Thu Aug 31 04:38:59 2006 @@ -0,0 +1,5 @@ +<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %> + + + +
svn commit: r438873 - /struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput.jsp
Author: apetrelli Date: Thu Aug 31 04:44:32 2006 New Revision: 438873 URL: http://svn.apache.org/viewvc?rev=438873&view=rev Log: Fixed some missing starting "/" at the start of the values Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput.jsp Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput.jsp?rev=438873&r1=438872&r2=438873&view=diff == --- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput.jsp Thu Aug 31 04:44:32 2006 @@ -2,6 +2,6 @@ - - + +
svn commit: r438874 - /struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp
Author: apetrelli Date: Thu Aug 31 04:45:48 2006 New Revision: 438874 URL: http://svn.apache.org/viewvc?rev=438874&view=rev Log: SB-41 Added test for the overridden content. SB-40 Added test for the inline content. SB-37 It seems that correcting SB-41 resolves partially this issue: now "testput.jsp" works. Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp?rev=438874&r1=438873&r2=438874&view=diff == --- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp Thu Aug 31 04:45:48 2006 @@ -6,9 +6,11 @@ Currently working tests Test Insert Configured Definition Test Insert Configured Definition with no type specified +Test Insert Configured Definition with an overridden content +Test Insert Configured Definition with an inline content +Test Put Tag Currently not working tests -Test Put Tag Test Definition Tag
svn commit: r438875 - in /struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib: DefinitionTag.java InsertTag.java util/TagUtils.java
Author: apetrelli
Date: Thu Aug 31 04:52:58 2006
New Revision: 438875
URL: http://svn.apache.org/viewvc?rev=438875&view=rev
Log:
SB-37
Now definitions (defined in tiles-defs.xml and created in JSP pages) are got in
a centralized way.
Precedence is gived to definitions created with tag.
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/DefinitionTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/util/TagUtils.java
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/DefinitionTag.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/DefinitionTag.java?rev=438875&r1=438874&r2=438875&view=diff
==
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/DefinitionTag.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/DefinitionTag.java
Thu Aug 31 04:52:58 2006
@@ -83,7 +83,11 @@
* Content is already typed by caller.
*/
public void putAttribute(String name, Object content) {
-definition.putAttribute(name, new ComponentAttribute(content));
+if (content instanceof ComponentAttribute) {
+definition.putAttribute(name, (ComponentAttribute) content);
+} else {
+definition.putAttribute(name, new ComponentAttribute(content));
+}
}
/**
@@ -100,24 +104,19 @@
Object attributeValue = nestedTag.getRealValue();
ComponentAttribute def = null;
-if (nestedTag.getRole() != null) {
-try {
-def = ((ComponentAttribute) attributeValue);
-} catch (ClassCastException ex) {
-def = new ComponentAttribute(attributeValue);
-}
-
-if (def != null) {
+if (attributeValue != null
+&& attributeValue instanceof ComponentAttribute) {
+def = ((ComponentAttribute) attributeValue);
+if (nestedTag.getRole() != null) {
def.setRole(nestedTag.getRole());
-} else {
-// now what? Is this an exception?
}
-
-attributeValue = def;
+} else {
+def = new ComponentAttribute(attributeValue, nestedTag.getRole(),
+nestedTag.getType());
}
// now add attribute to enclosing parent (i.e. : this object)
-putAttribute(nestedTag.getName(), new
ComponentAttribute(attributeValue));
+putAttribute(nestedTag.getName(), def);
}
/**
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTag.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTag.java?rev=438875&r1=438874&r2=438875&view=diff
==
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTag.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTag.java
Thu Aug 31 04:52:58 2006
@@ -478,8 +478,9 @@
TilesContext tilesContext = TilesContextFactory.getInstance(
pageContext.getServletContext(),
pageContext.getRequest(), pageContext.getResponse());
-ComponentDefinition definition = TilesUtil.getDefinition(
-name, tilesContext);
+ComponentDefinition definition = null;
+definition = TagUtils.getComponentDefinition(name, pageContext,
+tilesContext);
if (definition == null) { // is it possible ?
throw new NoSuchDefinitionException();
@@ -492,9 +493,6 @@
"Error - Tag Insert : Can't get definition '"
+ definitionName
+ "'. Check if this name exists in definitions
factory.", ex);
-
-} catch (FactoryNotFoundException ex) {
-throw new JspException(ex.getMessage());
} catch (DefinitionsFactoryException ex) {
if (log.isDebugEnabled()) {
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/util/TagUtils.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/util/TagUtils.java?rev=438875&r1=438874&r2=438875&view=diff
==
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/util/TagUtils.java
(original)
+++
struts/san
svn commit: r438877 - /struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testdef.jsp
Author: apetrelli Date: Thu Aug 31 04:55:06 2006 New Revision: 438877 URL: http://svn.apache.org/viewvc?rev=438877&view=rev Log: Fixed some missing starting "/" at the start of the values Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testdef.jsp Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testdef.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testdef.jsp?rev=438877&r1=438876&r2=438877&view=diff == --- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testdef.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testdef.jsp Thu Aug 31 04:55:06 2006 @@ -2,7 +2,7 @@ - - + +
svn commit: r438879 - /struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp
Author: apetrelli Date: Thu Aug 31 04:56:03 2006 New Revision: 438879 URL: http://svn.apache.org/viewvc?rev=438879&view=rev Log: SB-37 Moved the test of a definition created in a JSP page to the group of working tests. Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp?rev=438879&r1=438878&r2=438879&view=diff == --- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp Thu Aug 31 04:56:03 2006 @@ -4,6 +4,7 @@ Tiles 2 Test Application Currently working tests +Test Definition Tag Test Insert Configured Definition Test Insert Configured Definition with no type specified Test Insert Configured Definition with an overridden content @@ -11,7 +12,7 @@ Test Put Tag Currently not working tests -Test Definition Tag +Currently all the tests work.
svn commit: r438906 - in /struts/struts2/trunk/apps/showcase/src: main/java/org/apache/struts2/showcase/tutorial/ main/webapp/tutorial/ test/ test/java/ test/java/org/ test/java/org/apache/ test/java/
Author: husted Date: Thu Aug 31 06:10:49 2006 New Revision: 438906 URL: http://svn.apache.org/viewvc?rev=438906&view=rev Log: WW-1349 Move new Tutorial code into Showcase Added: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/ - copied from r438881, struts/sandbox/trunk/mailreader-course/struts2/tutorial/src/java/tutorial/ struts/struts2/trunk/apps/showcase/src/main/webapp/tutorial/ - copied from r438881, struts/sandbox/trunk/mailreader-course/struts2/tutorial/src/webapp/ struts/struts2/trunk/apps/showcase/src/test/ struts/struts2/trunk/apps/showcase/src/test/java/ struts/struts2/trunk/apps/showcase/src/test/java/org/ struts/struts2/trunk/apps/showcase/src/test/java/org/apache/ struts/struts2/trunk/apps/showcase/src/test/java/org/apache/struts2/ struts/struts2/trunk/apps/showcase/src/test/java/org/apache/struts2/showcase/ struts/struts2/trunk/apps/showcase/src/test/java/org/apache/struts2/showcase/tutorial/ - copied from r438881, struts/sandbox/trunk/mailreader-course/struts2/tutorial/src/test/
svn commit: r438940 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/ main/java/org/apache/struts2/views/util/ test/java/org/apache/struts2/views/jsp/ test/java/org/apache/
Author: tmjee
Date: Thu Aug 31 07:34:32 2006
New Revision: 438940
URL: http://svn.apache.org/viewvc?rev=438940&view=rev
Log:
WW-1426
- URL Tag cause duplicates query string
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java?rev=438940&r1=438939&r2=438940&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
Thu Aug 31 07:34:32 2006
@@ -33,7 +33,9 @@
import javax.servlet.http.HttpUtils;
import java.io.IOException;
import java.io.Writer;
+import java.util.Collections;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.Map;
/**
@@ -157,9 +159,10 @@
}
if (NONE.equalsIgnoreCase(includeParams)) {
+ mergeRequestParameters(value, parameters,
Collections.EMPTY_MAP);
ActionContext.getContext().put(XWorkContinuationConfig.CONTINUE_KEY, null);
} else if (ALL.equalsIgnoreCase(includeParams)) {
-mergeRequestParameters(parameters, req.getParameterMap());
+mergeRequestParameters(value, parameters,
req.getParameterMap());
// for ALL also include GET parameters
includeGetParameters();
@@ -179,10 +182,7 @@
private void includeGetParameters() {
if(!(Dispatcher.getInstance().isPortletSupportActive() &&
PortletActionContext.isPortletRequest())) {
String query = extractQueryString();
-if (query != null) {
-//mergeRequestParameters(parameters,
HttpUtils.parseQueryString(query));
- mergeRequestParameters(parameters,
UrlHelper.parseQueryString(query));
-}
+mergeRequestParameters(value, parameters,
UrlHelper.parseQueryString(query));
}
}
@@ -221,7 +221,14 @@
result = PortletUrlHelper.buildResourceUrl(value, parameters);
}
else {
-result = UrlHelper.buildUrl(value, req, res, parameters,
scheme, includeContext, encode);
+ String _value = value;
+
+ // We don't include the request parameters cause they would
have been
+ // prioritised before this [in start(Writer) method]
+ if (_value != null && _value.indexOf("?") > 0) {
+ _value = _value.substring(0, _value.indexOf("?"));
+ }
+result = UrlHelper.buildUrl(_value, req, res, parameters,
scheme, includeContext, encode);
}
}
if ( anchor != null && anchor.length() > 0 ) {
@@ -345,13 +352,52 @@
/**
* Merge request parameters into current parameters. If a parameter is
- * already present, than the request parameter will not override its value.
+ * already present, than the request parameter in the current request and
value atrribute
+ * will not override its value.
+ *
+ * The priority is as follows:-
+ *
+ * parameter from the current request (least priority)
+ * parameter form the value attribute (more priority)
+ * parameter from the param tag (most priority)
+ *
*
+ * @param value the value attribute (url to be generated by this component)
* @param parameters component parameters
* @param contextParameters request parameters
*/
-protected void mergeRequestParameters(Map parameters, Map
contextParameters){
-for (Iterator iterator = contextParameters.entrySet().iterator();
iterator.hasNext();) {
+protected void mergeRequestParameters(String value, Map parameters, Map
contextParameters){
+
+ Map mergedParams = new LinkedHashMap(contextParameters);
+
+ // Merge contextParameters (from current request) with parameters
specified in value attribute
+ // eg. value="someAction.action?id=someId&venue=someVenue"
+ // where the parameters specified in value attribute takes priority.
+
+ if (value != null && value.trim().length() > 0 && value.indexOf("?") >
0) {
+ mergedParams = new LinkedHashMap();
+
+ String queryString = value.substring(value.indexOf("?")+1);
+
+ mergedParams = UrlHelper.parseQueryString(queryString);
+
svn commit: r438945 - in /struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial: HelloName.java HelloName2.java HelloWorld.java struts-tutorial.xml
Author: husted Date: Thu Aug 31 07:56:24 2006 New Revision: 438945 URL: http://svn.apache.org/viewvc?rev=438945&view=rev Log: WW-1349 Move new Tutorial code into Showcase Added: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml - copied, changed from r438881, struts/sandbox/trunk/mailreader-course/struts2/tutorial/src/java/struts.xml Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName.java struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName2.java struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloWorld.java Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName.java?rev=438945&r1=438944&r2=438945&view=diff == --- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName.java (original) +++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName.java Thu Aug 31 07:56:24 2006 @@ -1,4 +1,4 @@ -package tutorial; +package org.apache.struts2.showcase.tutorial; import com.opensymphony.xwork2.ActionSupport; Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName2.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName2.java?rev=438945&r1=438944&r2=438945&view=diff == --- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName2.java (original) +++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName2.java Thu Aug 31 07:56:24 2006 @@ -1,4 +1,4 @@ -package tutorial; +package org.apache.struts2.showcase.tutorial; import com.opensymphony.xwork2.ActionSupport; import org.apache.struts2.interceptor.ParameterAware; Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloWorld.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloWorld.java?rev=438945&r1=438944&r2=438945&view=diff == --- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloWorld.java (original) +++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloWorld.java Thu Aug 31 07:56:24 2006 @@ -1,4 +1,4 @@ -package tutorial; +package org.apache.struts2.showcase.tutorial; import com.opensymphony.xwork2.Action; Copied: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml (from r438881, struts/sandbox/trunk/mailreader-course/struts2/tutorial/src/java/struts.xml) URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml?p2=struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml&p1=struts/sandbox/trunk/mailreader-course/struts2/tutorial/src/java/struts.xml&r1=438881&r2=438945&rev=438945&view=diff == --- struts/sandbox/trunk/mailreader-course/struts2/tutorial/src/java/struts.xml (original) +++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml Thu Aug 31 07:56:24 2006 @@ -6,22 +6,22 @@ - + - + HelloWorld.jsp - + - + HelloName-success.jsp HelloName-error.html - + HelloName2-success.jsp HelloName-error.html
svn commit: r438947 - /struts/struts2/trunk/apps/showcase/src/main/webapp/tutorial/WEB-INF/
Author: husted Date: Thu Aug 31 07:57:27 2006 New Revision: 438947 URL: http://svn.apache.org/viewvc?rev=438947&view=rev Log: WW-1349 Move new Tutorial code into Showcase Removed: struts/struts2/trunk/apps/showcase/src/main/webapp/tutorial/WEB-INF/
svn commit: r438998 - in /struts/struts2/trunk/apps/showcase/src/main: java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml resources/struts.xml webapp/WEB-INF/decorators/main.jsp webapp/show
Author: husted Date: Thu Aug 31 11:08:14 2006 New Revision: 438998 URL: http://svn.apache.org/viewvc?rev=438998&view=rev Log: WW-1349 Move new Tutorial code into Showcase Removed: struts/struts2/trunk/apps/showcase/src/main/webapp/tutorial/index.html Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml?rev=438998&r1=438997&r2=438998&view=diff == --- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml (original) +++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml Thu Aug 31 11:08:14 2006 @@ -6,23 +6,31 @@ - + + + +Welcome.jsp + + + + + -HelloWorld.jsp +HelloWorld.jsp - + -HelloName-success.jsp +HelloName-success.jsp HelloName-error.html -HelloName2-success.jsp +HelloName2-success.jsp HelloName-error.html Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml?rev=438998&r1=438997&r2=438998&view=diff == --- struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml (original) +++ struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml Thu Aug 31 11:08:14 2006 @@ -44,6 +44,8 @@ + + @@ -52,8 +54,6 @@ - - showcase.jsp 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?rev=438998&r1=438997&r2=438998&view=diff == --- 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 Thu Aug 31 11:08:14 2006 @@ -75,11 +75,12 @@ ">Execute & Wait ">Token ">File Download -"/>Conversion +">Conversion ">JSF ">Freemarker ">Chat (AJAX) ">Hangman +">Tutorial ">Help 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?rev=438998&r1=438997&r2=438998&view=diff == --- struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp Thu Aug 31 11:08:14 2006 @@ -71,6 +71,10 @@ Hangman (AJAX and Non AJAX) Example + + +Source code for the Tutorial +
svn commit: r439052 - in /struts/struts2/trunk/apps/mailreader/src/main: java/mailreader-support.xml java/mailreader2/SubscriptionSave.java webapp/pages/Subscription.jsp webapp/pages/tour.html
Author: husted
Date: Thu Aug 31 14:31:01 2006
New Revision: 439052
URL: http://svn.apache.org/viewvc?rev=439052&view=rev
Log:
WW-1349 Update MailReader tour.
Modified:
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/SubscriptionSave.java
struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Subscription.jsp
struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/tour.html
Modified:
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml?rev=439052&r1=439051&r2=439052&view=diff
==
--- struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml
Thu Aug 31 14:31:01 2006
@@ -28,13 +28,13 @@
-
+
/pages/Registration.jsp
MainMenu
-
+
@@ -46,6 +46,7 @@
/pages/Subscription.jsp
Registration!input
+
Modified:
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/SubscriptionSave.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/SubscriptionSave.java?rev=439052&r1=439051&r2=439052&view=diff
==
---
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/SubscriptionSave.java
(original)
+++
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/SubscriptionSave.java
Thu Aug 31 14:31:01 2006
@@ -15,6 +15,4 @@
return save();
}
-
-
}
Modified:
struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Subscription.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Subscription.jsp?rev=439052&r1=439051&r2=439052&view=diff
==
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Subscription.jsp
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Subscription.jsp
Thu Aug 31 14:31:01 2006
@@ -20,7 +20,7 @@
-
+
Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/tour.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/tour.html?rev=439052&r1=439051&r2=439052&view=diff
==
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/tour.html
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/tour.html Thu
Aug 31 14:31:01 2006
@@ -38,8 +38,6 @@
-Logging In
-
Welcome
@@ -102,7 +100,7 @@
Subscription
-Subscription.java
+Subscription.java
@@ -255,8 +253,9 @@
Sites can list zero or more "Welcome" pages in the web.xml.
-Unless you are using Java 1.5, actions cannot be specified as a Welcome
-page.
+http://forum.java.sun.com/thread.jspa?threadID=721445";>
+Unless you are using Java 1.5,
+actions cannot be specified as a Welcome page.
So, in the case of a Welcome page,
how do we follow the best practice of navigating through actions
rather than pages?
@@ -288,8 +287,8 @@
Welcome.do
-When the client requests "Welcome.do", the request is passed to the
"struts2" FilterDispatcher
-(that we registered in the web.xml file).
+When the client requests "Welcome.do", the request is passed to the
"struts2"
+FilterDispatcher (that we registered in the web.xml file).
The FilterDispatcher retrieves the appropriate action mapping from the
configuration.
If we just wanted to forward to the Welcome page, we could use a simple
@@ -303,7 +302,7 @@
-If a client asks for the Welcome action ("Welcome.do), the
"/page/Welcome.jsp"
+If a client asks for the Welcome action ("Welcome.do"), the
"/page/Welcome.jsp"
page would be returned in response.
The client does not know, or need to know, that the physical resource is
located at
"/pages/Welcome.jsp".
@@ -485,7 +484,7 @@
The database comes seeded with a sample user.
-If you check the "database.xml" file under "/src/main",
+If you check the "database.xml" file under "/src/main/resources",
you'll see the sample user described in XML.
@@ -512,28 +511,12 @@
As mentioned, MailReader is an internationalized application.
-The message resources for the application are loaded through a reference
in the
-"struts.properties" file.
-
svn commit: r439064 - in /struts/struts2/trunk/apps: blank/src/main/resources/struts.properties mailreader/src/main/webapp/pages/tour.html starter/src/main/resources/struts.properties
Author: husted Date: Thu Aug 31 15:11:29 2006 New Revision: 439064 URL: http://svn.apache.org/viewvc?rev=439064&view=rev Log: WW-1349 Update MailReader tour. Conform properties in blank and starter. Modified: struts/struts2/trunk/apps/blank/src/main/resources/struts.properties struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/tour.html struts/struts2/trunk/apps/starter/src/main/resources/struts.properties Modified: struts/struts2/trunk/apps/blank/src/main/resources/struts.properties URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/resources/struts.properties?rev=439064&r1=439063&r2=439064&view=diff == --- struts/struts2/trunk/apps/blank/src/main/resources/struts.properties (original) +++ struts/struts2/trunk/apps/blank/src/main/resources/struts.properties Thu Aug 31 15:11:29 2006 @@ -1,2 +1,2 @@ -struts.objectFactory = spring struts.devMode = true +struts.enable.DynamicMethodInvocation = false Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/tour.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/tour.html?rev=439064&r1=439063&r2=439064&view=diff == --- struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/tour.html (original) +++ struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/tour.html Thu Aug 31 15:11:29 2006 @@ -23,7 +23,6 @@ Of course, the full source code to the MailReader is included in the distribution. - @@ -216,8 +215,20 @@ -Among other things, -the web.xml specifies the "Welcome File List" for an application. +You might note taht the web.xml configuration does not specify which file extension +to use with actions. +The default extension for Struts 2 is ".action", +but the extension can be changed in the struts.properties file. +For compatability with prior releases, the MailReader uses a .do extension for actions. + + + +struts.properties +struts.action.extension = do + + + +The web.xml does specify a "Welcome File List" for the application. When a web address refers to a directory rather than an individual file, the container consults the Welcome File List for the name of a page to open by default. @@ -251,6 +262,7 @@ page to a certain action mapping. + Sites can list zero or more "Welcome" pages in the web.xml. http://forum.java.sun.com/thread.jspa?threadID=721445";> @@ -1263,7 +1275,8 @@ -You might notice that the name of the Logon action element is not "Logon" but "Logon!*". +You might notice that the name of the Logon action element is not "Logon" +but "Logon!*". The asterisk is a special "wildcard" notation that tells the framework to match any series of character at this point. In the method attribute, @@ -1274,12 +1287,24 @@ +The "trailing bang" notation was hardwired into WebWork 2. +To provide backward compatibility, +the notation is supported by Struts 2.0. +If you prefer to use wildcards to emulate the same notation, +as the Mailreader does, +you should disable the old notation in the Struts properties file. + + + +struts.properties +struts.enable.DynamicMethodInvocation = false + + + Using wildcards with a exclamation point (or "bang") is not the only way we can use -wilcards. +wilcards to invoke methods. If we wanted to use actions like "inputLogin", we could move the asterisk and use an action name like "*Logon". -(Albeit, the trailing bang is a common convention, -adopted from on a similar WebWork 2 feature.) Modified: struts/struts2/trunk/apps/starter/src/main/resources/struts.properties URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/starter/src/main/resources/struts.properties?rev=439064&r1=439063&r2=439064&view=diff == --- struts/struts2/trunk/apps/starter/src/main/resources/struts.properties (original) +++ struts/struts2/trunk/apps/starter/src/main/resources/struts.properties Thu Aug 31 15:11:29 2006 @@ -1,2 +1,2 @@ -struts.objectFactory = spring struts.devMode = true +struts.enable.DynamicMethodInvocation = false
svn commit: r439066 - /struts/sandbox/trunk/mailreader-course/struts2/tutorial/
Author: husted Date: Thu Aug 31 15:12:01 2006 New Revision: 439066 URL: http://svn.apache.org/viewvc?rev=439066&view=rev Log: WW-1349 Move new Tutorial code into Showcase Removed: struts/sandbox/trunk/mailreader-course/struts2/tutorial/
svn commit: r439068 - /struts/struts2/trunk/apps/showcase/src/main/webapp/tutorial/Welcome.jsp
Author: husted Date: Thu Aug 31 15:13:49 2006 New Revision: 439068 URL: http://svn.apache.org/viewvc?rev=439068&view=rev Log: WW-1349 Move new Tutorial code into Showcase Added: struts/struts2/trunk/apps/showcase/src/main/webapp/tutorial/Welcome.jsp Added: struts/struts2/trunk/apps/showcase/src/main/webapp/tutorial/Welcome.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tutorial/Welcome.jsp?rev=439068&view=auto == --- struts/struts2/trunk/apps/showcase/src/main/webapp/tutorial/Welcome.jsp (added) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/tutorial/Welcome.jsp Thu Aug 31 15:13:49 2006 @@ -0,0 +1,36 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + + Tutorial + + + +This is the companion source code to the +http://cwiki.apache.org/WW/step-by-step.html";> +Tutorial. + + + Hello World + + + + + Hello World! + + + + Understanding Actions + + + + + Hello Name + + + + Hello Name (2) + + + + + \ No newline at end of file
svn commit: r439109 - in /struts/struts2/trunk/core/src/main: java/org/apache/struts2/components/ActionComponent.java java/org/apache/struts2/components/ActionError.java resources/META-INF/struts-tags
Author: husted
Date: Thu Aug 31 17:00:52 2006
New Revision: 439109
URL: http://svn.apache.org/viewvc?rev=439109&view=rev
Log:
WW-1392 Restore TLD and snippet code from prior revisions, since we are going
to try using XDoclet with J5 instead.
Removed:
struts/struts2/trunk/core/src/main/resources/META-INF/tags/
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionError.java
struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java?rev=439109&r1=439108&r2=439109&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
Thu Aug 31 17:00:52 2006
@@ -17,6 +17,11 @@
*/
package org.apache.struts2.components;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsException;
+import org.apache.struts2.dispatcher.Dispatcher;
+import org.apache.struts2.dispatcher.RequestMap;
+import org.apache.struts2.views.jsp.TagUtils;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.ActionProxyFactory;
@@ -24,107 +29,123 @@
import com.opensymphony.xwork2.util.OgnlValueStack;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsConstants;
-import org.apache.struts2.StrutsException;
-import org.apache.struts2.config.Settings;
-import org.apache.struts2.dispatcher.Dispatcher;
-import org.apache.struts2.dispatcher.RequestMap;
-import org.apache.struts2.views.jsp.TagUtils;
import javax.servlet.ServletContext;
+import javax.servlet.jsp.PageContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
+
import java.io.IOException;
import java.io.Writer;
import java.util.HashMap;
import java.util.Map;
/**
- * Invoke an action directly from a view.
- * See struts-tags.tld for documentation.
+ *
+ * This tag enables developers to call actions directly from a JSP page by
specifying the action name and an optional
+ * namespace. The body content of the tag is used to render the results from
the Action. Any result processor defined
+ * for this action in struts.xml will be ignored, unless the
executeResult parameter is specified.
+ *
+ *
+ *
+ *
+ * id (String) - the id (if specified) to put the action under
stack's context.
+ * name* (String) - name of the action to be executed (without
the extension suffix eg. .action)
+ * namespace (String) - default to the namespace where this
action tag is invoked
+ * executeResult (Boolean) - default is false. Decides wheather the
result of this action is to be executed or not
+ * ignoreContextParams (Boolean) - default to false. Decides wheather
the request parameters are to be included when the action is invoked
+ *
+ *
+ *
+ *
+ *
+ * public class ActionTagAction extends ActionSupport {
+ *
+ * public String execute() throws Exception {
+ * return "done";
+ * }
+ *
+ * public String doDefault() throws Exception {
+ *
ServletActionContext.getRequest().setAttribute("stringByAction", "This is a
String put in by the action's doDefault()");
+ * return "done";
+ * }
+ * }
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ * success.jsp
+ *
+ *
+ * success.jsp
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ * The following action tag will execute result and include it in this
page
+ *
+ *
+ *
+ * The following action tag will do the same as above, but invokes
method specialMethod in action
+ *
+ *
+ *
+ * The following action tag will not execute result, but put a String in
request scope
+ * under an id "stringByAction" which will be retrieved using property
tag
+ *
+ *
+ *
+ *
+ *
+ * @s.tag name="action" tld-body-content="JSP"
tld-tag-class="org.apache.struts2.views.jsp.ActionTag"
+ * description="Execute an action from within a view"
*/
public class ActionComponent extends Component {
private static final Log LOG = LogFactory.getLog(ActionComponent.class);
-/**
- * Store our HttpServletResponse.
- */
-protected HttpServletResponse response;
+protected HttpServletResponse res;
+protected HttpServletRequest req;
-/**
- * Store our HttpServletRequest.
-
svn commit: r439152 - /struts/struts2/trunk/api/pom.xml
Author: husted Date: Thu Aug 31 20:16:43 2006 New Revision: 439152 URL: http://svn.apache.org/viewvc?rev=439152&view=rev Log: WW-1427 struts2-api-2.0.0-SNAPSHOT.pom has servlet-api listed with "compile" scope, should be provided, reported by Matt Raible. Modified: struts/struts2/trunk/api/pom.xml Modified: struts/struts2/trunk/api/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/api/pom.xml?rev=439152&r1=439151&r2=439152&view=diff == --- struts/struts2/trunk/api/pom.xml (original) +++ struts/struts2/trunk/api/pom.xml Thu Aug 31 20:16:43 2006 @@ -13,9 +13,10 @@ Struts 2 API -javax.servlet -servlet-api -2.4 + javax.servlet + servlet-api + 2.4 + provided junit
svn commit: r439153 - in /struts/struts2/trunk/core/src: main/resources/template/simple/ test/resources/org/apache/struts2/views/jsp/ui/
Author: husted
Date: Thu Aug 31 20:20:45 2006
New Revision: 439153
URL: http://svn.apache.org/viewvc?rev=439153&view=rev
Log:
WW-1425 The form tag is generating incomplete and/or unnecessary references to
dojo, reported by Matt Raible
Add if clause to check parameter and update affected tests.
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/form.ftl
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-3.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-4.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-5.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-7.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-8.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-9.txt
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl?rev=439153&r1=439152&r2=439153&view=diff
==
--- struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl
Thu Aug 31 20:20:45 2006
@@ -68,5 +68,7 @@
<#--
Code that will add javascript needed for tooltips
--><#t/>
+<#if (parameters.hasTooltip?default(false))><#t/>
<#lt/>
<#lt/>dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");
+<#t/>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/form.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/form.ftl?rev=439153&r1=439152&r2=439153&view=diff
==
--- struts/struts2/trunk/core/src/main/resources/template/simple/form.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/form.ftl Thu
Aug 31 20:20:45 2006
@@ -26,7 +26,8 @@
<#if parameters.method?exists>
method="${parameters.method?html}"<#rt/>
-<#else>method="POST"<#rt/>
+<#else>
+ method="POST"<#rt/>
<#if parameters.enctype?exists>
enctype="${parameters.enctype?html}"<#rt/>
Modified:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt?rev=439153&r1=439152&r2=439153&view=diff
==
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt
(original)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt
Thu Aug 31 20:20:45 2006
@@ -2,6 +2,3 @@
-
-
-dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");
Modified:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt?rev=439153&r1=439152&r2=439153&view=diff
==
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt
(original)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt
Thu Aug 31 20:20:45 2006
@@ -2,6 +2,3 @@
-
-
-dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");
Modified:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt?rev=439153&r1=439152&r2=439153&view=diff
==
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
(original)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
Thu Aug 31 20:20:45 2006
@@ -28,7 +28,3 @@
svn commit: r439156 - /struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl
Author: wsmoak Date: Thu Aug 31 20:27:39 2006 New Revision: 439156 URL: http://svn.apache.org/viewvc?rev=439156&view=rev Log: Fix error message, The Struts -> Struts WW-1423 Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl?rev=439156&r1=439155&r2=439156&view=diff == --- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl Thu Aug 31 20:27:39 2006 @@ -5,7 +5,7 @@ Struts Problem Report -The Struts has detected an unhandled exception: +Struts has detected an unhandled exception: <#assign msgs = [] />
svn commit: r439157 - in /struts/struts2/trunk/apps: mailreader/src/main/java/ mailreader/src/main/java/mailreader2/ mailreader/src/main/resources/ mailreader/src/main/resources/mailreader2/ showcase/
Author: husted Date: Thu Aug 31 20:28:21 2006 New Revision: 439157 URL: http://svn.apache.org/viewvc?rev=439157&view=rev Log: WW-1429 Reposition resources to please Maven build. Added: struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader-default.xml - copied, changed from r439067, struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-default.xml struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader-support.xml - copied, changed from r439067, struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader2/ struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader2/MailreaderSupport.properties - copied, changed from r439067, struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.properties struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader2/MailreaderSupport_ja.properties - copied, changed from r439067, struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/MailreaderSupport_ja.properties struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader2/MailreaderSupport_ru.properties - copied, changed from r439067, struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/MailreaderSupport_ru.properties struts/struts2/trunk/apps/mailreader/src/main/resources/struts.properties - copied, changed from r439067, struts/struts2/trunk/apps/mailreader/src/main/java/struts.properties struts/struts2/trunk/apps/mailreader/src/main/resources/struts.xml - copied, changed from r439067, struts/struts2/trunk/apps/mailreader/src/main/java/struts.xml struts/struts2/trunk/apps/showcase/src/main/resources/struts-tutorial.xml (contents, props changed) - copied, changed from r439067, struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml Removed: struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-default.xml struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.properties struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/MailreaderSupport_ja.properties struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/MailreaderSupport_ru.properties struts/struts2/trunk/apps/mailreader/src/main/java/struts.properties struts/struts2/trunk/apps/mailreader/src/main/java/struts.xml struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml Copied: struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader-default.xml (from r439067, struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-default.xml) URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader-default.xml?p2=struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader-default.xml&p1=struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-default.xml&r1=439067&r2=439157&rev=439157&view=diff == (empty) Copied: struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader-support.xml (from r439067, struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml) URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader-support.xml?p2=struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader-support.xml&p1=struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml&r1=439067&r2=439157&rev=439157&view=diff == (empty) Copied: struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader2/MailreaderSupport.properties (from r439067, struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.properties) URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader2/MailreaderSupport.properties?p2=struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader2/MailreaderSupport.properties&p1=struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.properties&r1=439067&r2=439157&rev=439157&view=diff == (empty) Copied: struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader2/MailreaderSupport_ja.properties (from r439067, struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/MailreaderSupport_ja.properties) URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader2/MailreaderSupport_ja.properties?p2=struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader2/MailreaderSupport_ja.properties&p1
