You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by jo...@apache.org on 2011/05/05 09:17:33 UTC
svn commit: r1099705 -
/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java
Author: jogep
Date: Thu May 5 07:17:33 2011
New Revision: 1099705
URL: http://svn.apache.org/viewvc?rev=1099705&view=rev
Log:
WW-3564: Unable to find a result type for extension
Modified:
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java
Modified: struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java?rev=1099705&r1=1099704&r2=1099705&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java (original)
+++ struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java Thu May 5 07:17:33 2011
@@ -20,6 +20,21 @@
*/
package org.apache.struts2.convention;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.struts2.convention.annotation.Result;
+import org.apache.struts2.convention.annotation.Results;
+
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.config.ConfigurationException;
@@ -34,19 +49,6 @@ import com.opensymphony.xwork2.util.find
import com.opensymphony.xwork2.util.finder.Test;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import org.apache.commons.lang.ObjectUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.struts2.convention.annotation.Result;
-import org.apache.struts2.convention.annotation.Results;
-
-import javax.servlet.ServletContext;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
/**
* <p>
@@ -262,6 +264,15 @@ public class DefaultResultMapBuilder imp
LOG.trace("Ignoring file without name [#0]", path);
continue;
}
+ else if(fileName.lastIndexOf(".") > 0){
+ String suffix = fileName.substring(fileName.lastIndexOf(".")+1);
+
+ if(conventionsService.getResultTypesByExtension(packageConfig).get(suffix) == null) {
+ if (LOG.isDebugEnabled())
+ LOG.debug("No result type defined for file suffix : [#0]. Ignoring file #1", suffix, fileName);
+ continue;
+ }
+ }
makeResults(actionClass, path, resultPrefix, results, packageConfig, resultsByExtension);
}