svn commit: r475167 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java

[tmjee]

Author: tmjee
Date: Wed Nov 15 01:06:11 2006
New Revision: 475167

URL: http://svn.apache.org/viewvc?view=rev&rev=475167
Log:
WW-1490 (Have a composite ActionMapper that decides which ActionMapper it 
contains should be used)
updated javadoc (missed out some part in last commit) that doc the new way to 
"inject" composite mappers in to this CompositeActionMapper

Modified:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java?view=diff&rev=475167&r1=475166&r2=475167
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java
 Wed Nov 15 01:06:11 2006
@@ -49,10 +49,10 @@
  * For example, with the following entries in struts.properties
  * <p/>
  * <pre>
- * 
struts.mapper.class=org.apache.struts2.dispatcher.mapper.CompositeActionMapper
- * 
struts.mapper.composite.1=org.apache.struts2.dispatcher.mapper.DefaultActionMapper
- * 
struts.mapper.composite.2=org.apache.struts2.dispatcher.mapper.RestfulActionMapper
- * 
struts.mapper.composite.3=org.apache.struts2.dispatcher.mapper.Restful2ActionMapper
+ * &lt;bean type="org.apache.struts2.dispatcher.mapper.ActionMapper" 
name="struts" 
+ *       class="org.apache.struts2.dispatcher.mapper.CompositeActionMapper" 
/&gt;
+ * &lt;constant name="struts.mapper.composite" 
+ *       
value="org.apache.struts2.dispatcher.mapper.DefaultActionMapper,org.apache.struts2.dispatcher.mapper.RestfulActionMapperorg.apache.struts2.dispatcher.mapper.Restful2ActionMapper"
 /&gt;
  * </pre>
  * <p/>
  * When [EMAIL PROTECTED] CompositeActionMapper#getMapping(HttpServletRequest, 
ConfigurationManager)} or
@@ -68,6 +68,8 @@
  *
  * For example with the following in struts-*.xml :-
  * <pre>
+ *    &lt;bean type="org.apache.struts2.dispatcher.mapper.ActionMapper" 
name="struts" 
+ *       class="org.apache.struts2.dispatcher.mapper.CompositeActionMapper" 
/&gt;
  *    &lt;constant name="struts.mapper.composite" 
  *       
value="org.apache.struts2.dispatcher.mapper.DefaultActionMapper,foo.bar.MyActionMapper,foo.bar.MyAnotherActionMapper"
 /&gt;
  * </pre>