svn commit: r391690 - in /struts/action/trunk/core/src: java/org/apache/struts/config/ActionConfigMatcher.java test/org/apache/struts/config/TestActionConfigMatcher.java

[mrdon]

Author: mrdon
Date: Wed Apr  5 10:54:46 2006
New Revision: 391690

URL: http://svn.apache.org/viewcvs?rev=391690&view=rev
Log:
Adding module property to wildcard replacement for forward configs
PR: 39213

Modified:
    
struts/action/trunk/core/src/java/org/apache/struts/config/ActionConfigMatcher.java
    
struts/action/trunk/core/src/test/org/apache/struts/config/TestActionConfigMatcher.java

Modified: 
struts/action/trunk/core/src/java/org/apache/struts/config/ActionConfigMatcher.java
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/core/src/java/org/apache/struts/config/ActionConfigMatcher.java?rev=391690&r1=391689&r2=391690&view=diff
==============================================================================
--- 
struts/action/trunk/core/src/java/org/apache/struts/config/ActionConfigMatcher.java
 (original)
+++ 
struts/action/trunk/core/src/java/org/apache/struts/config/ActionConfigMatcher.java
 Wed Apr  5 10:54:46 2006
@@ -183,6 +183,7 @@
             cfg.setRedirect(fConfigs[x].getRedirect());
             cfg.setCommand(convertParam(fConfigs[x].getCommand(), vars));
             cfg.setCatalog(convertParam(fConfigs[x].getCatalog(), vars));
+            cfg.setModule(convertParam(fConfigs[x].getModule(), vars));
 
             replaceProperties(fConfigs[x].getProperties(), cfg.getProperties(),
                 vars);

Modified: 
struts/action/trunk/core/src/test/org/apache/struts/config/TestActionConfigMatcher.java
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/core/src/test/org/apache/struts/config/TestActionConfigMatcher.java?rev=391690&r1=391689&r2=391690&view=diff
==============================================================================
--- 
struts/action/trunk/core/src/test/org/apache/struts/config/TestActionConfigMatcher.java
 (original)
+++ 
struts/action/trunk/core/src/test/org/apache/struts/config/TestActionConfigMatcher.java
 Wed Apr  5 10:54:46 2006
@@ -148,6 +148,8 @@
                     "path,Bar".equals(cfg.getPath()));
                 assertTrue("Property foo hasn't been replaced",
                     "bar,Bar".equals(cfg.getProperty("foo")));
+                assertTrue("Module hasn't been replaced",
+                    "modBar".equals(cfg.getModule()));
             }
         }
 
@@ -192,12 +194,14 @@
 
         cfg.setName("name");
         cfg.setPath("path,{1}");
+        cfg.setModule("mod{1}");
         cfg.setProperty("foo", "bar,{1}");
         mapping.addForwardConfig(cfg);
 
         cfg = new ActionForward();
         cfg.setName("name2");
         cfg.setPath("path2");
+        cfg.setModule("mod{1}");
         mapping.addForwardConfig(cfg);
 
         ExceptionConfig excfg = new ExceptionConfig();



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]