Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

-Moving AjaxHandler to spring-js

Browse Source 
-Polishing Spring.js API
-Refactoring spring-faces components to match Spring.js API changes.
This commit is contained in:
Jeremy Grelle
2008-04-22 22:28:11 +00:00
parent 0f3d983587
commit 7d3e1d611b
23 changed files with 308 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-faces/.classpath
View File

@@ -27,5 +27,6 @@
<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-webmvc/spring-webmvc-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-webmvc/spring-webmvc-sources-2.5.3.jar"/> <classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-webmvc/spring-webmvc-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-webmvc/spring-webmvc-sources-2.5.3.jar"/>
<classpathentry kind="var" path="IVY_CACHE/javax.faces/jsf-api/jsf-api-1.2.08.jar"/> <classpathentry kind="var" path="IVY_CACHE/javax.faces/jsf-api/jsf-api-1.2.08.jar"/>
<classpathentry kind="var" path="IVY_CACHE/javax.faces/jsf-impl/jsf-impl-1.2.08.jar"/> <classpathentry kind="var" path="IVY_CACHE/javax.faces/jsf-impl/jsf-impl-1.2.08.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/spring-js"/>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

2
spring-faces/src/main/java/org/springframework/faces/mvc/richfaces/RichFacesAjaxHandler.java
View File

@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletResponse;
import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.context.AjaxContext;
import org.springframework.faces.webflow.FlowLifecycle; import org.springframework.faces.webflow.FlowLifecycle;
import org.springframework.webflow.mvc.servlet.SpringJavascriptAjaxHandler; import org.springframework.js.mvc.servlet.SpringJavascriptAjaxHandler;
/** /**
* Ajax handler that works with Rich Faces, allowing support for Web Flow ajax features with the Rich Faces toolkit. * Ajax handler that works with Rich Faces, allowing support for Web Flow ajax features with the Rich Faces toolkit.

33
spring-faces/src/main/java/org/springframework/faces/ui/AjaxEventInterceptorRenderer.java
View File

@@ -17,12 +17,12 @@ package org.springframework.faces.ui;
import java.io.IOException; import java.io.IOException;
import javax.faces.FacesException;
import javax.faces.component.UIComponent; import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext; import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter; import javax.faces.context.ResponseWriter;
import javax.faces.event.ActionEvent; import javax.faces.event.ActionEvent;
import org.springframework.faces.webflow.JsfUtils;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@@ -38,32 +38,37 @@ public class AjaxEventInterceptorRenderer extends DojoRenderer {
writer.writeAttribute("type", "text/javascript", null); writer.writeAttribute("type", "text/javascript", null);
String processIds = (String) component.getAttributes().get("processIds"); String processIds = (String) component.getAttributes().get("processIds");
String renderIds = (String) component.getAttributes().get("renderIds");
if (StringUtils.hasText(processIds) && !processIds.contains(component.getClientId(context))) { if (StringUtils.hasText(processIds) && !processIds.contains(component.getClientId(context))) {
processIds = component.getClientId(context) + ", " + processIds; processIds = component.getClientId(context) + ", " + processIds;
} else if (!StringUtils.hasText(processIds)) { } else if (!StringUtils.hasText(processIds)) {
processIds = component.getClientId(context); processIds = component.getClientId(context);
} }
if (!StringUtils.hasText(renderIds)) { String childId = getElementId(context, component);
renderIds = processIds;
}
StringBuffer script = new StringBuffer(); StringBuffer script = new StringBuffer();
script.append("Spring.advisors.push(new Spring.RemoteEventAdvisor({"); script.append("Spring.addDecoration(new Spring.AjaxEventDecoration({");
script.append("event:'" + event + "'"); script.append("event:'" + event + "'");
script.append(", targetId: '" + ((UIComponent) component.getChildren().get(0)).getClientId(context) + "'"); script.append(", elementId: '" + childId + "'");
script.append(", sourceId : '" + component.getClientId(context) + "'");
script.append(", formId : '" + RendererUtils.getFormId(context, component) + "'"); script.append(", formId : '" + RendererUtils.getFormId(context, component) + "'");
script.append(", processIds : '" + processIds + "'"); script.append(", params: {processIds : '" + processIds + "'");
script.append(", renderIds : '" + renderIds + "'})"); script.append(", ajaxSource : '" + component.getClientId(context) + "'} }));");
if (JsfUtils.isAsynchronousFlowRequest()) {
script.append(".apply()");
}
script.append(");");
writer.writeText(script.toString(), null); writer.writeText(script.toString(), null);
writer.endElement("script"); writer.endElement("script");
} }
private String getElementId(FacesContext context, UIComponent component) {
if (component.getChildCount() > 0) {
UIComponent child = (UIComponent) component.getChildren().get(0);
if (!(child instanceof DojoAdvisor)) {
return child.getClientId(context);
} else {
return getElementId(context, child);
}
} else {
throw new FacesException("Could not locate a proper child element to trigger the ajax event.");
}
}
public void decode(FacesContext context, UIComponent component) { public void decode(FacesContext context, UIComponent component) {
if (context.getExternalContext().getRequestParameterMap().containsKey("ajaxSource") if (context.getExternalContext().getRequestParameterMap().containsKey("ajaxSource")
&& context.getExternalContext().getRequestParameterMap().get("ajaxSource").equals( && context.getExternalContext().getRequestParameterMap().get("ajaxSource").equals(

18
spring-faces/src/main/java/org/springframework/faces/ui/DojoAdvisorRenderer.java
View File

@@ -25,7 +25,6 @@ import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter; import javax.faces.context.ResponseWriter;
import org.springframework.faces.ui.resource.ResourceHelper; import org.springframework.faces.ui.resource.ResourceHelper;
import org.springframework.faces.webflow.JsfUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
public class DojoAdvisorRenderer extends DojoRenderer { public class DojoAdvisorRenderer extends DojoRenderer {
@@ -48,11 +47,10 @@ public class DojoAdvisorRenderer extends DojoRenderer {
writer.startElement(SCRIPT_ELEMENT, component); writer.startElement(SCRIPT_ELEMENT, component);
writer.writeAttribute("type", "text/javascript", null); writer.writeAttribute("type", "text/javascript", null);
StringBuffer script = new StringBuffer(); StringBuffer script = new StringBuffer();
script.append(" Spring.advisors.push(new Spring.ValidatingFieldAdvisor({ "); script.append(" Spring.addDecoration(new Spring.ElementDecoration({ ");
script.append(" targetElId : '" + advisedChild.getClientId(context) + "', "); script.append(" elementId : '" + advisedChild.getClientId(context) + "', ");
script.append(" msgElId : '" + advisedChild.getClientId(context) + ":msg', "); script.append(" widgetType : '" + ((DojoAdvisor) component).getDojoComponentType() + "', ");
script.append(" decoratorType : '" + ((DojoAdvisor) component).getDojoComponentType() + "', "); script.append(" widgetAttrs : { ");
script.append(" decoratorAttrs : \"{ ");
String nodeAttrs = getNodeAttributesAsString(context, advisedChild); String nodeAttrs = getNodeAttributesAsString(context, advisedChild);
String dojoAttrs = getDojoAttributesAsString(context, component); String dojoAttrs = getDojoAttributesAsString(context, component);
@@ -63,13 +61,7 @@ public class DojoAdvisorRenderer extends DojoRenderer {
} }
script.append(dojoAttrs); script.append(dojoAttrs);
script.append(" }\"})"); script.append(" }}));");
if (JsfUtils.isAsynchronousFlowRequest()) {
script.append(".apply()");
}
script.append("); ");
writer.writeText(script, null); writer.writeText(script, null);
writer.endElement(SCRIPT_ELEMENT); writer.endElement(SCRIPT_ELEMENT);

19
spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandButtonRenderer.java
View File

@@ -69,20 +69,16 @@ public class ProgressiveCommandButtonRenderer extends BaseDojoParentComponentRen
Boolean ajaxEnabled = (Boolean) component.getAttributes().get("ajaxEnabled"); Boolean ajaxEnabled = (Boolean) component.getAttributes().get("ajaxEnabled");
String processIds = (String) component.getAttributes().get("processIds"); String processIds = (String) component.getAttributes().get("processIds");
String renderIds = (String) component.getAttributes().get("renderIds");
if (Boolean.TRUE.equals(ajaxEnabled)) { if (Boolean.TRUE.equals(ajaxEnabled)) {
if (StringUtils.hasText(processIds) && !processIds.contains(component.getClientId(context))) { if (StringUtils.hasText(processIds) && !processIds.contains(component.getClientId(context))) {
processIds = component.getClientId(context) + ", " + processIds; processIds = component.getClientId(context) + ", " + processIds;
} else if (!StringUtils.hasText(processIds)) { } else if (!StringUtils.hasText(processIds)) {
processIds = component.getClientId(context); processIds = component.getClientId(context);
} }
if (!StringUtils.hasText(renderIds)) { onclick.append("Spring.remoting.submitForm('" + component.getClientId(context) + "', ");
renderIds = processIds;
}
onclick.append("Spring.RemotingHandler.submitForm('" + component.getClientId(context) + "', ");
onclick.append("'" + RendererUtils.getFormId(context, component) + "', "); onclick.append("'" + RendererUtils.getFormId(context, component) + "', ");
onclick.append("'" + processIds + "', '" + renderIds + "', " + encodeParams(context, component) onclick.append("{processIds: '" + processIds + "'" + encodeParams(context, component)
+ "); return false;"); + "}); return false;");
} else { } else {
onclick.append(getOnClickNoAjax(context, component)); onclick.append(getOnClickNoAjax(context, component));
} }
@@ -142,20 +138,15 @@ public class ProgressiveCommandButtonRenderer extends BaseDojoParentComponentRen
protected String encodeParams(FacesContext context, UIComponent component) { protected String encodeParams(FacesContext context, UIComponent component) {
StringBuffer paramArray = new StringBuffer(); StringBuffer paramArray = new StringBuffer();
paramArray.append("[");
for (int i = 0; i < component.getChildCount(); i++) { for (int i = 0; i < component.getChildCount(); i++) {
if (component.getChildren().get(i) instanceof UIParameter) { if (component.getChildren().get(i) instanceof UIParameter) {
UIParameter param = (UIParameter) component.getChildren().get(i); UIParameter param = (UIParameter) component.getChildren().get(i);
Assert.hasText(param.getName(), Assert.hasText(param.getName(),
"UIParameter requires a name when used as a child of a UICommand component"); "UIParameter requires a name when used as a child of a UICommand component");
if (paramArray.length() > 1) {
paramArray.append(", "); paramArray.append(", " + param.getName() + ": '" + param.getValue() + "'");
}
paramArray.append("{name : '" + param.getName() + "'");
paramArray.append(", value : '" + param.getValue() + "'}");
} }
} }
paramArray.append("]");
return paramArray.toString(); return paramArray.toString();
} }

18
spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandLinkRenderer.java
View File

@@ -101,9 +101,9 @@ public class ProgressiveCommandLinkRenderer extends ProgressiveCommandButtonRend
public void encodeEnd(FacesContext context, UIComponent component) throws IOException { public void encodeEnd(FacesContext context, UIComponent component) throws IOException {
super.encodeEnd(context, component); super.encodeEnd(context, component);
StringBuffer advisorParams = new StringBuffer(); StringBuffer decorationParams = new StringBuffer();
advisorParams.append("{"); decorationParams.append("{");
advisorParams.append("targetElId : '" + component.getClientId(context) + "'"); decorationParams.append("elementId : '" + component.getClientId(context) + "'");
ResponseWriter writer = context.getResponseWriter(); ResponseWriter writer = context.getResponseWriter();
// Close the script variable started in encodeBegin if this is not an AJAX request // Close the script variable started in encodeBegin if this is not an AJAX request
@@ -117,18 +117,14 @@ public class ProgressiveCommandLinkRenderer extends ProgressiveCommandButtonRend
String scriptVarEnd = "\";\n"; String scriptVarEnd = "\";\n";
writer.writeText(scriptVarEnd, null); writer.writeText(scriptVarEnd, null);
advisorParams.append(", linkHtml : " + component.getClientId(context).replaceAll(":", "_") + "_link"); decorationParams.append(", linkHtml : " + component.getClientId(context).replaceAll(":", "_") + "_link");
writer.endElement("script"); writer.endElement("script");
} }
advisorParams.append("}"); decorationParams.append("}");
StringBuffer advisorScript = new StringBuffer(); StringBuffer advisorScript = new StringBuffer();
advisorScript.append("Spring.advisors.push(new Spring.CommandLinkAdvisor(" + advisorParams.toString() + ")"); advisorScript.append("Spring.addDecoration(new Spring.CommandLinkDecoration(" + decorationParams.toString()
// Apply the advisor immediately if this is an AJAX request + "));");
if (JsfUtils.isAsynchronousFlowRequest()) {
advisorScript.append(".apply()");
}
advisorScript.append(");");
writer.startElement("script", component); writer.startElement("script", component);
writer.writeText(advisorScript, null); writer.writeText(advisorScript, null);
writer.endElement("script"); writer.endElement("script");

4
spring-faces/src/main/java/org/springframework/faces/ui/ValidateAllRenderer.java
View File

@@ -44,8 +44,8 @@ public class ValidateAllRenderer extends SpringFacesRenderer {
writer.startElement(SCRIPT_ELEMENT, component); writer.startElement(SCRIPT_ELEMENT, component);
writer.writeAttribute("type", "text/javascript", null); writer.writeAttribute("type", "text/javascript", null);
StringBuffer script = new StringBuffer(); StringBuffer script = new StringBuffer();
script.append("Spring.advisors.push(new Spring.ValidateAllAdvisor({" + "event : 'onclick', " + "targetId : '" script.append("Spring.addDecoration(new Spring.ValidateAllDecoration({" + "event : 'onclick', "
+ advisedChild.getClientId(context) + "'}));"); + "elementId : '" + advisedChild.getClientId(context) + "'}));");
writer.writeText(script, null); writer.writeText(script, null);
writer.endElement(SCRIPT_ELEMENT); writer.endElement(SCRIPT_ELEMENT);
} }

4
spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java
View File

@@ -35,12 +35,12 @@ import org.springframework.context.ApplicationContext;
import org.springframework.core.io.ContextResource; import org.springframework.core.io.ContextResource;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.faces.ui.AjaxViewRoot; import org.springframework.faces.ui.AjaxViewRoot;
import org.springframework.js.mvc.servlet.AjaxHandler;
import org.springframework.js.mvc.servlet.SpringJavascriptAjaxHandler;
import org.springframework.webflow.context.ExternalContext; import org.springframework.webflow.context.ExternalContext;
import org.springframework.webflow.execution.RequestContext; import org.springframework.webflow.execution.RequestContext;
import org.springframework.webflow.execution.View; import org.springframework.webflow.execution.View;
import org.springframework.webflow.execution.ViewFactory; import org.springframework.webflow.execution.ViewFactory;
import org.springframework.webflow.mvc.servlet.AjaxHandler;
import org.springframework.webflow.mvc.servlet.SpringJavascriptAjaxHandler;
/** /**
* JSF-specific {@link ViewFactory} implementation. * JSF-specific {@link ViewFactory} implementation.

8
spring-js/.classpath
View File

@@ -5,7 +5,6 @@
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry kind="src" path="src/test/resources"/> <classpathentry kind="src" path="src/test/resources"/>
<classpathentry combineaccessrules="false" kind="src" path="/spring-binding"/> <classpathentry combineaccessrules="false" kind="src" path="/spring-binding"/>
<classpathentry combineaccessrules="false" kind="src" path="/spring-webflow"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="IVY_CACHE/javax.servlet/servlet-api/servlet-api-2.4.jar" sourcepath="IVY_CACHE/javax.servlet/servlet-api/servlet-api-sources-2.4.jar"/> <classpathentry kind="var" path="IVY_CACHE/javax.servlet/servlet-api/servlet-api-2.4.jar" sourcepath="IVY_CACHE/javax.servlet/servlet-api/servlet-api-sources-2.4.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.apache/commons-logging/commons-logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache/commons-logging/commons-logging-sources-1.1.1.jar"/> <classpathentry kind="var" path="IVY_CACHE/org.apache/commons-logging/commons-logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache/commons-logging/commons-logging-sources-1.1.1.jar"/>
@@ -14,5 +13,12 @@
<classpathentry kind="var" path="IVY_CACHE/org.junit/junit/junit-3.8.2.jar" sourcepath="/IVY_CACHE/org.junit/junit/junit-sources-3.8.2.jar"/> <classpathentry kind="var" path="IVY_CACHE/org.junit/junit/junit-3.8.2.jar" sourcepath="/IVY_CACHE/org.junit/junit/junit-sources-3.8.2.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-test/spring-test-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-test/spring-test-sources-2.5.3.jar"/> <classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-test/spring-test-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-test/spring-test-sources-2.5.3.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-core/spring-core-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-core/spring-core-sources-2.5.3.jar"/> <classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-core/spring-core-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-core/spring-core-sources-2.5.3.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-webmvc/spring-webmvc-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-webmvc/spring-webmvc-sources-2.5.3.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-context/spring-context-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-context/spring-context-sources-2.5.3.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.apache.tiles/tiles-core/tiles-core-2.0.5.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-beans/spring-beans-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-beans/spring-beans-sources-2.5.3.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-web/spring-web-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-web/spring-web-sources-2.5.3.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.apache.tiles/tiles-api/tiles-api-2.0.5.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.apache.tiles/tiles-jsp/tiles-jsp-2.0.5.jar"/>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

6
spring-js/ivy.xml
View File

@@ -23,9 +23,15 @@
<!-- global dependencies --> <!-- global dependencies -->
<dependency org="org.apache" name="commons-logging" rev="1.1.1" conf="compile->default"/> <dependency org="org.apache" name="commons-logging" rev="1.1.1" conf="compile->default"/>
<dependency org="org.springframework" name="spring-core" rev="2.5.3" conf="compile->default"/> <dependency org="org.springframework" name="spring-core" rev="2.5.3" conf="compile->default"/>
<dependency org="org.springframework" name="spring-beans" rev="2.5.3" conf="compile->default"/>
<dependency org="org.springframework" name="spring-web" rev="2.5.3" conf="compile->default"/>
<dependency org="org.springframework" name="spring-webmvc" rev="2.5.3" conf="compile->default"/>
<!-- build time only dependencies --> <!-- build time only dependencies -->
<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="provided->default" /> <dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="provided->default" />
<dependency org="org.apache.tiles" name="tiles-api" rev="2.0.5" conf="provided->default"/>
<dependency org="org.apache.tiles" name="tiles-core" rev="2.0.5" conf="provided->default"/>
<dependency org="org.apache.tiles" name="tiles-jsp" rev="2.0.5" conf="provided->default"/>
<!-- test dependencies --> <!-- test dependencies -->
<dependency org="org.apache.logging" name="log4j" rev="1.2.15" conf="test->default" /> <dependency org="org.apache.logging" name="log4j" rev="1.2.15" conf="test->default" />

77
spring-js/src/main/java/org/springframework/js/ajax/view/TilesAjaxView.java Normal file
View File

@@ -0,0 +1,77 @@
package org.springframework.js.ajax.view;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.tiles.Attribute;
import org.apache.tiles.Definition;
import org.apache.tiles.Attribute.AttributeType;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.impl.BasicTilesContainer;
import org.springframework.js.mvc.servlet.AjaxHandler;
import org.springframework.js.mvc.servlet.SpringJavascriptAjaxHandler;
import org.springframework.web.servlet.support.JstlUtils;
import org.springframework.web.servlet.support.RequestContext;
import org.springframework.web.servlet.view.tiles2.TilesView;
public class TilesAjaxView extends TilesView {
public static final String FRAGMENTS_PARAM = "fragments";
private AjaxHandler ajaxHandler = new SpringJavascriptAjaxHandler();
protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response)
throws Exception {
ServletContext servletContext = getServletContext();
if (ajaxHandler.isAjaxRequest(servletContext, request, response)) {
BasicTilesContainer container = (BasicTilesContainer) TilesAccess.getContainer(servletContext);
if (container == null) {
throw new ServletException("Tiles container is not initialized. "
+ "Have you added a TilesConfigurer to your web application context?");
}
exposeModelAsRequestAttributes(model, request);
JstlUtils.exposeLocalizationContext(new RequestContext(request, servletContext));
TilesRequestContext tilesRequestContext = container.getContextFactory().createRequestContext(
container.getApplicationContext(), new Object[] { request, response });
Definition compositeDefinition = container.getDefinitionsFactory().getDefinition(getUrl(),
tilesRequestContext);
Map flattenedAttributeMap = new HashMap();
flattenAttributeMap(container, tilesRequestContext, flattenedAttributeMap, compositeDefinition);
String attrName = request.getParameter(FRAGMENTS_PARAM);
Attribute attributeToRender = (Attribute) flattenedAttributeMap.get(attrName);
container.render(attributeToRender, response.getWriter(), new Object[] { request, response });
} else {
super.renderMergedOutputModel(model, request, response);
}
}
private void flattenAttributeMap(BasicTilesContainer container, TilesRequestContext requestContext, Map resultMap,
Definition compositeDefinition) throws Exception {
Iterator i = compositeDefinition.getAttributes().keySet().iterator();
while (i.hasNext()) {
Object key = i.next();
Attribute attr = (Attribute) compositeDefinition.getAttributes().get(key);
if (attr.getType() == AttributeType.DEFINITION) {
Definition nestedDefinition = container.getDefinitionsFactory().getDefinition(
attr.getValue().toString(), requestContext);
flattenAttributeMap(container, requestContext, resultMap, nestedDefinition);
} else {
resultMap.put(key, attr);
}
}
}
}

2
spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/AjaxHandler.java → spring-js/src/main/java/org/springframework/js/mvc/servlet/AjaxHandler.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.webflow.mvc.servlet; package org.springframework.js.mvc.servlet;
import java.io.IOException; import java.io.IOException;

12
spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/SpringJavascriptAjaxHandler.java → spring-js/src/main/java/org/springframework/js/mvc/servlet/SpringJavascriptAjaxHandler.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.webflow.mvc.servlet; package org.springframework.js.mvc.servlet;
import java.io.IOException; import java.io.IOException;
@@ -34,22 +34,22 @@ public class SpringJavascriptAjaxHandler implements AjaxHandler {
/** /**
* The response header to be set on an Ajax redirect * The response header to be set on an Ajax redirect
*/ */
private static final String FLOW_REDIRECT_URL_HEADER = "Flow-Redirect-URL"; public static final String REDIRECT_URL_HEADER = "Spring-Redirect-URL";
/** /**
* The response header to be set on an redirect that should be issued from a popup window. * The response header to be set on an redirect that should be issued from a popup window.
*/ */
private static final String POPUP_VIEW_HEADER = "Flow-Modal-View"; public static final String POPUP_VIEW_HEADER = "Spring-Modal-View";
/** /**
* The accept header value that signifies an Ajax request. * The accept header value that signifies an Ajax request.
*/ */
private static final String AJAX_ACCEPT_CONTENT_TYPE = "text/html;type=ajax"; public static final String AJAX_ACCEPT_CONTENT_TYPE = "text/html;type=ajax";
/** /**
* Alternate request parameter to indicate an Ajax request for cases when control of the header is not available. * Alternate request parameter to indicate an Ajax request for cases when control of the header is not available.
*/ */
private static final String AJAX_SOURCE_PARAM = "ajaxSource"; public static final String AJAX_SOURCE_PARAM = "ajaxSource";
public boolean isAjaxRequest(ServletContext context, HttpServletRequest request, HttpServletResponse response) { public boolean isAjaxRequest(ServletContext context, HttpServletRequest request, HttpServletResponse response) {
String acceptHeader = request.getHeader("Accept"); String acceptHeader = request.getHeader("Accept");
@@ -66,7 +66,7 @@ public class SpringJavascriptAjaxHandler implements AjaxHandler {
if (popup) { if (popup) {
response.setHeader(POPUP_VIEW_HEADER, "true"); response.setHeader(POPUP_VIEW_HEADER, "true");
} }
response.setHeader(FLOW_REDIRECT_URL_HEADER, response.encodeRedirectURL(targetUrl)); response.setHeader(REDIRECT_URL_HEADER, response.encodeRedirectURL(targetUrl));
} }
} }

2
spring-js/src/main/resources/META-INF/spring/Spring-Dojo.js
View File

File diff suppressed because one or more lines are too long

212
spring-js/src/main/resources/META-INF/spring/Spring-Dojo.js.uncompressed
View File

@@ -13,88 +13,62 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
Spring.DojoValidatingFieldAdvisor = function(config){
dojo.declare("Spring.ElementDecoration", Spring.AbstractElementDecoration, {
dojo.mixin(this, config); constructor : function(config) {
}; this.copyFields = new Array('name', 'value', 'type', 'checked', 'selected', 'readOnly', 'disabled', 'alt', 'maxLength');
dojo.mixin(this, config);
Spring.DojoValidatingFieldAdvisor.prototype = { if(this.widgetModule == "") {
this.widgetModule = this.widgetType;
targetElId : "",
decoratorType : "",
decorator : null,
decoratorAttrs : "",
apply : function(){
if (dijit.byId(this.targetElId)) {
dijit.byId(this.targetElId).destroyRecursive(false);
} }
this.decorator = eval("new "+ this.decoratorType + "(" + this.decoratorAttrs +", dojo.byId('"+this.targetElId+"'));" ); },
this.decorator.startup();
apply : function(){
if (dijit.byId(this.elementId)) {
dijit.byId(this.elementId).destroyRecursive(false);
}
var element = dojo.byId(this.elementId);
for (var copyField in this.copyFields) {
copyField = this.copyFields[copyField];
if (!this.widgetAttrs[copyField] && element[copyField] && (typeof element[copyField] != 'number' ||
(typeof element[copyField] == 'number' && element[copyField] >= 0))) {
this.widgetAttrs[copyField] = element[copyField];
}
}
dojo.require(this.widgetModule);
var widgetConstructor = dojo.eval(this.widgetType);
this.widget = new widgetConstructor(this.widgetAttrs, element);
this.widget.startup();
//return this to support method chaining //return this to support method chaining
return this; return this;
}, },
validate : function(){ validate : function(){
var isValid = this.decorator.isValid(false); if (!this.widget.isValid) {
// some widgets cannot be validated
return true;
}
var isValid = this.widget.isValid(false);
if (!isValid) { if (!isValid) {
this.decorator.state = "Error"; this.widget.state = "Error";
this.decorator._setStateClass(); this.widget._setStateClass();
} }
return isValid; return isValid;
} }
}; });
Spring.ValidatingFieldAdvisor = Spring.DojoValidatingFieldAdvisor; dojo.declare("Spring.ValidateAllDecoration", Spring.AbstractValidateAllDecoration, {
constructor : function(config) {
Spring.DojoRemoteEventAdvisor = function(config){ this.originalHandler = null;
dojo.mixin(this, config); this.connection = null;
}; dojo.mixin(this, config);
Spring.DojoRemoteEventAdvisor.prototype = {
event : "",
targetId : "",
sourceId : "",
formId : "",
processIds : "",
renderIds : "",
params : [],
connection : null,
apply : function() {
this.connection = dojo.connect(dojo.byId(this.targetId), this.event, this, "submit");
return this;
}, },
cleanup : function(){
dojo.disconnect(this.connection);
},
submit : function(){
Spring.RemotingHandler.submitForm(this.sourceId, this.formId, this.processIds, this.renderIds, this.params);
}
};
Spring.RemoteEventAdvisor = Spring.DojoRemoteEventAdvisor;
Spring.DojoValidateAllAdvisor = function(config){
dojo.mixin(this, config);
};
Spring.DojoValidateAllAdvisor.prototype = {
event : "",
targetId : "",
originalHandler : null,
connection : null,
apply : function() { apply : function() {
var targetEl = dojo.byId(this.targetId); var element = dojo.byId(this.elementId);
this.originalHandler = targetEl[this.event]; this.originalHandler = element[this.event];
var context = this; var context = this;
targetEl[this.event] = function(event){ element[this.event] = function(event){
context.handleEvent(event, context); context.handleEvent(event, context);
}; };
return this; return this;
@@ -107,40 +81,65 @@ Spring.DojoValidateAllAdvisor.prototype = {
handleEvent : function(event, context){ handleEvent : function(event, context){
if (!Spring.validateAll()) { if (!Spring.validateAll()) {
dojo.stopEvent(event); dojo.stopEvent(event);
} else { } else if(dojo.isFunction(context.originalHandler)) {
var result = context.originalHandler(event); var result = context.originalHandler(event);
if (result == false) { if (result == false) {
dojo.stopEvent(event); dojo.stopEvent(event);
} }
} }
} }
}; });
Spring.ValidateAllAdvisor = Spring.DojoValidateAllAdvisor; dojo.declare("Spring.AjaxEventDecoration", Spring.AbstractAjaxEventDecoration, {
constructor : function(config){
Spring.DojoRemotingHandler = function(){}; this.connection = null;
dojo.mixin(this, config);
Spring.DojoRemotingHandler.prototype = { },
submitForm : function(/*String */ sourceId, /*String*/formId, /*String*/ processIds, /*String*/renderIds, /*Array*/ params) { apply : function() {
this.connection = dojo.connect(dojo.byId(this.elementId), this.event, this, "submit");
return this;
},
cleanup : function(){
dojo.disconnect(this.connection);
},
submit : function(event){
if (this.sourceId == ""){
this.sourceId = this.elementId;
}
if(this.formId == ""){
Spring.remoting.getLinkedResource(this.sourceId, this.params, false);
} else {
Spring.remoting.submitForm(this.sourceId, this.formId, this.params);
}
dojo.stopEvent(event);
}
});
dojo.declare("Spring.RemotingHandler", Spring.AbstractRemotingHandler, {
constructor : function(){},
submitForm : function(/*String */ sourceId, /*String*/formId, /*Object*/ params) {
var content = new Object(); var content = new Object();
for (var key in params) {
content[key] = params[key];
}
var sourceComponent = dojo.byId(sourceId); var sourceComponent = dojo.byId(sourceId);
content['processIds'] = processIds;
content['renderIds'] = renderIds;
if (sourceComponent != null){ if (sourceComponent != null){
if(sourceComponent.value) { if(sourceComponent.value != undefined) {
content[sourceId] = sourceComponent.value; content[sourceId] = sourceComponent.value;
} else { } else {
content[sourceId] = sourceId; content[sourceId] = sourceId;
} }
} }
dojo.forEach(params, function(param){ if (!content['ajaxSource']) {
content[param.name] = param.value; content['ajaxSource'] = sourceId;
}); }
content['ajaxSource'] = sourceId;
dojo.xhrPost({ dojo.xhrPost({
@@ -161,18 +160,22 @@ Spring.DojoRemotingHandler.prototype = {
}, },
getLinkedResource: function(/*String */ linkId, /*boolean*/ modal) { getLinkedResource: function(/*String */ linkId, /*Object*/params, /*boolean*/ modal) {
this.getResource(dojo.byId(linkId).href, modal); this.getResource(dojo.byId(linkId).href, params, modal);
}, },
getResource: function(/*String */ resourceUri, /*boolean*/ modal) { getResource: function(/*String */ resourceUri, /*Object*/params, /*boolean*/ modal) {
dojo.xhrGet({ dojo.xhrGet({
url: resourceUri, url: resourceUri,
content: params,
handleAs: "text", handleAs: "text",
headers: {"Accept" : "text/html;type=ajax"},
load: this.handleResponse, load: this.handleResponse,
error: this.handleError, error: this.handleError,
@@ -184,14 +187,14 @@ Spring.DojoRemotingHandler.prototype = {
handleResponse: function(response, ioArgs) { handleResponse: function(response, ioArgs) {
//First check if this response should redirect //First check if this response should redirect
var redirectURL = ioArgs.xhr.getResponseHeader('Flow-Redirect-URL'); var redirectURL = ioArgs.xhr.getResponseHeader('Spring-Redirect-URL');
var modalViewHeader = ioArgs.xhr.getResponseHeader('Flow-Modal-View'); var modalViewHeader = ioArgs.xhr.getResponseHeader('Spring-Modal-View');
var modalView = ((dojo.isString(modalViewHeader) && modalViewHeader.length > 0) || ioArgs.args.modal); var modalView = ((dojo.isString(modalViewHeader) && modalViewHeader.length > 0) || ioArgs.args.modal);
if (dojo.isString(redirectURL) && redirectURL.length > 0) { if (dojo.isString(redirectURL) && redirectURL.length > 0) {
if (modalView) { if (modalView) {
//render a popup with the new URL //render a popup with the new URL
Spring.RemotingHandler.renderURLToModalDialog(redirectURL, ioArgs); Spring.remoting.renderURLToModalDialog(redirectURL, ioArgs);
return response; return response;
} }
else { else {
@@ -229,7 +232,7 @@ Spring.DojoRemotingHandler.prototype = {
//For a modal view, just dump the new nodes into a modal dialog //For a modal view, just dump the new nodes into a modal dialog
if (modalView) { if (modalView) {
Spring.RemotingHandler.renderNodeListToModalDialog(newNodes); Spring.remoting.renderNodeListToModalDialog(newNodes);
} }
else { else {
@@ -258,7 +261,7 @@ Spring.DojoRemotingHandler.prototype = {
renderURLToModalDialog: function(url, ioArgs) { renderURLToModalDialog: function(url, ioArgs) {
url = url + "&"+dojo.objectToQuery(ioArgs.args.content); url = url + "&"+dojo.objectToQuery(ioArgs.args.content);
Spring.RemotingHandler.getResource(url, true); Spring.remoting.getResource(url, {}, true);
}, },
renderNodeListToModalDialog: function(nodes) { renderNodeListToModalDialog: function(nodes) {
@@ -271,28 +274,21 @@ Spring.DojoRemotingHandler.prototype = {
}); });
dialog.show(); dialog.show();
} }
}; });
Spring.RemotingHandler = new Spring.DojoRemotingHandler(); dojo.declare("Spring.CommandLinkDecoration", Spring.AbstractCommandLinkDecoration, {
constructor : function(config){
Spring.DojoCommandLinkAdvisor = function(config){ dojo.mixin(this, config);
dojo.mixin(this, config); },
};
Spring.DojoCommandLinkAdvisor.prototype = {
targetElId : "",
linkHtml : "",
apply : function(){ apply : function(){
var advisedNode = dojo.byId(this.targetElId); var advisedNode = dojo.byId(this.elementId);
if (!dojo.hasClass(advisedNode, "progressiveLink")) { if (!dojo.hasClass(advisedNode, "progressiveLink")) {
//Node must be replaced //Node must be replaced
var nodeToReplace = new dojo.NodeList(advisedNode); var nodeToReplace = new dojo.NodeList(advisedNode);
nodeToReplace.addContent(this.linkHtml, "after").orphan("*"); nodeToReplace.addContent(this.linkHtml, "after").orphan("*");
//Get the new node //Get the new node
advisedNode = dojo.byId(this.targetElId); advisedNode = dojo.byId(this.elementId);
} }
advisedNode.submitFormFromLink = this.submitFormFromLink; advisedNode.submitFormFromLink = this.submitFormFromLink;
//return this to support method chaining //return this to support method chaining
@@ -325,8 +321,6 @@ Spring.DojoCommandLinkAdvisor.prototype = {
}); });
} }
} }
}; });
Spring.CommandLinkAdvisor = Spring.DojoCommandLinkAdvisor; dojo.addOnLoad(Spring.initialize);
dojo.addOnLoad(Spring.applyAdvisors);

2
spring-js/src/main/resources/META-INF/spring/Spring.js
View File

@@ -13,4 +13,4 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
Spring={};Spring.advisors=[];Spring.advisors.applied=false;Spring.applyAdvisors=function(){if(!Spring.advisors.applied){for(var x=0;x<Spring.advisors.length;x++){Spring.advisors[x].apply();}Spring.advisors.applied=true;}};Spring.validateAll=function(){var _2=true;for(x in Spring.advisors){if(Spring.advisors[x].decorator&&!Spring.advisors[x].validate()){_2=false;}}return _2;};Spring.validateRequired=function(){var _3=true;for(x in Spring.advisors){if(Spring.advisors[x].decorator&&Spring.advisors[x].isRequired()&&!Spring.advisors[x].validate()){_3=false;}}return _3;};Spring.ValidatingFieldAdvisor=function(){};Spring.ValidatingFieldAdvisor.prototype={targetElId:"",decoratorType:"",decorator:null,decoratorAttrs:"",apply:function(){},validate:function(){},isRequired:function(){}};Spring.ValidateAllAdvisor=function(){};Spring.ValidateAllAdvisor.prototype={event:"",targetId:"",connection:null,apply:function(){},cleanup:function(){},handleEvent:function(_4){}};Spring.CommandLinkAdvisor=function(){};Spring.CommandLinkAdvisor.prototype={targetElId:"",linkHtml:"",apply:function(){},submitFormFromLink:function(_5,_6,_7){}};Spring.RemoteEventAdvisor=function(){};Spring.RemoteEventAdvisor.prototype={event:"",targetId:"",sourceId:"",formId:"",processIds:"",renderIds:"",params:[],connection:null,apply:function(){},cleanup:function(){},submit:function(_8){}};Spring.RemotingHandler=function(){};Spring.RemotingHandler.prototype={submitForm:function(_9,_a,_b,_c,_d){},getResource:function(_e,_f,_10){},handleResponse:function(){},handleError:function(){}}; Spring={};Spring.decorations=[];Spring.decorations.applied=false;Spring.initialize=function(){Spring.applyDecorations();Spring.remoting=new Spring.RemotingHandler();};Spring.addDecoration=function(_1){Spring.decorations.push(_1);if(Spring.decorations.applied){_1.apply();}};Spring.applyDecorations=function(){if(!Spring.decorations.applied){for(var x=0;x<Spring.decorations.length;x++){Spring.decorations[x].apply();}Spring.decorations.applied=true;}};Spring.validateAll=function(){var _3=true;for(x in Spring.decorations){if(Spring.decorations[x].widget&&!Spring.decorations[x].validate()){_3=false;}}return _3;};Spring.validateRequired=function(){var _4=true;for(x in Spring.decorations){if(Spring.decorations[x].decorator&&Spring.decorations[x].isRequired()&&!Spring.decorations[x].validate()){_4=false;}}return _4;};Spring.AbstractElementDecoration=function(){};Spring.AbstractElementDecoration.prototype={elementId:"",widgetType:"",widgetModule:"",widget:null,widgetAttrs:{},apply:function(){},validate:function(){},isRequired:function(){}};Spring.AbstractValidateAllDecoration=function(){};Spring.AbstractValidateAllDecoration.prototype={event:"",elementId:"",apply:function(){},cleanup:function(){},handleEvent:function(_5){}};Spring.AbstractCommandLinkDecoration=function(){};Spring.AbstractCommandLinkDecoration.prototype={elementId:"",linkHtml:"",apply:function(){},submitFormFromLink:function(_6,_7,_8){}};Spring.AbstractAjaxEventDecoration=function(){};Spring.AbstractAjaxEventDecoration.prototype={event:"",elementId:"",sourceId:"",formId:"",params:{},apply:function(){},cleanup:function(){},submit:function(_9){}};Spring.AbstractRemotingHandler=function(){};Spring.AbstractRemotingHandler.prototype={submitForm:function(_a,_b,_c){},getLinkedResource:function(_d,_e,_f){},getResource:function(_10,_11,_12){},handleResponse:function(){},handleError:function(){}};

87
spring-js/src/main/resources/META-INF/spring/Spring.js.uncompressed
View File

@@ -15,24 +15,36 @@
*/ */
Spring = {}; Spring = {};
Spring.advisors = []; Spring.decorations = [];
Spring.advisors.applied = false; Spring.decorations.applied = false;
Spring.initialize = function(){
Spring.applyDecorations();
Spring.remoting = new Spring.RemotingHandler();
};
Spring.addDecoration = function(/*Object*/decoration){
Spring.decorations.push(decoration);
if(Spring.decorations.applied) {
decoration.apply();
}
};
Spring.applyAdvisors = function(){ Spring.applyDecorations = function(){
if (!Spring.advisors.applied) { if (!Spring.decorations.applied) {
for (var x=0; x<Spring.advisors.length; x++) { for (var x=0; x<Spring.decorations.length; x++) {
Spring.advisors[x].apply(); Spring.decorations[x].apply();
} }
Spring.advisors.applied = true; Spring.decorations.applied = true;
} }
}; };
Spring.validateAll = function(){ Spring.validateAll = function(){
var valid = true; var valid = true;
for(x in Spring.advisors) { for(x in Spring.decorations) {
if (Spring.advisors[x].decorator && if (Spring.decorations[x].widget &&
!Spring.advisors[x].validate()) { !Spring.decorations[x].validate()) {
valid = false; valid = false;
} }
} }
@@ -41,23 +53,24 @@ Spring.validateAll = function(){
Spring.validateRequired = function(){ Spring.validateRequired = function(){
var valid = true; var valid = true;
for(x in Spring.advisors) { for(x in Spring.decorations) {
if(Spring.advisors[x].decorator && if(Spring.decorations[x].decorator &&
Spring.advisors[x].isRequired() && Spring.decorations[x].isRequired() &&
!Spring.advisors[x].validate()) !Spring.decorations[x].validate())
valid = false; valid = false;
} }
return valid; return valid;
}; };
Spring.ValidatingFieldAdvisor = function(){}; Spring.AbstractElementDecoration = function(){};
Spring.ValidatingFieldAdvisor.prototype = { Spring.AbstractElementDecoration.prototype = {
targetElId : "", elementId : "",
decoratorType : "", widgetType : "",
decorator : null, widgetModule : "",
decoratorAttrs : "", widget : null,
widgetAttrs : {},
apply : function(){}, apply : function(){},
@@ -66,13 +79,12 @@ Spring.ValidatingFieldAdvisor.prototype = {
isRequired : function(){} isRequired : function(){}
}; };
Spring.ValidateAllAdvisor = function(){}; Spring.AbstractValidateAllDecoration = function(){};
Spring.ValidateAllAdvisor.prototype = { Spring.AbstractValidateAllDecoration.prototype = {
event : "", event : "",
targetId : "", elementId : "",
connection : null,
apply : function() {}, apply : function() {},
@@ -81,11 +93,11 @@ Spring.ValidateAllAdvisor.prototype = {
handleEvent : function(event){} handleEvent : function(event){}
}; };
Spring.CommandLinkAdvisor = function(){}; Spring.AbstractCommandLinkDecoration = function(){};
Spring.CommandLinkAdvisor.prototype = { Spring.AbstractCommandLinkDecoration.prototype = {
targetElId : "", elementId : "",
linkHtml : "", linkHtml : "",
apply : function(){}, apply : function(){},
@@ -93,18 +105,15 @@ Spring.CommandLinkAdvisor.prototype = {
submitFormFromLink : function(/*String*/ formId, /*String*/ sourceId, /*Array of name,value params*/ params){} submitFormFromLink : function(/*String*/ formId, /*String*/ sourceId, /*Array of name,value params*/ params){}
}; };
Spring.RemoteEventAdvisor = function(){}; Spring.AbstractAjaxEventDecoration = function(){};
Spring.RemoteEventAdvisor.prototype = { Spring.AbstractAjaxEventDecoration.prototype = {
event : "", event : "",
targetId : "", elementId : "",
sourceId : "", sourceId : "",
formId : "", formId : "",
processIds : "", params : {},
renderIds : "",
params : [],
connection : null,
apply : function(){}, apply : function(){},
@@ -113,13 +122,15 @@ Spring.RemoteEventAdvisor.prototype = {
submit : function(event){} submit : function(event){}
}; };
Spring.RemotingHandler = function(){}; Spring.AbstractRemotingHandler = function(){};
Spring.RemotingHandler.prototype = { Spring.AbstractRemotingHandler.prototype = {
submitForm : function(/*String */ sourceId, /*String*/formId, /*String*/ processIds, /*String*/renderIds, /*Array*/ params){}, submitForm : function(/*String */ sourceId, /*String*/formId, /*Object*/ params){},
getResource : function(/*String */ sourceId, /*String*/ processIds, /*String*/renderIds) {}, getLinkedResource: function(/*String */ linkId, /*Object*/params, /*boolean*/ modal) {},
getResource : function(/*String */ resourceUri, /*Object*/params, /*boolean*/ modal) {},
handleResponse : function() {}, handleResponse : function() {},

9
spring-js/src/test/java/org/springframework/js/resource/ResourceServletTests.java
View File

@@ -8,7 +8,6 @@ import javax.servlet.ServletContext;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.springframework.js.resource.ResourceServlet;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletConfig; import org.springframework.mock.web.MockServletConfig;
@@ -60,6 +59,14 @@ public class ResourceServletTests extends TestCase {
assertEquals(404, response.getStatus()); assertEquals(404, response.getStatus());
} }
public final void testExecute_ProtectedPath() throws Exception {
String requestPath = "/WEB-INF/web.xml";
request.setPathInfo(requestPath);
servlet.doGet(request, response);
assertEquals(404, response.getStatus());
}
private class ResourceTestMockServletContext extends MockServletContext { private class ResourceTestMockServletContext extends MockServletContext {
public String getMimeType(String filePath) { public String getMimeType(String filePath) {

1
spring-webflow/.classpath
View File

@@ -39,5 +39,6 @@
<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-webmvc-portlet/spring-webmvc-portlet-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-webmvc-portlet/spring-webmvc-portlet-sources-2.5.3.jar"/> <classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-webmvc-portlet/spring-webmvc-portlet-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-webmvc-portlet/spring-webmvc-portlet-sources-2.5.3.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.springframework.security/spring-security-core/spring-security-core-2.0.0.m2.jar" sourcepath="IVY_CACHE/org.springframework.security/spring-security-core/spring-security-core-sources-2.0.0.m2.jar"/> <classpathentry kind="var" path="IVY_CACHE/org.springframework.security/spring-security-core/spring-security-core-2.0.0.m2.jar" sourcepath="IVY_CACHE/org.springframework.security/spring-security-core/spring-security-core-sources-2.0.0.m2.jar"/>
<classpathentry kind="var" path="IVY_CACHE/edu.emory.mathcs/backport-util-concurrent/backport-util-concurrent-3.0.0.jar"/> <classpathentry kind="var" path="IVY_CACHE/edu.emory.mathcs/backport-util-concurrent/backport-util-concurrent-3.0.0.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/spring-js"/>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

1
spring-webflow/ivy.xml
View File

@@ -28,6 +28,7 @@
<dependency org="org.springframework" name="spring-web" rev="2.5.3" conf="compile->default"/> <dependency org="org.springframework" name="spring-web" rev="2.5.3" conf="compile->default"/>
<dependency org="org.springframework" name="spring-webmvc" rev="2.5.3" conf="compile->default"/> <dependency org="org.springframework" name="spring-webmvc" rev="2.5.3" conf="compile->default"/>
<dependency org="org.springframework.webflow" name="spring-binding" rev="latest.integration" conf="compile->compile"/> <dependency org="org.springframework.webflow" name="spring-binding" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.springframework.webflow" name="spring-js" rev="latest.integration" conf="compile->compile"/>
<!-- testing support only dependencies --> <!-- testing support only dependencies -->
<dependency org="org.junit" name="junit" rev="3.8.2" conf="compile, test->default" /> <dependency org="org.junit" name="junit" rev="3.8.2" conf="compile, test->default" />

2
spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/FlowController.java
View File

@@ -25,6 +25,8 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.js.mvc.servlet.AjaxHandler;
import org.springframework.js.mvc.servlet.SpringJavascriptAjaxHandler;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.AbstractController; import org.springframework.web.servlet.mvc.AbstractController;
import org.springframework.web.servlet.view.RedirectView; import org.springframework.web.servlet.view.RedirectView;

2
spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/FlowHandlerAdapter.java
View File

@@ -24,6 +24,8 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.js.mvc.servlet.AjaxHandler;
import org.springframework.js.mvc.servlet.SpringJavascriptAjaxHandler;
import org.springframework.web.context.support.WebApplicationObjectSupport; import org.springframework.web.context.support.WebApplicationObjectSupport;
import org.springframework.web.servlet.HandlerAdapter; import org.springframework.web.servlet.HandlerAdapter;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;

1
spring-webflow/src/test/java/org/springframework/webflow/mvc/servlet/FlowControllerTests.java
View File

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletResponse;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.easymock.EasyMock; import org.easymock.EasyMock;
import org.springframework.js.mvc.servlet.SpringJavascriptAjaxHandler;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletContext; import org.springframework.mock.web.MockServletContext;