lipog-commit Mailing List for Little Portal Gizmo (Page 9)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	ApplicationRequestHandler.java 
Log Message:
custom login/logout page improvements

Index: ApplicationRequestHandler.java
===================================================================
RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/application/ApplicationRequestHandler.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ApplicationRequestHandler.java	3 Jul 2009 21:02:07 -0000	1.21
--- ApplicationRequestHandler.java	4 Jul 2009 15:38:58 -0000	1.22
***************
*** 32,36 ****
  import net.heilancoo.portal.htmlforms.FormFieldContainer;
  import net.heilancoo.portal.htmlforms.FormFieldDecoder;
- import net.heilancoo.portal.requests.FileRequestHandler;
  import net.heilancoo.portal.responders.FileResponder;
  import net.heilancoo.portal.responders.Responder;
--- 32,35 ----
***************
*** 68,75 ****
  	private String description;
  	private Application application;
! 	private String templateFolder;
! 	private File loginPage;
! 	private File logoutPage;
! 	private File loginFailedPage;
  	private String uriPrefix;
  	private ApplicationParameters parameters;
--- 67,71 ----
  	private String description;
  	private Application application;
! 	private FileResponder loginFailedResponder;
  	private String uriPrefix;
  	private ApplicationParameters parameters;
***************
*** 153,179 ****
  	}

- 	private boolean initialiseTemplateFolder(Bundle bundle) {
- 		String templateFldr =  ResponseHelper.getTemplateFolder(application.getClass());
- 		File     bundleFldr = new File(Utils.makePathFor(bundle, "."));
- 		File              f = new File(bundleFldr, templateFldr);
- 		
- 		templateFolder = null;
- 
- 		if(f.exists()) {
- 			try {
- 				templateFolder = f.getCanonicalPath();
- 			}
- 			catch (IOException e) {
- 				logger.error("Failed to resolve path " + f.getAbsolutePath() + ".");
- 				return false;
- 			}
- 		}
- 		
- 		logger.info("Application " + application.getClass().getCanonicalName()
- 				+ "; template folder " + templateFolder);
- 		
- 		return true;
- 	}
- 	
  	public boolean initialise(Bundle bundle, Application application, String uriPrefix, String name, String description,
  			String mimeConfig, String configFile) {
--- 149,152 ----
***************
*** 187,193 ****
  		this.application = application;

- 		if(!initialiseTemplateFolder(bundle))
- 			stateOk = false;
- 
  		if(configFile != null)
  			stateOk = initialiseConfigFile(bundle, configFile);
--- 160,163 ----
***************
*** 238,242 ****
  		controllerManagerMap.put(appClass, tm);

! 		tm.addResponder(tm.getEntryPoint(), new FileResponder(getLoginPage(), mimeMapper, false));
  		tm.addResponder("login-validate", new Responder() {
  			@Override
--- 208,214 ----
  		controllerManagerMap.put(appClass, tm);

! 		loginFailedResponder = new FileResponder(getApplicationFile("login-failed.html", bundle, appClass), mimeMapper, false);
! 		
! 		tm.addResponder(tm.getEntryPoint(), new FileResponder(getApplicationFile("login.html", bundle, appClass), mimeMapper, false));
  		tm.addResponder("login-validate", new Responder() {
  			@Override
***************
*** 258,262 ****
  		controllerManagerMap.put(sessionClass, tm);

! 		tm.addResponder(tm.getExitPoint(), new FileResponder(getLogoutPage(), mimeMapper, false));

  		tm.initialise();
--- 230,234 ----
  		controllerManagerMap.put(sessionClass, tm);

! 		tm.addResponder(tm.getExitPoint(), new FileResponder(getApplicationFile("logout.html", bundle, sessionClass), mimeMapper, false));

  		tm.initialise();
***************
*** 409,413 ****
  	}

! 	private File getApplicationFile(String fileName) {
  		File f = null;

--- 381,405 ----
  	}

! 	private String getTemplateFolder(Bundle bundle, Class<?> controllerClass) {
! 		String templateFldr =  ResponseHelper.getTemplateFolder(controllerClass);
! 		File     bundleFldr = new File(Utils.makePathFor(bundle, "."));
! 		File              f = new File(bundleFldr, templateFldr);
! 		String templateFolder = null;
! 
! 		if(f.exists()) {
! 			try {
! 				templateFolder = f.getCanonicalPath();
! 			}
! 			catch (IOException e) {
! 				logger.error("Failed to resolve path " + f.getAbsolutePath() + ".");
! 				return null;
! 			}
! 		}
! 		
! 		return templateFolder;
! 	}
! 	
! 	private File getApplicationFile(String fileName, Bundle bundle, Class<?> controllerClass) {
! 		String templateFolder = getTemplateFolder(bundle, controllerClass);
  		File f = null;

***************
*** 418,448 ****
  			f = new File(Utils.makePathFor(PortalPlugin.getDefault(), "statics/" + fileName));

! 		logger.info("Application " + application.getClass().getCanonicalName()
! 				+ "; " + f);

  		return f;
  	}
- 	
- 	protected File getLoginPage() {
- 		if(loginPage == null)
- 			loginPage = getApplicationFile("login.html");
- 		
- 		return loginPage;
- 	}
- 	
- 	protected File getLogoutPage() {
- 		if(logoutPage == null)
- 			logoutPage = getApplicationFile("logout.html");
- 		
- 		return logoutPage;
- 	}
- 	
- 	protected File getLoginFailedPage() {
- 		if(loginFailedPage == null)
- 			loginFailedPage = getApplicationFile("login-failed.html");

- 		return loginFailedPage;
- 	}
- 	
  	private ControllerManager getTargetManager(Controller target, HttpResponse response) {
  		Class<?>    tgtClass = target.getClass();
--- 410,419 ----
  			f = new File(Utils.makePathFor(PortalPlugin.getDefault(), "statics/" + fileName));

! 		logger.info("File " + fileName + " for "+ controllerClass.getCanonicalName()
! 				+ ": " + f);

  		return f;
  	}

  	private ControllerManager getTargetManager(Controller target, HttpResponse response) {
  		Class<?>    tgtClass = target.getClass();
***************
*** 467,476 ****

  		if(user == null)
! 			FileRequestHandler.serveFile(getLoginFailedPage(), request, response, context, mimeMapper, false);
  		else {
  			Session session = application.validateCredentialsAndMakeNewSession(fields);

  			if(session == null)
! 				FileRequestHandler.serveFile(getLoginFailedPage(), request, response, context, mimeMapper, false);
  			else {
  				SessionManager    sm = sessionManagerMap.get(session.getClass());
--- 438,447 ----

  		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());

2009	Jan	Feb	Mar	Apr	May (94)	Jun (14)	Jul (168)	Aug (39)	Sep	Oct	Nov	Dec
2011	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (6)	Dec

lipog-commit Mailing List for Little Portal Gizmo (Page 9)

lipog-commit — Little Portal Gizmo Commits