Commits

Anonymous committed 3c0b263

Updating to latest xwork, Pat's patched Ognl, and fixing up the example war

git-svn-id: http://svn.opensymphony.com/svn/webwork/trunk@104573baa09-0c28-0410-bef9-dab3c582ae83

Comments (0)

Files changed (4)

config-browser/src/config-browser.xml

         </interceptors>
         <default-interceptor-ref name="config-browser-default"/>
         <global-results>
-            <result name="error" type="velocity">error.vm</result>
+            <result name="error" type="velocity">/error.vm</result>
         </global-results>
         <action name="namespace" class="com.opensymphony.webwork.config_browser.NamespaceAction">
-            <result type="velocity" name="success">namespaces.vm</result>
-            <result type="velocity" name="input">namespaces.vm</result>
+            <result type="velocity" name="success">/namespaces.vm</result>
+            <result type="velocity" name="input">/namespaces.vm</result>
         </action>
         <action name="actionNames" class="com.opensymphony.webwork.config_browser.ActionNamesAction">
-            <result type="velocity" name="success">actionNames.vm</result>
-            <result type="velocity" name="input">actionNames.vm</result>
+            <result type="velocity" name="success">/actionNames.vm</result>
+            <result type="velocity" name="input">/actionNames.vm</result>
         </action>
         <action name="showConfig" class="com.opensymphony.webwork.config_browser.ShowConfigAction">
-            <result type="velocity" name="success">showConfig.vm</result>
-            <result type="velocity" name="input">showConfig.vm</result>
+            <result type="velocity" name="success">/showConfig.vm</result>
+            <result type="velocity" name="input">/showConfig.vm</result>
         </action>
     </package>
 </xwork>

lib/core/ognl-2.6.3.jar

Binary file modified.

lib/core/xwork-1.0-beta.jar

Binary file modified.

src/test/com/opensymphony/webwork/views/jsp/ActionTagTest.java

             Object o = pageContext.findAttribute(TestConfigurationProvider.TEST_NAMESPACE_ACTION);
             assertTrue(o instanceof TestAction);
 
-            // Since the tag executes the proxy, the ActionContext is set back to the original action context, we
-            // want to check the old one (the one the proxy was run as)
-            ActionInvocation actionInvocation = tag.proxy.getLastContext().getActionInvocation();
-            assertEquals(TestConfigurationProvider.TEST_NAMESPACE, actionInvocation.getProxy().getNamespace());
+            assertEquals(TestConfigurationProvider.TEST_NAMESPACE, tag.proxy.getNamespace());
         } catch (JspException ex) {
             ex.printStackTrace();
             fail();