Author: musachy Date: Thu Feb 12 15:19:05 2009 New Revision: 743777 URL: http://svn.apache.org/viewvc?rev=743777&view=rev Log: WW-2982 add jspx files as a possible view to Convention plugin
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=743777&r1=743776&r2=743777&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 Thu Feb 12 15:19:05 2009 @@ -109,9 +109,9 @@ Map<String, ResultTypeConfig> resultsByExtension = new HashMap<String, ResultTypeConfig>(); resultsByExtension.put("jsp", results.get("dispatcher")); + resultsByExtension.put("jspx", results.get("dispatcher")); resultsByExtension.put("vm", results.get("velocity")); resultsByExtension.put("ftl", results.get("freemarker")); - // Issue 22 - Add html and htm as default result extensions resultsByExtension.put("html", results.get("dispatcher")); resultsByExtension.put("htm", results.get("dispatcher")); return resultsByExtension;