date:20110426

svn commit: r1096834 - /struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java

2011-04-26 Thread jogep

Author: jogep
Date: Tue Apr 26 18:18:08 2011
New Revision: 1096834

URL: http://svn.apache.org/viewvc?rev=1096834&view=rev
Log:
WW-3349: Extension .jspf not recognized as JSP result-type

Modified:

struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java

Modified: 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java?rev=1096834&r1=1096833&r2=1096834&view=diff
==
--- 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
 (original)
+++ 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
 Tue Apr 26 18:18:08 2011
@@ -110,6 +110,7 @@ public class ConventionsServiceImpl impl
 
 Map resultsByExtension = new HashMap();
 resultsByExtension.put("jsp", results.get("dispatcher"));
+resultsByExtension.put("jspf", results.get("dispatcher"));
 resultsByExtension.put("jspx", results.get("dispatcher"));
 resultsByExtension.put("vm", results.get("velocity"));
 resultsByExtension.put("ftl", results.get("freemarker"));
@@ -117,4 +118,4 @@ public class ConventionsServiceImpl impl
 resultsByExtension.put("htm", results.get("dispatcher"));
 return resultsByExtension;
 }
-}
\ No newline at end of file
+}

svn commit: r1096838 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher: ServletActionRedirectResult.java ServletRedirectResult.java

2011-04-26 Thread jogep

Author: jogep
Date: Tue Apr 26 18:28:38 2011
New Revision: 1096838

URL: http://svn.apache.org/viewvc?rev=1096838&view=rev
Log:
WW-3450: supressEmptyParameters option is misspelled

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java?rev=1096838&r1=1096837&r2=1096838&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
 Tue Apr 26 18:28:38 2011
@@ -21,51 +21,60 @@
 
 package org.apache.struts2.dispatcher;
 
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.struts2.dispatcher.mapper.ActionMapper;
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
+
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.util.logging.Logger;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
 import com.opensymphony.xwork2.util.reflection.ReflectionExceptionHandler;
-import org.apache.struts2.dispatcher.mapper.ActionMapper;
-import org.apache.struts2.dispatcher.mapper.ActionMapping;
-
-import java.util.Arrays;
-import java.util.List;
 
 /**
  * 
- *
- * This result uses the {@link ActionMapper} provided by the {@link 
ActionMapperFactory} to redirect the browser to a
- * URL that invokes the specified action and (optional) namespace. This is 
better than the {@link ServletRedirectResult}
- * because it does not require you to encode the URL patterns processed by the 
{@link ActionMapper} in to your struts.xml
- * configuration files. This means you can change your URL patterns at any 
point and your application will still work.
- * It is strongly recommended that if you are redirecting to another action, 
you use this result rather than the
+ * 
+ * This result uses the {@link ActionMapper} provided by the
+ * {@link ActionMapperFactory} to redirect the browser to a URL that invokes 
the
+ * specified action and (optional) namespace. This is better than the
+ * {@link ServletRedirectResult} because it does not require you to encode the
+ * URL patterns processed by the {@link ActionMapper} in to your struts.xml
+ * configuration files. This means you can change your URL patterns at any 
point
+ * and your application will still work. It is strongly recommended that if you
+ * are redirecting to another action, you use this result rather than the
  * standard redirect result.
- *
- * See examples below for an example of how request parameters could be passed 
in.
- *
+ * 
+ * See examples below for an example of how request parameters could be passed
+ * in.
+ * 
  * 
- *
+ * 
  * This result type takes the following parameters:
- *
+ * 
  * 
- *
+ * 
  * 
- *
- * actionName (default) - the name of the action that will be 
redirect to
- *
- * namespace - used to determine which namespace the action is in 
that we're redirecting to . If namespace is
- * null, this defaults to the current namespace
- *
- * supressEmptyParameters - optional boolean (defaults to false) 
that can prevent parameters with no values
- * from being included in the redirect URL.
- *
+ * 
+ * actionName (default) - the name of the action that will be
+ * redirect to
+ * 
+ * namespace - used to determine which namespace the action is in
+ * that we're redirecting to . If namespace is null, this defaults to the
+ * current namespace
+ * 
+ * suppressEmptyParameters - optional boolean (defaults to false) 
that
+ * can prevent parameters with no values from being included in the redirect
+ * URL.
+ * 
  * 
- *
+ * 
  * 
- *
+ * 
  * Example:
- *
- * 
+ * 
+ * 
+ * 
  * 
  * 
  * 
@@ -75,19 +84,19 @@ import java.util.List;
  * 
  * 
  * 
- *
+ * 
  * 
  * <-- Redirect to an action in the same namespace -->
  * 
  * dashboard.jsp
  * error
  * 
- *
+ * 
  * 
  * error.jsp
  * 
  * 
- *
+ * 
  * 
  *<-- Pass parameters (reportType, width and height) -->
  *

svn commit: r1096885 - in /struts/struts2/trunk/apps/showcase: ./ src/main/java/org/apache/struts2/showcase/person/ src/main/resources/ src/main/webapp/WEB-INF/ src/main/webapp/person/

2011-04-26 Thread jogep

Author: jogep
Date: Tue Apr 26 20:18:52 2011
New Revision: 1096885

URL: http://svn.apache.org/viewvc?rev=1096885&view=rev
Log:
WW-3241: ShowCase demo application still uses the CodeBehind plugin.

Added:

struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/package-info.java
struts/struts2/trunk/apps/showcase/src/main/webapp/person/edit-person.jsp   
(contents, props changed)
  - copied, changed from r1096838, 
struts/struts2/trunk/apps/showcase/src/main/webapp/person/editPerson.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/person/list-people.ftl   
(contents, props changed)
  - copied, changed from r1096838, 
struts/struts2/trunk/apps/showcase/src/main/webapp/person/listPeople.ftl
struts/struts2/trunk/apps/showcase/src/main/webapp/person/new-person.ftl   
(contents, props changed)
  - copied, changed from r1096838, 
struts/struts2/trunk/apps/showcase/src/main/webapp/person/newPerson.ftl
Removed:
struts/struts2/trunk/apps/showcase/src/main/webapp/person/editPerson.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/person/listPeople.ftl
struts/struts2/trunk/apps/showcase/src/main/webapp/person/newPerson.ftl
Modified:
struts/struts2/trunk/apps/showcase/pom.xml

struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java

struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java

struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java
struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/person/index.jsp

Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?rev=1096885&r1=1096884&r2=1096885&view=diff
==
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Tue Apr 26 20:18:52 2011
@@ -103,7 +103,7 @@
 
 
 org.apache.struts
-struts2-codebehind-plugin
+struts2-convention-plugin
 ${project.version}
 
 

Modified: 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java?rev=1096885&r1=1096884&r2=1096885&view=diff
==
--- 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java
 (original)
+++ 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java
 Tue Apr 26 20:18:52 2011
@@ -24,17 +24,20 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.struts2.config.Result;
-import org.apache.struts2.config.Results;
-import org.apache.struts2.dispatcher.ServletRedirectResult;
+import org.apache.struts2.convention.annotation.ParentPackage;
+import org.apache.struts2.convention.annotation.Result;
 
 import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.convention.annotation.Results;
 
 /**
  * EditPerson
  *
  */
-@Result(name="list", value="listPeople.action", 
type=ServletRedirectResult.class)
+@Results({
+@Result(name="list", location="list-people.action", type="redirect"),
+@Result(name="input", location="new-person.ftl", type="freemarker")
+})
 public class EditPersonAction extends ActionSupport {
 
 private static final long serialVersionUID = 7699491775215130850L;

Modified: 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java?rev=1096885&r1=1096884&r2=1096885&view=diff
==
--- 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java
 (original)
+++ 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java
 Tue Apr 26 20:18:52 2011
@@ -23,11 +23,11 @@ package org.apache.struts2.showcase.pers
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.struts2.config.Result;
-import org.apache.struts2.views.freemarker.FreemarkerResult;
-
 import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.convention.annotation.ParentPackage;
+import org.apache.struts2.convention.annotation.Result;
 
+@Result(location="list-people.ftl", type="freemarker")
 pu

[CONF] Confluence Changes in the last 24 hours

2011-04-26 Thread confluence

This is a daily summary of all recent changes in Confluence.

-
Updated Spaces:
-


Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL)

Pages
-
AdviceWith edited by  boday  (06:53 PM)
https://cwiki.apache.org/confluence/display/CAMEL/AdviceWith

Camel 2.8.0 Release edited by  muellerc  (04:23 PM)
https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.8.0+Release

JDBC edited by  muellerc  (04:17 PM)
https://cwiki.apache.org/confluence/display/CAMEL/JDBC

Uses Commons Logging edited by  davsclaus  (03:49 AM)
https://cwiki.apache.org/confluence/display/CAMEL/Uses+Commons+Logging



Apache Connectors Framework 
(https://cwiki.apache.org/confluence/display/CONNECTORS)

Comments
https://cwiki.apache.org/confluence/display/CONNECTORS/FAQ (8)

Apache Directory client API (https://cwiki.apache.org/confluence/display/DIRAPI)

Pages
-
Adding entries edited by  elecharny  (03:46 PM)
https://cwiki.apache.org/confluence/display/DIRAPI/Adding+entries

LDAP data structures (...) edited by  elecharny  (03:41 PM)
https://cwiki.apache.org/confluence/display/DIRAPI/LDAP+data+structures+%28...%29

LdifEntry edited by  elecharny  (03:39 PM)
https://cwiki.apache.org/confluence/display/DIRAPI/LdifEntry



Apache Geronimo v3.0 (https://cwiki.apache.org/confluence/display/GMOxDOC30)

Pages
-
gogo commands for Geronimo edited by  chirun...@gmail.com  (11:23 PM)
https://cwiki.apache.org/confluence/display/GMOxDOC30/gogo+commands+for+Geronimo

Command Geronimo Options edited by  chirun...@gmail.com  (02:15 AM)
https://cwiki.apache.org/confluence/display/GMOxDOC30/Command+Geronimo+Options



Apache Mahout (https://cwiki.apache.org/confluence/display/MAHOUT)

Pages
-
Viewing Result created by buchko (08:09 AM)
https://cwiki.apache.org/confluence/display/MAHOUT/Viewing+Result



Apache ActiveMQ NMS (https://cwiki.apache.org/confluence/display/NMS)

Pages
-
Apache.NMS edited by  chirino  (11:19 AM)
https://cwiki.apache.org/confluence/display/NMS/Apache.NMS



OFBiz (Open For Business) Project Open Wiki 
(https://cwiki.apache.org/confluence/display/OFBIZ)

Pages
-
Pure webdriver implementation created by erwan.de-ferrie...@nereide.biz (03:55 
PM)
https://cwiki.apache.org/confluence/display/OFBIZ/Pure+webdriver+implementation

Code and test separation created by erwan.de-ferrie...@nereide.biz (03:54 PM)
https://cwiki.apache.org/confluence/display/OFBIZ/Code+and+test+separation

Home edited by  paul_foxworthy  (03:57 AM)
https://cwiki.apache.org/confluence/display/OFBIZ/Home



Apache OpenNLP (https://cwiki.apache.org/confluence/display/OPENNLP)

Pages
-
TestPlan1.5.1 edited by  joern  (05:13 AM)
https://cwiki.apache.org/confluence/display/OPENNLP/TestPlan1.5.1



Apache Shiro (https://cwiki.apache.org/confluence/display/SHIRO)

Pages
-
Web edited by  lhazlewood  (08:05 PM)
https://cwiki.apache.org/confluence/display/SHIRO/Web



Apache Sling Website (https://cwiki.apache.org/confluence/display/SLINGxSITE)

Pages
-
Downloads edited by  bdelacretaz  (11:22 AM)
https://cwiki.apache.org/confluence/display/SLINGxSITE/Downloads

News edited by  bdelacretaz  (11:19 AM)
https://cwiki.apache.org/confluence/display/SLINGxSITE/News



Apache Tapestry (https://cwiki.apache.org/confluence/display/TAPESTRY)

Pages
-
Documentation edited by  bobharner  (06:35 AM)
https://cwiki.apache.org/confluence/display/TAPESTRY/Documentation



Apache Struts 2 Documentation (https://cwiki.apache.org/confluence/display/WW)

Pages
-
Message Resource Files edited by  jogep  (06:21 AM)
https://cwiki.apache.org/confluence/display/WW/Message+Resource+Files




Change your notification preferences: 
https://cwiki.apache.org/confluence/users/viewnotifications.action

svn commit: r1096834 - /struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java

svn commit: r1096838 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher: ServletActionRedirectResult.java ServletRedirectResult.java

svn commit: r1096885 - in /struts/struts2/trunk/apps/showcase: ./ src/main/java/org/apache/struts2/showcase/person/ src/main/resources/ src/main/webapp/WEB-INF/ src/main/webapp/person/

[CONF] Confluence Changes in the last 24 hours

4 matches

Site Navigation

Mail list logo

Footer information