svn commit: r486123 - /struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/ReloadDefinitionsAction.java

[apetrelli]

Author: apetrelli
Date: Tue Dec 12 05:03:45 2006
New Revision: 486123

URL: http://svn.apache.org/viewvc?view=rev&rev=486123
Log:
STR-2986

Converted ReloadDefinitionsAction.

Modified:
    
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/ReloadDefinitionsAction.java

Modified: 
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/ReloadDefinitionsAction.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/ReloadDefinitionsAction.java?view=diff&rev=486123&r1=486122&r2=486123
==============================================================================
--- 
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/ReloadDefinitionsAction.java
 (original)
+++ 
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/ReloadDefinitionsAction.java
 Tue Dec 12 05:03:45 2006
@@ -32,11 +32,8 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.apache.struts.tiles2.DefinitionsFactory;
-import org.apache.struts.tiles2.DefinitionsFactoryException;
-import org.apache.struts.tiles2.TilesUtil;
-
-
+import org.apache.tiles.definition.DefinitionsFactoryException;
+import org.apache.tiles.definition.util.DefinitionsFactoryUtil;
 
 /**
  * <p>A standard <strong>Action</strong> that calls the
@@ -74,12 +71,8 @@
 
         try {
           ServletContext context = getServlet().getServletContext();
-            DefinitionsFactory factory = 
TilesUtil.getDefinitionsFactory(request, context);
-            factory.setConfig(factory.getConfig(), context);
+          DefinitionsFactoryUtil.reloadDefinitionsFactory(context);
             writer.println("OK");
-        } catch (ClassCastException e) {
-            writer.println("FAIL - " + e.toString());
-            getServlet().log("ReloadAction", e);
         } catch (DefinitionsFactoryException e) {
             writer.println("FAIL - " + e.toString());
             getServlet().log("ReloadAction", e);