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

compilation failure fix due to build metadata changes

Browse Source
This commit is contained in:
Keith Donald
2008-04-29 02:58:27 +00:00
parent b13f2895a7
commit 7b5d9d05f5
7 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-js/src/main/java/org/springframework/js/ajax/AjaxHandler.java
View File

@@ -17,7 +17,6 @@ package org.springframework.js.ajax;
import java.io.IOException;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -32,16 +31,18 @@ public interface AjaxHandler {
/**
* Is the current request an Ajax request?
* @param request the current request
* @param response the current response
*/
public boolean isAjaxRequest(ServletContext context, HttpServletRequest request, HttpServletResponse response);
public boolean isAjaxRequest(HttpServletRequest request, HttpServletResponse response);
/**
* Send a redirect request to the Ajax client. This should cause the client-side agent to send a new request to the
* specified target url.
* @param response the response object
* @param request the current request
* @param response the current response
* @param targetUrl the target url to redirect to
* @param popup wheter the redirect should be sent from a new popup dialog window
*/
public void sendAjaxRedirect(ServletContext context, HttpServletRequest request, HttpServletResponse response,
String targetUrl, boolean popup) throws IOException;
public void sendAjaxRedirect(String targetUrl, HttpServletRequest request, HttpServletResponse response,
boolean popup) throws IOException;
}

7
spring-js/src/main/java/org/springframework/js/ajax/AjaxUrlBasedViewResolver.java
View File

@@ -18,12 +18,10 @@ package org.springframework.js.ajax;
import java.io.IOException;
import java.util.Locale;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.web.servlet.View;
import org.springframework.web.servlet.support.RequestContextUtils;
import org.springframework.web.servlet.view.RedirectView;
import org.springframework.web.servlet.view.UrlBasedViewResolver;
@@ -64,9 +62,8 @@ public class AjaxUrlBasedViewResolver extends UrlBasedViewResolver {
protected void sendRedirect(HttpServletRequest request, HttpServletResponse response, String targetUrl,
boolean http10Compatible) throws IOException {
ServletContext context = RequestContextUtils.getWebApplicationContext(request).getServletContext();
if (ajaxHandler.isAjaxRequest(context, request, response)) {
ajaxHandler.sendAjaxRedirect(context, request, response, targetUrl, false);
if (ajaxHandler.isAjaxRequest(request, response)) {
ajaxHandler.sendAjaxRedirect(targetUrl, request, response, false);
} else {
super.sendRedirect(request, response, targetUrl, http10Compatible);
}

7
spring-js/src/main/java/org/springframework/js/ajax/SpringJavascriptAjaxHandler.java
View File

@@ -17,7 +17,6 @@ package org.springframework.js.ajax;
import java.io.IOException;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -51,7 +50,7 @@ public class SpringJavascriptAjaxHandler implements AjaxHandler {
*/
public static final String AJAX_SOURCE_PARAM = "ajaxSource";
public boolean isAjaxRequest(ServletContext context, HttpServletRequest request, HttpServletResponse response) {
public boolean isAjaxRequest(HttpServletRequest request, HttpServletResponse response) {
String acceptHeader = request.getHeader("Accept");
String ajaxParam = request.getParameter(AJAX_SOURCE_PARAM);
if (AJAX_ACCEPT_CONTENT_TYPE.equals(acceptHeader) || StringUtils.hasText(ajaxParam)) {
@@ -61,8 +60,8 @@ public class SpringJavascriptAjaxHandler implements AjaxHandler {
}
}
public void sendAjaxRedirect(ServletContext context, HttpServletRequest request, HttpServletResponse response,
String targetUrl, boolean popup) throws IOException {
public void sendAjaxRedirect(String targetUrl, HttpServletRequest request, HttpServletResponse response,
boolean popup) throws IOException {
if (popup) {
response.setHeader(POPUP_VIEW_HEADER, "true");
}

19
spring-js/src/main/java/org/springframework/js/ajax/tiles2/AjaxTilesView.java
View File

@@ -54,11 +54,19 @@ public class AjaxTilesView extends TilesView {
private AjaxHandler ajaxHandler = new SpringJavascriptAjaxHandler();
public AjaxHandler getAjaxHandler() {
return ajaxHandler;
}
public void setAjaxHandler(AjaxHandler ajaxHandler) {
this.ajaxHandler = ajaxHandler;
}
protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response)
throws Exception {
ServletContext servletContext = getServletContext();
if (ajaxHandler.isAjaxRequest(servletContext, request, response)) {
if (ajaxHandler.isAjaxRequest(request, response)) {
BasicTilesContainer container = (BasicTilesContainer) TilesAccess.getContainer(servletContext);
if (container == null) {
throw new ServletException("Tiles container is not initialized. "
@@ -106,13 +114,4 @@ public class AjaxTilesView extends TilesView {
}
}
}
public AjaxHandler getAjaxHandler() {
return ajaxHandler;
}
public void setAjaxHandler(AjaxHandler ajaxHandler) {
this.ajaxHandler = ajaxHandler;
}
}

2
spring-webflow/.classpath
View File

@@ -44,5 +44,7 @@
<classpathentry kind="var" path="IVY_CACHE/org.apache.openjpa/com.springsource.org.apache.openjpa.lib/1.0.2/com.springsource.org.apache.openjpa.lib-1.0.2.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.apache.openjpa/com.springsource.org.apache.openjpa.persistence/1.0.2/com.springsource.org.apache.openjpa.persistence-1.0.2.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.apache.openjpa/com.springsource.org.apache.openjpa.persistence.jdbc/1.0.2/com.springsource.org.apache.openjpa.persistence.jdbc-1.0.2.jar"/>
<classpathentry kind="var" path="IVY_CACHE/javax.transaction/com.springsource.javax.transaction/1.1.0/com.springsource.javax.transaction-1.1.0.jar" sourcepath="/IVY_CACHE/javax.transaction/com.springsource.javax.transaction/1.1.0/com.springsource.javax.transaction-sources-1.1.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.apache.openjpa/com.springsource.org.apache.openjpa.lib.java5/1.0.2/com.springsource.org.apache.openjpa.lib.java5-1.0.2.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

2
spring-webflow/ivy.xml
View File

@@ -25,6 +25,7 @@
<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="provided->compile" />
<dependency org="javax.portlet" name="com.springsource.javax.portlet" rev="1.0.0" conf="provided->compile" />
<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" conf="provided->compile" />
<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->compile"/>
<dependency org="edu.emory.mathcs.backport" name="com.springsource.edu.emory.mathcs.backport" rev="3.0.0" conf="optional->compile" />
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.2.6.ga" conf="optional, test->compile" />
@@ -45,6 +46,7 @@
<!-- test time only dependencies -->
<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->compile" />
<dependency org="org.apache.openjpa" name="com.springsource.org.apache.openjpa.java5" rev="1.0.2" conf="test->compile"/>
<dependency org="org.apache.openjpa" name="com.springsource.org.apache.openjpa.lib.java5" rev="1.0.2" conf="test->compile"/>
<dependency org="org.apache.openjpa" name="com.springsource.org.apache.openjpa.persistence" rev="1.0.2" conf="test->compile"/>
<dependency org="org.apache.openjpa" name="com.springsource.org.apache.openjpa.persistence.jdbc" rev="1.0.2" conf="test->compile"/>
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.3.0" conf="test->compile" />

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

@@ -182,7 +182,7 @@ public class FlowHandlerAdapter extends WebContentGenerator implements HandlerAd
protected ServletExternalContext createServletExternalContext(HttpServletRequest request,
HttpServletResponse response) {
ServletExternalContext context = new MvcExternalContext(getServletContext(), request, response, flowUrlHandler);
context.setAjaxRequest(ajaxHandler.isAjaxRequest(getServletContext(), request, response));
context.setAjaxRequest(ajaxHandler.isAjaxRequest(request, response));
return context;
}
@@ -305,7 +305,7 @@ public class FlowHandlerAdapter extends WebContentGenerator implements HandlerAd
logger.debug("Sending flow execution redirect to '" + url + "'");
}
if (context.isAjaxRequest()) {
ajaxHandler.sendAjaxRedirect(getServletContext(), request, response, url, context.getRedirectInPopup());
ajaxHandler.sendAjaxRedirect(url, request, response, context.getRedirectInPopup());
} else {
sendRedirect(url, request, response);
}
@@ -366,8 +366,8 @@ public class FlowHandlerAdapter extends WebContentGenerator implements HandlerAd
}
private void sendRedirect(String url, HttpServletRequest request, HttpServletResponse response) throws IOException {
if (ajaxHandler.isAjaxRequest(getServletContext(), request, response)) {
ajaxHandler.sendAjaxRedirect(getServletContext(), request, response, url, false);
if (ajaxHandler.isAjaxRequest(request, response)) {
ajaxHandler.sendAjaxRedirect(url, request, response, false);
} else {
response.sendRedirect(response.encodeRedirectURL(url));
}