Author: mrdon
Date: Sat Dec 31 02:36:47 2005
New Revision: 360264
URL: http://svn.apache.org/viewcvs?rev=360264&view=rev
Log:
Updated examples, fixed flash usage, all examples now work correctly
Added:
struts/flow/trunk/src/java/org/apache/struts/flow/struts-config.xml
- copied, changed from r360258,
struts/flow/trunk/src/java/struts-config.xml
Removed:
struts/flow/trunk/src/java/struts-config.xml
Modified:
struts/flow/trunk/build.xml
struts/flow/trunk/project.xml
struts/flow/trunk/src/examples/WEB-INF/guess/struts-config.xml
struts/flow/trunk/src/examples/WEB-INF/rails/flow/NumberGuess.js
struts/flow/trunk/src/examples/WEB-INF/remote/struts-config.xml
struts/flow/trunk/src/examples/WEB-INF/struts-config.xml
struts/flow/trunk/src/examples/WEB-INF/templates/struts-config.xml
struts/flow/trunk/src/examples/WEB-INF/wizard/struts-config.xml
struts/flow/trunk/src/java/org/apache/struts/flow/FlowAction.java
struts/flow/trunk/src/java/org/apache/struts/flow/Forward.java
struts/flow/trunk/src/java/org/apache/struts/flow/core/javascript/fom/FOM_Flow.java
struts/flow/trunk/src/java/org/apache/struts/flow/core/javascript/fom/FOM_JavaScriptInterpreter.java
struts/flow/trunk/src/java/org/apache/struts/flow/core/javascript/fom/fom_system.js
struts/flow/trunk/src/java/org/apache/struts/flow/portlet/FlowPortlet.java
Modified: struts/flow/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/struts/flow/trunk/build.xml?rev=360264&r1=360263&r2=360264&view=diff
==============================================================================
--- struts/flow/trunk/build.xml (original)
+++ struts/flow/trunk/build.xml Sat Dec 31 02:36:47 2005
@@ -130,10 +130,6 @@
<get dest="${lib.core}/ibatis-sqlmap-2.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/com.ibatis/jars/ibatis2-sqlmap-2.1.5.582.jar"/>
- <get dest="${lib.core}/janino.jar" usetimestamp="true"
- ignoreerrors="true"
-
src="http://www.ibiblio.org/maven/janino/jars/janino-2.3.8.jar"/>
-
<get dest="${lib.core}/commons-validator.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-validator/jars/commons-validator-1.1.3.jar"/>
Modified: struts/flow/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/struts/flow/trunk/project.xml?rev=360264&r1=360263&r2=360264&view=diff
==============================================================================
--- struts/flow/trunk/project.xml (original)
+++ struts/flow/trunk/project.xml Sat Dec 31 02:36:47 2005
@@ -69,7 +69,7 @@
<dependency>
<groupId>struts</groupId>
<artifactId>struts-action</artifactId>
- <version>1.3-30122005</version>
+ <version>1.3.0-31122005</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
Modified: struts/flow/trunk/src/examples/WEB-INF/guess/struts-config.xml
URL:
http://svn.apache.org/viewcvs/struts/flow/trunk/src/examples/WEB-INF/guess/struts-config.xml?rev=360264&r1=360263&r2=360264&view=diff
==============================================================================
--- struts/flow/trunk/src/examples/WEB-INF/guess/struts-config.xml (original)
+++ struts/flow/trunk/src/examples/WEB-INF/guess/struts-config.xml Sat Dec 31
02:36:47 2005
@@ -1,33 +1,32 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"
- "http://jakarta.apache.org/struts/dtds/struts-config_1_3.dtd";>
-
-<struts-config>
-
-
- <!-- ========== Action Mapping Definitions ============================== -->
- <action-mappings>
-
- <action path="/guess"
- type="org.apache.struts.flow.FlowAction"
- className="org.apache.struts.flow.FlowMapping">
-
- <set-property key="function" value="main" />
-
- <forward name="failure" path="/guess.jsp" />
- <forward name="success" path="/success.jsp" />
- </action>
- </action-mappings>
-
-
- <plug-in className="org.apache.struts.flow.FlowPlugIn">
- <set-property property="scripts" value="/WEB-INF/guess/numberguess.js" />
- <set-property property="debugger" value="false" />
- <set-property property="reloadScripts" value="true" />
- <set-property property="timeToLive" value="600000" />
- </plug-in>
-
-
-</struts-config>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<!DOCTYPE struts-config PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"
+ "http://struts.apache.org/dtds/struts-config_1_3.dtd";>
+
+<struts-config>
+
+
+ <!-- ========== Action Mapping Definitions ============================== -->
+ <action-mappings>
+
+ <action path="/guess"
+ type="org.apache.struts.flow.FlowAction">
+
+ <set-property key="function" value="main" />
+
+ <forward name="failure" path="/guess.jsp" />
+ <forward name="success" path="/success.jsp" />
+ </action>
+ </action-mappings>
+
+
+ <plug-in className="org.apache.struts.flow.FlowPlugIn">
+ <set-property property="scripts" value="/WEB-INF/guess/numberguess.js" />
+ <set-property property="debugger" value="false" />
+ <set-property property="reloadScripts" value="true" />
+ <set-property property="timeToLive" value="600000" />
+ </plug-in>
+
+
+</struts-config>
Modified: struts/flow/trunk/src/examples/WEB-INF/rails/flow/NumberGuess.js
URL:
http://svn.apache.org/viewcvs/struts/flow/trunk/src/examples/WEB-INF/rails/flow/NumberGuess.js?rev=360264&r1=360263&r2=360264&view=diff
==============================================================================
--- struts/flow/trunk/src/examples/WEB-INF/rails/flow/NumberGuess.js (original)
+++ struts/flow/trunk/src/examples/WEB-INF/rails/flow/NumberGuess.js Sat Dec 31
02:36:47 2005
@@ -32,7 +32,7 @@
flash.guesses = this.guesses;
flash.random = this.random;
- flow.redirect("endGame.do");
+ flow.redirect( { "action" : "endGame" } );
}
this.endGame = function() {}
Modified: struts/flow/trunk/src/examples/WEB-INF/remote/struts-config.xml
URL:
http://svn.apache.org/viewcvs/struts/flow/trunk/src/examples/WEB-INF/remote/struts-config.xml?rev=360264&r1=360263&r2=360264&view=diff
==============================================================================
--- struts/flow/trunk/src/examples/WEB-INF/remote/struts-config.xml (original)
+++ struts/flow/trunk/src/examples/WEB-INF/remote/struts-config.xml Sat Dec 31
02:36:47 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
- "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"
+ "http://struts.apache.org/dtds/struts-config_1_3.dtd";>
<struts-config>
@@ -11,10 +11,9 @@
<action-mappings>
<action path="/guess"
- type="org.apache.struts.flow.FlowAction"
- className="org.apache.struts.flow.FlowMapping">
+ type="org.apache.struts.flow.FlowAction">
- <set-property property="function" value="main" />
+ <set-property key="function" value="main" />
<forward name="failure" path="/guess.jsp" />
<forward name="success" path="/success.jsp" />
Modified: struts/flow/trunk/src/examples/WEB-INF/struts-config.xml
URL:
http://svn.apache.org/viewcvs/struts/flow/trunk/src/examples/WEB-INF/struts-config.xml?rev=360264&r1=360263&r2=360264&view=diff
==============================================================================
--- struts/flow/trunk/src/examples/WEB-INF/struts-config.xml (original)
+++ struts/flow/trunk/src/examples/WEB-INF/struts-config.xml Sat Dec 31
02:36:47 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
- "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"
+ "http://struts.apache.org/dtds/struts-config_1_3.dtd";>
<struts-config>
Modified: struts/flow/trunk/src/examples/WEB-INF/templates/struts-config.xml
URL:
http://svn.apache.org/viewcvs/struts/flow/trunk/src/examples/WEB-INF/templates/struts-config.xml?rev=360264&r1=360263&r2=360264&view=diff
==============================================================================
--- struts/flow/trunk/src/examples/WEB-INF/templates/struts-config.xml
(original)
+++ struts/flow/trunk/src/examples/WEB-INF/templates/struts-config.xml Sat Dec
31 02:36:47 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
- "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"
+ "http://struts.apache.org/dtds/struts-config_1_3.dtd";>
<struts-config>
@@ -11,10 +11,9 @@
<action-mappings>
<action path="/guess"
- type="org.apache.struts.flow.FlowAction"
- className="org.apache.struts.flow.FlowMapping">
+ type="org.apache.struts.flow.FlowAction">
- <set-property property="function" value="main" />
+ <set-property key="function" value="main" />
</action>
</action-mappings>
Modified: struts/flow/trunk/src/examples/WEB-INF/wizard/struts-config.xml
URL:
http://svn.apache.org/viewcvs/struts/flow/trunk/src/examples/WEB-INF/wizard/struts-config.xml?rev=360264&r1=360263&r2=360264&view=diff
==============================================================================
--- struts/flow/trunk/src/examples/WEB-INF/wizard/struts-config.xml (original)
+++ struts/flow/trunk/src/examples/WEB-INF/wizard/struts-config.xml Sat Dec 31
02:36:47 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
- "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"
+ "http://struts.apache.org/dtds/struts-config_1_3.dtd";>
<struts-config>
@@ -11,10 +11,9 @@
<action-mappings>
<action path="/registration"
- type="org.apache.struts.flow.FlowAction"
- className="org.apache.struts.flow.FlowMapping">
+ type="org.apache.struts.flow.FlowAction">
- <set-property property="function" value="main" />
+ <set-property key="function" value="main" />
<forward name="name-form" path="/name-form.jsp" />
<forward name="hobbies-form" path="/hobbies-form.jsp" />
Modified: struts/flow/trunk/src/java/org/apache/struts/flow/FlowAction.java
URL:
http://svn.apache.org/viewcvs/struts/flow/trunk/src/java/org/apache/struts/flow/FlowAction.java?rev=360264&r1=360263&r2=360264&view=diff
==============================================================================
--- struts/flow/trunk/src/java/org/apache/struts/flow/FlowAction.java (original)
+++ struts/flow/trunk/src/java/org/apache/struts/flow/FlowAction.java Sat Dec
31 02:36:47 2005
@@ -124,20 +124,22 @@
if
("true".equals(FlowConfiguration.getInstance().getProperty("flow.devMode"))) {
SqlMap.reloadConfig();
}
-
+
+ Forward forward = new Forward();
+ forward.setModule(mapping.getModuleConfig().getPrefix());
+ forward.setAction(func);
+ forward.setController(controller);
+ context.put(Constants.FORWARD_KEY, forward);
+
Interpreter interp = null;
String scriptPattern = getProperty("script", request, mapping);
if (scriptPattern == null) {
interp = getInterpreter(mapping.getModuleConfig().getPrefix());
} else {
- Forward f = new Forward();
- f.setModule(mapping.getModuleConfig().getPrefix());
- f.setAction(func);
- f.setController(controller);
interp = getInterpreter(mapping.getModuleConfig().getPrefix(),
- f.toUri(scriptPattern));
+ forward.toUri(scriptPattern));
}
-
+
if (contid == null || contid.length() == 0) {
// --- start a new flow
@@ -169,17 +171,14 @@
String id = mapping.getProperty("id");
if (id != null) {
- args.add(id);
+ args.add(new Interpreter.Argument("id", id));
}
// call control script function
Object ret = interp.callController(controller, func, args,
context);
- Forward forward = (Forward) context.get(Constants.FORWARD_KEY);
-
- // Probably a remote flow call
- if (forward == null && isFlowCall) {
+ if (isFlowCall) {
Map atts = ConversionHelper.jsobjectToMap((Scriptable)
ret);
String json = new JSONSerializer().serialize(atts);
if (log.isDebugEnabled()) {
@@ -202,8 +201,6 @@
interp.handleContinuation(
request.getParameter("contid"), new LinkedList(), context);
- // retrieve page, continuation ID, and attributes from chain
context
- Forward forward = (Forward) context.get(Constants.FORWARD_KEY);
return dispatchToPage(request, response, mapping, forward);
}
}
Modified: struts/flow/trunk/src/java/org/apache/struts/flow/Forward.java
URL:
http://svn.apache.org/viewcvs/struts/flow/trunk/src/java/org/apache/struts/flow/Forward.java?rev=360264&r1=360263&r2=360264&view=diff
==============================================================================
--- struts/flow/trunk/src/java/org/apache/struts/flow/Forward.java (original)
+++ struts/flow/trunk/src/java/org/apache/struts/flow/Forward.java Sat Dec 31
02:36:47 2005
@@ -41,15 +41,20 @@
public void populate(Map map) {
- this.uri = (String) map.get("uri");
- this.module = (String) map.get("module");
- this.action = (String) map.get("action");
- this.params = (Map) map.get("params");
- this.controller = (String) map.get("controller");
+ this.uri = (String) setIfNotNull(uri, map.get("uri"));
+ this.module = (String) setIfNotNull(module, map.get("module"));
+ this.action = (String) setIfNotNull(action, map.get("action"));
+ this.params = (Map) setIfNotNull(params, map.get("params"));
+ this.controller = (String) setIfNotNull(controller,
map.get("controller"));
this.redirect = "true".equals(map.get("redirect"));
this.options = map;
}
+ protected Object setIfNotNull(Object orig, Object obj) {
+ return (obj != null ? obj : orig);
+ }
+
+
/**
* Returns the value of redirect.
@@ -212,20 +217,19 @@
public String toUri(String pattern) {
- if (options != null) {
+ if (uri != null) {
+ return uri;
+ } else {
Map vars = new HashMap();
vars.put("M", module);
vars.put("A", action);
vars.put("C", controller);
return createPath(pattern, vars);
- } else {
- return uri;
- }
+ }
}
protected String createPath(String pattern, Map vars) {
-
StringBuffer path = new StringBuffer();
char c;
Object val;
Modified:
struts/flow/trunk/src/java/org/apache/struts/flow/core/javascript/fom/FOM_Flow.java
URL:
http://svn.apache.org/viewcvs/struts/flow/trunk/src/java/org/apache/struts/flow/core/javascript/fom/FOM_Flow.java?rev=360264&r1=360263&r2=360264&view=diff
==============================================================================
---
struts/flow/trunk/src/java/org/apache/struts/flow/core/javascript/fom/FOM_Flow.java
(original)
+++
struts/flow/trunk/src/java/org/apache/struts/flow/core/javascript/fom/FOM_Flow.java
Sat Dec 31 02:36:47 2005
@@ -219,14 +219,14 @@
WebContext ctx = currentCall.getWebContext();
FOM_WebContinuation fom_wk =
(FOM_WebContinuation)ConversionHelper.jsobjectToObject(wk);
- Forward forward = new Forward();
-
+ Forward forward = (Forward) ctx.get(Constants.FORWARD_KEY);
+
if (fom_wk != null) {
// save page locals
fom_wk.setPageLocal(pageLocal.getDelegate());
forward.setContid(fom_wk.jsGet_id());
}
-
+
if (options instanceof String) {
forward.setUri((String) options);
} else if (options instanceof Scriptable
Modified:
struts/flow/trunk/src/java/org/apache/struts/flow/core/javascript/fom/FOM_JavaScriptInterpreter.java
URL:
http://svn.apache.org/viewcvs/struts/flow/trunk/src/java/org/apache/struts/flow/core/javascript/fom/FOM_JavaScriptInterpreter.java?rev=360264&r1=360263&r2=360264&view=diff
==============================================================================
---
struts/flow/trunk/src/java/org/apache/struts/flow/core/javascript/fom/FOM_JavaScriptInterpreter.java
(original)
+++
struts/flow/trunk/src/java/org/apache/struts/flow/core/javascript/fom/FOM_JavaScriptInterpreter.java
Sat Dec 31 02:36:47 2005
@@ -324,19 +324,7 @@
}
}
- private void setFlash(List oldFlashKeys, WebContext ctx, Scriptable scope,
Map flash) {
- if (oldFlashKeys != null) {
- Factory.getLogger().debug("Clearing old flash from controller:
"+oldFlashKeys.size());
- String key;
- Object val;
- Factory.getLogger().debug("Going to add flash to session:
"+flash.size());
- for (Iterator i = oldFlashKeys.iterator(); i.hasNext(); ) {
- key = (String) i.next();
- Factory.getLogger().debug("Clearing old flash from context:
"+key);
- scope.delete(key);
- }
- }
-
+ private void setFlash(WebContext ctx, Scriptable scope, Map flash) {
Factory.getLogger().debug("Adding flash to session: "+flash.size());
if (flash.size() > 0) {
ctx.getSessionScope().put("flash", new HashMap(flash));
@@ -344,10 +332,9 @@
}
}
- private List useFlash(WebContext webctx, Scriptable scope) {
+ private void useFlash(WebContext webctx, Scriptable scope) {
Map flash = (Map) webctx.getSessionScope().get("flash");
webctx.getSessionScope().remove("flash");
- List oldFlash = new ArrayList();
if (flash != null) {
final Context context = Context.getCurrentContext();
WrapFactory factory = context.getWrapFactory();
@@ -361,11 +348,9 @@
Factory.getLogger().debug("Adding flash to context: "+key);
scope.put(key, scope, factory.wrap(context, scope, val,
val.getClass()));
- oldFlash.add(key);
}
}
}
- return oldFlash;
}
private void initFlowVariables(Map vars, WebContext ctx) {
@@ -459,7 +444,6 @@
boolean locked = false;
private Map flash = new HashMap();
- private List oldFlash = new ArrayList();
private Map flowVars = new HashMap();
@@ -824,7 +808,6 @@
Thread.currentThread().getContextClassLoader();
FOM_Flow flow = null;
Scriptable controller = null;
- List oldFlashKeys = null;
try {
try {
setupContext(webctx, context, thrScope);
@@ -864,7 +847,7 @@
if (fun == Scriptable.NOT_FOUND) {
throw new FlowException("Function \"javascript:" +
funName + "()\" not found");
}
- oldFlashKeys = useFlash(webctx, controller);
+ useFlash(webctx, controller);
initFlowVariables(thrScope.getFlowVariables(), webctx);
thrScope.setLock(true);
ret = ScriptRuntime.call(context, fun, controller, new
Object[0], controller);
@@ -886,7 +869,7 @@
flow.popCallContext();
}
cleanupFlowVariables(thrScope.getFlowVariables());
- setFlash(oldFlashKeys, webctx, controller,
thrScope.getFlash());
+ setFlash(webctx, controller, thrScope.getFlash());
Context.exit();
Thread.currentThread().setContextClassLoader(savedClassLoader);
}
@@ -978,7 +961,7 @@
if (flow != null) {
flow.popCallContext();
}
- setFlash(null, webctx, null, kScope.getFlash());
+ setFlash(webctx, null, kScope.getFlash());
cleanupFlowVariables(kScope.getFlowVariables());
Context.exit();
Thread.currentThread().setContextClassLoader(savedClassLoader);
Modified:
struts/flow/trunk/src/java/org/apache/struts/flow/core/javascript/fom/fom_system.js
URL:
http://svn.apache.org/viewcvs/struts/flow/trunk/src/java/org/apache/struts/flow/core/javascript/fom/fom_system.js?rev=360264&r1=360263&r2=360264&view=diff
==============================================================================
---
struts/flow/trunk/src/java/org/apache/struts/flow/core/javascript/fom/fom_system.js
(original)
+++
struts/flow/trunk/src/java/org/apache/struts/flow/core/javascript/fom/fom_system.js
Sat Dec 31 02:36:47 2005
@@ -16,6 +16,7 @@
FOM_Flow.suicide = new Continuation();
FOM_Flow.prototype.forwardAndWait = function(uri, bizData, fun, ttl) {
+
this.forward(uri, bizData,
new FOM_WebContinuation(new Continuation(),
this.continuation, ttl));
@@ -30,6 +31,7 @@
FOM_Flow.prototype.wait = function(ttl) {
+ print("waiting");
this.forward(null, null,
new FOM_WebContinuation(new Continuation(),
this.continuation, ttl));
@@ -37,15 +39,16 @@
}
FOM_Flow.prototype.redirect = function(options) {
+ print("redirecting");
var obj = {}
// This set of logic allows the following arguments:
// redirect("http://foo";);
// redirect({ action: "foo", controller: "bar"})
- if (options typeof 'string') {
+ if (typeof(options) == 'string') {
obj.uri = arguments[0];
} else {
- obj.prototype = options;
+ obj = options;
}
obj.redirect = true;
Modified:
struts/flow/trunk/src/java/org/apache/struts/flow/portlet/FlowPortlet.java
URL:
http://svn.apache.org/viewcvs/struts/flow/trunk/src/java/org/apache/struts/flow/portlet/FlowPortlet.java?rev=360264&r1=360263&r2=360264&view=diff
==============================================================================
--- struts/flow/trunk/src/java/org/apache/struts/flow/portlet/FlowPortlet.java
(original)
+++ struts/flow/trunk/src/java/org/apache/struts/flow/portlet/FlowPortlet.java
Sat Dec 31 02:36:47 2005
@@ -90,14 +90,15 @@
}
// retrieve page, continuation ID, and attributes from chain
context
- String page = (String)
ConversionHelper.jsobjectToObject(context.get(Constants.FORWARD_NAME_KEY));
- contid = (String) context.get(Constants.CONTINUATION_ID_KEY);
- Scriptable bizdata = (Scriptable)
context.get(Constants.BIZ_DATA_KEY);
- Map atts = null;
- if (bizdata != null) {
- atts = ConversionHelper.jsobjectToMap(bizdata);
- }
- dispatchToPage(request, response, page, contid, atts);
+ // FIXME: commenting out for now
+ //String page = (String)
ConversionHelper.jsobjectToObject(context.get(Constants.FORWARD_NAME_KEY));
+ //contid = (String) context.get(Constants.CONTINUATION_ID_KEY);
+ //Scriptable bizdata = (Scriptable)
context.get(Constants.BIZ_DATA_KEY);
+ //Map atts = null;
+ //if (bizdata != null) {
+ // atts = ConversionHelper.jsobjectToMap(bizdata);
+ //}
+ //dispatchToPage(request, response, page, contid, atts);
} else {
// --- continue an existing flow
@@ -111,15 +112,15 @@
}
// retrieve page, continuation ID, and attributes from chain
context
- String page = (String) context.get(Constants.FORWARD_NAME_KEY);
- contid = (String) context.get(Constants.CONTINUATION_ID_KEY);
- Scriptable bizdata = (Scriptable)
context.get(Constants.BIZ_DATA_KEY);
- Map atts = null;
- if (bizdata != null) {
- atts = ConversionHelper.jsobjectToMap(bizdata);
- }
+ //String page = (String) context.get(Constants.FORWARD_NAME_KEY);
+ //contid = (String) context.get(Constants.CONTINUATION_ID_KEY);
+ //Scriptable bizdata = (Scriptable)
context.get(Constants.BIZ_DATA_KEY);
+ //Map atts = null;
+ //if (bizdata != null) {
+ // atts = ConversionHelper.jsobjectToMap(bizdata);
+ //}
- dispatchToPage(request, response, page, contid, atts);
+ //dispatchToPage(request, response, page, contid, atts);
}
}
Copied: struts/flow/trunk/src/java/org/apache/struts/flow/struts-config.xml
(from r360258, struts/flow/trunk/src/java/struts-config.xml)
URL:
http://svn.apache.org/viewcvs/struts/flow/trunk/src/java/org/apache/struts/flow/struts-config.xml?p2=struts/flow/trunk/src/java/org/apache/struts/flow/struts-config.xml&p1=struts/flow/trunk/src/java/struts-config.xml&r1=360258&r2=360264&rev=360264&view=diff
==============================================================================
--- struts/flow/trunk/src/java/struts-config.xml (original)
+++ struts/flow/trunk/src/java/org/apache/struts/flow/struts-config.xml Sat Dec
31 02:36:47 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
- "http://jakarta.apache.org/struts/dtds/struts-config_1_3.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"
+ "http://struts.apache.org/dtds/struts-config_1_3.dtd";>
<struts-config>
@@ -16,20 +16,20 @@
-->
<action-mappings>
- <action id="default" path="/*/*/*"
type="org.apache.struts.flow.FlowAction">
+ <action path="/*/*/*" type="org.apache.struts.flow.FlowAction">
<set-property key="controller" value="{1}" />
<set-property key="function" value="{2}" />
<set-property key="id" value="{3}" />
<set-property key="script" value="$M/flow/$C.js" />
- <forward name="default" path="/WEB-INF/$M/jsp/$C/$A.jsp" />
+ <forward name="forward" path="/WEB-INF$M/jsp/$A.jsp" />
<forward name="redirect" path="$M/$C/$A.do" redirect="true" />
</action>
- <action path="/*/*" extends="default" />
+ <action path="/*/*" extends="/*/*/*" />
</action-mappings>
- <controller forwardPattern="" />
+ <controller forwardPattern="$P" />
<plug-in className="org.apache.struts.flow.FlowPlugIn">
<set-property property="scriptBase" value="/WEB-INF" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
