Author: tmjee
Date: Wed Nov 15 01:00:41 2006
New Revision: 475165
URL: http://svn.apache.org/viewvc?view=rev&rev=475165
Log:
WW-1490 (Have a composite ActionMapper that decides which ActionMapper it
contains should be used)
- removed previously added back comments cause since DI was introduced, the
way composite mappers are into CompositeActionMapper have changed, instead it
is injected
- alter the javadoc in CompositeActionMapper accordingly to reflect this as
well. The docs (conflunce) need changes as well.
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
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=475165&r1=475164&r2=475165
==============================================================================
---
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:00:41 2006
@@ -66,12 +66,10 @@
* [EMAIL PROTECTED]
CompositeActionMapper#getUriFromActionMapping(ActionMapping)} methods.
* <p/>
*
- * For example with the following in struts.properties :-
+ * For example with the following in struts-*.xml :-
* <pre>
- *
struts.mapper.class=org.apache.struts2.dispatcher.mapper.CompositeActionMapper
- *
struts.mapper.composite.1=org.apache.struts2.dispatcher.mapper.DefaultActionMapper
- * struts.mapper.composite.2=foo.bar.MyActionMapper
- * struts.mapper.composite.3=foo.bar.MyAnotherActionMapper
+ * <constant name="struts.mapper.composite"
+ *
value="org.apache.struts2.dispatcher.mapper.DefaultActionMapper,foo.bar.MyActionMapper,foo.bar.MyAnotherActionMapper"
/>
* </pre>
* <p/>
* <code>CompositeActionMapper</code> will be configured with 3 ActionMapper,
namely
Modified:
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties?view=diff&rev=475165&r1=475164&r2=475165
==============================================================================
---
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
(original)
+++
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
Wed Nov 15 01:00:41 2006
@@ -49,15 +49,6 @@
### How request URLs are mapped to and from actions
#struts.mapper.class=org.apache.struts2.dispatcher.mapper.DefaultActionMapper
-### The above line is to be commented and following are to be uncommented to
-### enable CompositeActionMapper
-### - With CompositeActionMapper one could specified many ActionMapper
instance, where
-### each of them will be chosen according to the order. Lower order number
has
-### higher precedence
-#struts.mapper.class=org.apache.struts2.dispatcher.mapper.CompositeActionMapper
-#struts.mapper.composite.1=org.apache.struts2.dispatcher.mapper.DefaultActionMapper
-#struts.mapper.composite.2=foo.bar.MyActionMapper
-#struts.mapper.composite.3=foo.bar.MyAnotherActionMapper
### Used by the DefaultActionMapper
### You may provide a comma separated list, e.g.
struts.action.extension=action,jnlp,do
