From 97d60346e8c51c11941794061fa497f23197c198 Mon Sep 17 00:00:00 2001
From: Tal Daniel <tal.reads@gmail.com>
Date: Mon, 16 Oct 2017 21:52:26 +0300
Subject: [PATCH 1/2] Update MyTextProviderFactory.java

---
 .../org/apache/struts_example/MyTextProviderFactory.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/text-provider/src/main/java/org/apache/struts_example/MyTextProviderFactory.java b/text-provider/src/main/java/org/apache/struts_example/MyTextProviderFactory.java
index e010ad36..e428944b 100644
--- a/text-provider/src/main/java/org/apache/struts_example/MyTextProviderFactory.java
+++ b/text-provider/src/main/java/org/apache/struts_example/MyTextProviderFactory.java
@@ -4,7 +4,10 @@
 import com.opensymphony.xwork2.TextProvider;
 
 import java.util.ResourceBundle;
-
+/** 
+ * Exdending the TextProviderFactory is optional, as Factory return the TextProvider class it gets as argument. 
+ * See struts.xml for example configuration without extending TextProviderFactory.
+ */
 public class MyTextProviderFactory extends StrutsTextProviderFactory {
 
     @Override

From 6c7a80848e1e6cb9b3ae8d67eaa7539a42451a85 Mon Sep 17 00:00:00 2001
From: Tal Daniel <tal.reads@gmail.com>
Date: Mon, 16 Oct 2017 22:04:26 +0300
Subject: [PATCH 2/2] Added alternative config to struts.xml

---
 text-provider/src/main/resources/struts.xml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/text-provider/src/main/resources/struts.xml b/text-provider/src/main/resources/struts.xml
index 867aee8c..189d97a0 100644
--- a/text-provider/src/main/resources/struts.xml
+++ b/text-provider/src/main/resources/struts.xml
@@ -15,10 +15,20 @@
   <bean type="com.opensymphony.xwork2.TextProviderFactory"
         class="org.apache.struts_example.MyTextProviderFactory"
         name="myTextProviderFactory"
-        scope="singleton"/>
-
+        scope="singleton"/>  
+  
   <constant name="struts.textProviderFactory" value="myTextProviderFactory"/>
-
+    
+  <!-- 
+  Alternatively, if you prefer to extend only TextProviderSupport, 
+  you can define the custrom TextProvider like this (see Struts v2.5.10 TextProvider Javadocs):
+  -->
+  <!--  
+  <bean class="com.company.MyTextProviderSupport" name="MyTextProviderSupport" 
+    type="com.opensymphony.xwork2.TextProvider" />
+  <constant name="struts.xworkTextProvider" value="MyTextProviderSupport" />
+  -->
+  
   <package name="default" extends="struts-default">
 
     <default-action-ref name="index"/>