Author: mrdon
Date: Sat Aug 6 13:21:45 2005
New Revision: 230578
URL: http://svn.apache.org/viewcvs?rev=230578&view=rev
Log:
Fixed a few webwork integration issues
Removed:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerObjectFactory.java
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/config/spring-config-servlet.xml
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionProxy.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitXWork.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/PopulateContextForRequest.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/webwork/CreateWebWorkActionProxy.java
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/config/spring-config-servlet.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/config/spring-config-servlet.xml?rev=230578&r1=230577&r2=230578&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/config/spring-config-servlet.xml
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/config/spring-config-servlet.xml
Sat Aug 6 13:21:45 2005
@@ -19,8 +19,6 @@
<bean id="controllerContext"
class="org.apache.ti.processor.ControllerContext" />
- <bean id="objectFactory"
class="org.apache.ti.processor.ControllerObjectFactory" />
-
<bean id="actionProxyFactory"
class="org.apache.ti.processor.ControllerActionProxyFactory" />
<!-- Chain commands that need DI -->
@@ -28,7 +26,6 @@
<property name="actionMapper" ref="actionMapper" />
</bean>
<bean id="initXWork" class="org.apache.ti.processor.chain.InitXWork">
- <property name="objectFactory" ref="objectFactory" />
<property name="actionProxyFactory" ref="actionProxyFactory" />
</bean>
<bean id="initControllerContext"
class="org.apache.ti.processor.chain.InitControllerContext">
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionProxy.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionProxy.java?rev=230578&r1=230577&r2=230578&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionProxy.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionProxy.java
Sat Aug 6 13:21:45 2005
@@ -17,6 +17,8 @@
*/
package org.apache.ti.processor.chain;
+import java.util.Map;
+
import org.apache.ti.config.mapper.ActionMapping;
import org.apache.ti.processor.ProcessorException;
@@ -49,11 +51,11 @@
return false;
}
- protected ActionProxy getActionProxy(WebContext ctx, ActionMapping
mapping) {
+ protected ActionProxy getActionProxy(Map extraCtx, ActionMapping mapping) {
try {
log.debug("Trying to get proxy");
- ActionProxy proxy =
ActionProxyFactory.getFactory().createActionProxy(mapping.getNamespace(),
mapping.getName(), ctx);
+ ActionProxy proxy =
ActionProxyFactory.getFactory().createActionProxy(mapping.getNamespace(),
mapping.getName(), extraCtx);
return proxy;
} catch (ConfigurationException e) {
log.error("Could not find action", e);
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitXWork.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitXWork.java?rev=230578&r1=230577&r2=230578&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitXWork.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitXWork.java
Sat Aug 6 13:21:45 2005
@@ -34,13 +34,8 @@
private static final Log log = LogFactory.getLog(InitXWork.class);
- protected ObjectFactory objectFactory;
protected ActionProxyFactory actionProxyFactory;
- public void setObjectFactory(ObjectFactory factory) {
- this.objectFactory = factory;
- }
-
public void setActionProxyFactory(ActionProxyFactory factory) {
this.actionProxyFactory = factory;
}
@@ -49,7 +44,6 @@
log.debug("Initializing XWork");
WebContext ctx = (WebContext) origctx;
- ObjectFactory.setObjectFactory(objectFactory);
ActionProxyFactory.setFactory(actionProxyFactory);
return false;
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/PopulateContextForRequest.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/PopulateContextForRequest.java?rev=230578&r1=230577&r2=230578&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/PopulateContextForRequest.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/PopulateContextForRequest.java
Sat Aug 6 13:21:45 2005
@@ -18,6 +18,7 @@
package org.apache.ti.processor.chain;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import org.apache.commons.chain.Command;
@@ -64,8 +65,14 @@
HashMap extraContext = createContextMap(requestMap, params,
ctx.getSessionScope(), ctx.getApplicationScope(), ctx);
- ctx.putAll(extraContext);
-
+ Map.Entry entry;
+ for (Iterator i = extraContext.entrySet().iterator(); i.hasNext(); ) {
+ entry = (Map.Entry)i.next();
+ if (!ctx.containsKey(entry.getKey())) {
+ ctx.put(entry.getKey(), entry.getValue());
+ }
+ }
+
return false;
}
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/webwork/CreateWebWorkActionProxy.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/webwork/CreateWebWorkActionProxy.java?rev=230578&r1=230577&r2=230578&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/webwork/CreateWebWorkActionProxy.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/webwork/CreateWebWorkActionProxy.java
Sat Aug 6 13:21:45 2005
@@ -17,6 +17,9 @@
*/
package org.apache.ti.processor.chain.webwork;
+import java.util.Map;
+import java.util.HashMap;
+
import org.apache.commons.chain.Context;
import org.apache.commons.chain.Filter;
import org.apache.commons.chain.web.WebContext;
@@ -51,7 +54,11 @@
ctx.put("origStack", stack);
ActionMapping mapping = (ActionMapping) ctx.get("actionMapping");
- ActionProxy proxy = getActionProxy(ctx, mapping);
+
+ HashMap map = new HashMap();
+ map.putAll(ctx);
+ map.remove("context");
+ ActionProxy proxy = getActionProxy(map, mapping);
ctx.getRequestScope().put(ServletActionContext.WEBWORK_VALUESTACK_KEY,
proxy.getInvocation().getStack());
ctx.put("actionProxy", proxy);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
