lipog-commit

[Joerg B. <jb...@us...>]

Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/application
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11834/src/net/heilancoo/portal/application

Modified Files:
	ApplicationRequestHandler.java 
Log Message:
support request methods with more flexible parameter lists

Index: ApplicationRequestHandler.java
===================================================================
RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/application/ApplicationRequestHandler.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** ApplicationRequestHandler.java	26 Jul 2009 15:27:33 -0000	1.31
--- ApplicationRequestHandler.java	13 Aug 2009 22:35:34 -0000	1.32
***************
*** 234,239 ****
  			public Object execute(Controller target, String format,
  					HttpRequest request, FormFieldContainer fields,
! 					HttpResponse response, HttpContext context) throws Exception {
! 				doLogin(request.getRequestLine().getUri(), request, fields, response, context);
  				return null;
  			}
--- 234,239 ----
  			public Object execute(Controller target, String format,
  					HttpRequest request, FormFieldContainer fields,
! 					HttpResponse response) throws Exception {
! 				doLogin(request.getRequestLine().getUri(), request, fields, response);
  				return null;
  			}
***************
*** 323,327 ****
  			logger.info("Method " + method + ", application " + getUriPrefix());
  
! 			Object redirect = g.execute(application, presentation, request, fields, response, context);
  		
  			if(redirect != null) {
--- 323,327 ----
  			logger.info("Method " + method + ", application " + getUriPrefix());
  
! 			Object redirect = g.execute(application, presentation, request, fields, response);
  		
  			if(redirect != null) {
***************
*** 370,374 ****
  					+ ", session " + targetKey);
  
! 			Object redirect = g.execute(target, presentation, request, fields, response, context);
  
  			String keyAndMethod = controllerKey.length() == 0 ? method : (controllerKey + "/" + method);
--- 370,374 ----
  					+ ", session " + targetKey);
  
! 			Object redirect = g.execute(target, presentation, request, fields, response);
  
  			String keyAndMethod = controllerKey.length() == 0 ? method : (controllerKey + "/" + method);
***************
*** 482,486 ****
  	
  	private void doLogin(String uri, HttpRequest request, FormFieldContainer fields,
! 			HttpResponse response, HttpContext context) throws FormFieldAccessException {
  		String user = fields.getStringValue("user");
  		
--- 482,486 ----
  	
  	private void doLogin(String uri, HttpRequest request, FormFieldContainer fields,
! 			HttpResponse response) throws FormFieldAccessException {
  		String user = fields.getStringValue("user");
  		
***************
*** 488,497 ****
  
  		if(user == null)
! 			loginFailedResponder.execute(null, null, request, fields, response, context);
  		else {
  			Session session = application.validateCredentialsAndMakeNewSession(fields);
  
  			if(session == null)
! 				loginFailedResponder.execute(null, null, request, fields, response, context);
  			else {
  				SessionManager    sm = sessionManagerMap.get(session.getClass());
--- 488,497 ----
  
  		if(user == null)
! 			loginFailedResponder.execute(null, null, request, fields, response);
  		else {
  			Session session = application.validateCredentialsAndMakeNewSession(fields);
  
  			if(session == null)
! 				loginFailedResponder.execute(null, null, request, fields, response);
  			else {
  				SessionManager    sm = sessionManagerMap.get(session.getClass());