Author: lukaszlenart
Date: Sun Nov 17 20:42:46 2013
New Revision: 1542808
URL: http://svn.apache.org/r1542808
Log:
WW-4243 Splits interface in to two to allow using different implementation
Added:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/TagLibraryDirectiveProvider.java
- copied, changed from r1535515,
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/TagLibrary.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/TagLibraryModelProvider.java
Removed:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/TagLibrary.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
struts/struts2/trunk/core/src/main/resources/struts-default.xml
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/DojoTagLibrary.java
struts/struts2/trunk/plugins/dojo/src/main/resources/struts-plugin.xml
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java?rev=1542808&r1=1542807&r2=1542808&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java
Sun Nov 17 20:42:46 2013
@@ -70,15 +70,15 @@ import com.opensymphony.xwork2.util.Valu
/**
* The default Struts tag library
*/
-public class DefaultTagLibrary implements TagLibrary {
+public class DefaultTagLibrary implements TagLibraryDirectiveProvider,
TagLibraryModelProvider {
-public Object getFreemarkerModels(ValueStack stack, HttpServletRequest req,
-HttpServletResponse res) {
+public Object getModels(ValueStack stack, HttpServletRequest req,
+HttpServletResponse res) {
return new StrutsModels(stack, req, res);
}
-public List getVelocityDirectiveClasses() {
+public List getDirectiveClasses() {
Class[] directives = new Class[] {
ActionDirective.class,
BeanDirective.class,
Copied:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/TagLibraryDirectiveProvider.java
(from r1535515,
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/TagLibrary.java)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/TagLibraryDirectiveProvider.java?p2=struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/TagLibraryDirectiveProvider.java&p1=struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/TagLibrary.java&r1=1535515&r2=1542808&rev=1542808&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/TagLibrary.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/TagLibraryDirectiveProvider.java
Sun Nov 17 20:42:46 2013
@@ -29,26 +29,16 @@ import javax.servlet.http.HttpServletRes
import com.opensymphony.xwork2.util.ValueStack;
/**
- * Provides Velocity and Freemarker implementation classes for a tag library
+ * Provides Velocity implementation classes for a tag library
*/
-public interface TagLibrary {
+public interface TagLibraryDirectiveProvider {
/**
- * Gets a Java object that contains getters for the tag library's
Freemarker models.
- * Called once per Freemarker template processing.
- *
- * @param stack The current value stack
- * @param req The HTTP request
- * @param res The HTTP response
- * @return The Java object containing the Freemarker model getter methods
- */
-public Object getFreemarkerModels(ValueStack stack, HttpServletRequest
req, HttpServletResponse res);
-
-/**
* Gets a list of Velocity directive classes for the tag library. Called
once on framework
* startup when initializing Velocity.
*
* @return A list of Velocity directive classes
*/
-public List getVelocityDirectiveClasses();
+public List getDirectiveClasses();
+
}
Added:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/TagLibraryModelProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/TagLibraryModelProvider.java?rev=1542808&view=auto
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/TagLibraryModelProvider.java
(added)
+++
struts
