Menu
▾
▴
andromdaplugins-cvs
|
From: Leif J. <le...@us...> - 2007-06-10 20:11:37
|
User: leifj
Date: 07/06/10 13:11:40
Modified: andromda-jsf2/src/main/resources/templates/jsf2/flow
ActionForward.java.vsl
Log:
pass initial request parameters through
Revision Changes Path
1.2 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/ActionForward.java.vsl
Index: ActionForward.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/ActionForward.java.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- ActionForward.java.vsl 5 Dec 2006 19:39:29 -0000 1.1
+++ ActionForward.java.vsl 10 Jun 2007 20:11:40 -0000 1.2
@@ -48,7 +48,7 @@
#end
#if (!$useCase.allForwards.empty)
String forwardPath = ${managedBeansPackage}.UseCaseForwards.getPath(controller.${action.controllerAction}());
- response.sendRedirect(request.getContextPath() + forwardPath);
+ response.sendRedirect(request.getContextPath() + forwardPath + (request.getQueryString() != null ? "?"+request.getQueryString() : ""));
#else
controller.${action.controllerAction}();
#end
|
|
From: Chad B. <cwb...@us...> - 2007-08-31 16:20:33
|
User: cwbrandon
Date: 07/08/31 09:20:34
Modified: andromda-jsf2/src/main/resources/templates/jsf2/utils
FacesContextUtils.java.vsl
andromda-jsf2/src/main/resources/templates/jsf2/flow
ActionForward.java.vsl
Log:
minor cleanup and fixes
Revision Changes Path
1.2 +11 -16 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/FacesContextUtils.java.vsl
Index: FacesContextUtils.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/FacesContextUtils.java.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- FacesContextUtils.java.vsl 5 Dec 2006 19:39:21 -0000 1.1
+++ FacesContextUtils.java.vsl 31 Aug 2007 16:20:33 -0000 1.2
@@ -12,6 +12,7 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
/**
* Contains utilities for dealing with the FacesContext.
@@ -21,23 +22,17 @@
public class $className
{
/**
- * Retrieves the current faces context given the <code>servletContext</code>, <code>request</code>,
+ * Retrieves the current faces context given the <code>request</code>,
* and <code>response</code>.
*
- * @param servletContext the servlet context.
* @param request the ServletRequest instance.
* @param response the ServletResponse instance
* @return the current faces context.
*/
public static FacesContext getFacesContext(
- final ServletContext servletContext,
final ServletRequest request,
final ServletResponse response)
{
- if (servletContext == null)
- {
- throw new IllegalArgumentException("'servletContext' can not be null");
- }
if (request == null)
{
throw new IllegalArgumentException("'request' can not be null");
@@ -46,6 +41,8 @@
{
throw new IllegalArgumentException("'response' can not be null");
}
+ final HttpServletRequest httpRequest = (HttpServletRequest)request;
+ final ServletContext servletContext = httpRequest.getSession().getServletContext();
final LifecycleFactory lifecycleFactory =
(LifecycleFactory)FactoryFinder.getFactory(FactoryFinder.LIFECYCLE_FACTORY);
final Lifecycle lifecycle = lifecycleFactory.getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE);
@@ -65,20 +62,18 @@
/**
* Attempts to resolve the variable having the given <code>name</code> from the given
- * <code>servletContext</code>, <code>request</code>, and <code>response</code>
- * @param servletContext the servlet context.
+ * <code>request</code>, and <code>response</code>
* @param request the ServletRequest instance.
* @param response the ServletResponse instance
* @param name the name of the variable to resolve.
* @return
*/
public static Object resolveVariable(
- final ServletContext servletContext,
final ServletRequest request,
final ServletResponse response,
final String name)
{
- final FacesContext facesContext = getFacesContext(servletContext,request,response);
+ final FacesContext facesContext = getFacesContext(request, response);
final javax.faces.el.VariableResolver variableResolver = facesContext.getApplication().getVariableResolver();
return variableResolver.resolveVariable(
facesContext,
1.4 +6 -6 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/ActionForward.java.vsl
Index: ActionForward.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/ActionForward.java.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- ActionForward.java.vsl 31 Aug 2007 15:32:51 -0000 1.3
+++ ActionForward.java.vsl 31 Aug 2007 16:20:34 -0000 1.4
@@ -33,19 +33,19 @@
#set ($controller = $action.controller)
$controller.fullyQualifiedName controller =
($controller.fullyQualifiedName)${facesContextUtilsFullyQualifiedName}.resolveVariable(
- this.getServletContext(), request, response,
+ request, response,
"$controller.beanName");
#if ($action.useCase)
#set ($useCase = $action.useCase)
#else
#set ($useCase = $action)
#end
-#if (!$useCase.allForwards.empty)
+##if (!$useCase.allForwards.empty)
String forwardPath = ${managedBeansPackage}.UseCaseForwards.getPath(controller.${action.controllerAction}());
response.sendRedirect(request.getContextPath() + forwardPath + (request.getQueryString() != null ? "?"+request.getQueryString() : ""));
-#else
- controller.${action.controllerAction}();
-#end
+##else
+ ## controller.${action.controllerAction}();
+##end
}
/**
|
|
From: Chad B. <cwb...@us...> - 2007-08-31 16:21:11
|
User: cwbrandon
Date: 07/08/31 09:21:13
Modified: andromda-jsf2/src/main/resources/templates/jsf2/flow
ActionForward.java.vsl
Log:
remove some unused code
Revision Changes Path
1.5 +0 -4 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/ActionForward.java.vsl
Index: ActionForward.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/ActionForward.java.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- ActionForward.java.vsl 31 Aug 2007 16:20:34 -0000 1.4
+++ ActionForward.java.vsl 31 Aug 2007 16:21:13 -0000 1.5
@@ -40,12 +40,8 @@
#else
#set ($useCase = $action)
#end
-##if (!$useCase.allForwards.empty)
String forwardPath = ${managedBeansPackage}.UseCaseForwards.getPath(controller.${action.controllerAction}());
response.sendRedirect(request.getContextPath() + forwardPath + (request.getQueryString() != null ? "?" + request.getQueryString() : ""));
-##else
- ## controller.${action.controllerAction}();
-##end
}
/**
|
|
From: Chad B. <cwb...@us...> - 2007-08-31 16:21:44
|
User: cwbrandon
Date: 07/08/31 09:21:43
Modified: andromda-jsf2/src/main/resources/templates/jsf2/flow
ActionForward.java.vsl
Log:
minor improvement
Revision Changes Path
1.6 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/ActionForward.java.vsl
Index: ActionForward.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/ActionForward.java.vsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- ActionForward.java.vsl 31 Aug 2007 16:21:13 -0000 1.5
+++ ActionForward.java.vsl 31 Aug 2007 16:21:43 -0000 1.6
@@ -40,7 +40,7 @@
#else
#set ($useCase = $action)
#end
- String forwardPath = ${managedBeansPackage}.UseCaseForwards.getPath(controller.${action.controllerAction}());
+ final String forwardPath = ${managedBeansPackage}.UseCaseForwards.getPath(controller.${action.controllerAction}());
response.sendRedirect(request.getContextPath() + forwardPath + (request.getQueryString() != null ? "?" + request.getQueryString() : ""));
}
|
|
From: Chad B. <cwb...@us...> - 2007-08-31 16:35:21
|
User: cwbrandon
Date: 07/08/31 08:32:51
Modified: andromda-jsf2/src/main/resources/templates/jsf2/controllers
Controller.java.vsl
andromda-jsf2/src/main/resources/templates/jsf2/flow
ActionForward.java.vsl
Log:
imports and unused code cleanup
Revision Changes Path
1.3 +16 -16 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/Controller.java.vsl
Index: Controller.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/Controller.java.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- Controller.java.vsl 10 Jun 2007 20:27:17 -0000 1.2
+++ Controller.java.vsl 31 Aug 2007 15:32:51 -0000 1.3
@@ -408,7 +408,7 @@
{
for (final java.util.Iterator iterator = component.getFacetsAndChildren(); iterator.hasNext();)
{
- final Object object = (javax.faces.component.UIComponent)iterator.next();
+ final Object object = iterator.next();
if (object instanceof javax.faces.component.UIComponent)
{
final javax.faces.component.UIComponent uiComponent = (javax.faces.component.UIComponent)object;
1.3 +0 -6 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/ActionForward.java.vsl
Index: ActionForward.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/ActionForward.java.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ActionForward.java.vsl 10 Jun 2007 20:11:40 -0000 1.2
+++ ActionForward.java.vsl 31 Aug 2007 15:32:51 -0000 1.3
@@ -4,12 +4,6 @@
import java.io.IOException;
-import javax.faces.FactoryFinder;
-import javax.faces.context.FacesContext;
-import javax.faces.context.FacesContextFactory;
-import javax.faces.lifecycle.Lifecycle;
-import javax.faces.lifecycle.LifecycleFactory;
-
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X