lipog-commit Mailing List for Little Portal Gizmo (Page 8)
Status: Beta
Brought to you by:
jbu
Menu
▾
▴
lipog-commit — Little Portal Gizmo Commits
You can subscribe to this list here.
| 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
|
|
From: Joerg B. <jb...@us...> - 2009-07-06 19:50:59
|
Update of /cvsroot/lipog/net.heilancoo.portal.test/tmpl/sub-a In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4075/tmpl/sub-a Log Message: Directory /cvsroot/lipog/net.heilancoo.portal.test/tmpl/sub-a added to the repository |
|
From: Joerg B. <jb...@us...> - 2009-07-06 19:50:47
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/session In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3972/src/net/heilancoo/portal/session Modified Files: SessionManager.java Log Message: fix exit point initialiser Index: SessionManager.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/session/SessionManager.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SessionManager.java 6 Jul 2009 19:06:04 -0000 1.3 --- SessionManager.java 6 Jul 2009 19:50:37 -0000 1.4 *************** *** 94,101 **** ControllerManager m = controllerManagers.get(controllerIndices.get(key)); ! if(isExit && m.getResponder(exitPoint) == null) { logger.debug("Adding default responder for exit point '" + exitPoint + "' for controller " + m.getTargetClass().getCanonicalName() + "."); ! m.addResponder(exitPoint, defaultLogoutResponder); } --- 94,101 ---- ControllerManager m = controllerManagers.get(controllerIndices.get(key)); ! if(isExit && m.getResponder(point) == null) { logger.debug("Adding default responder for exit point '" + exitPoint + "' for controller " + m.getTargetClass().getCanonicalName() + "."); ! m.addResponder(point, defaultLogoutResponder); } |
|
From: Joerg B. <jb...@us...> - 2009-07-06 19:06:41
|
Update of /cvsroot/lipog/net.heilancoo.portal.examples/templates In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24638/templates Added Files: logout.html Log Message: tidied up entry/exit point handling --- NEW FILE: logout.html --- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Multi Controller Logout</title> </head> <body> <h1>Multi Controller Logout</h1> <p>You have been logged out now.</p> <p>Thank you and good bye!</p> </body> </html> |
|
From: Joerg B. <jb...@us...> - 2009-07-06 19:06:34
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/application In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24568/src/net/heilancoo/portal/application Modified Files: ApplicationRequestHandler.java Log Message: tidied up entry/exit point handling Index: ApplicationRequestHandler.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/application/ApplicationRequestHandler.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** ApplicationRequestHandler.java 6 Jul 2009 16:38:13 -0000 1.23 --- ApplicationRequestHandler.java 6 Jul 2009 19:06:04 -0000 1.24 *************** *** 179,183 **** Class<?> [] sessionClasses = ss == null ? null : ss.value(); ! if(sessionClasses == null) logger.warn("No sessions configured for web application '" + uriPrefix + "'."); else { --- 179,186 ---- Class<?> [] sessionClasses = ss == null ? null : ss.value(); ! FileResponder defaultLogout = new FileResponder(getApplicationFile("logout.html", bundle, ! application.getClass()), mimeMapper, false); ! ! if(sessionClasses == null) logger.warn("No sessions configured for web application '" + uriPrefix + "'."); else { *************** *** 194,198 **** stateOk = false; ! SessionManager m = new SessionManager(sessionClass, controllerManagerMap); sessionManagerMap.put(sessionClass, m); } --- 197,205 ---- stateOk = false; ! SessionManager m = new SessionManager(sessionClass, controllerManagerMap, "main", "logout", defaultLogout); ! ! if(!m.isInitOk()) ! stateOk = false; ! sessionManagerMap.put(sessionClass, m); } *************** *** 204,208 **** private boolean initialiseApplication(Bundle bundle) { Class<?> appClass = application.getClass(); ! ControllerManager tm = new ControllerManager(appClass, "application", "login", null, mimeMapper, bundle); controllerManagerMap.put(appClass, tm); --- 211,215 ---- private boolean initialiseApplication(Bundle bundle) { Class<?> appClass = application.getClass(); ! ControllerManager tm = new ControllerManager(appClass, "application", mimeMapper, bundle); controllerManagerMap.put(appClass, tm); *************** *** 210,214 **** 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 --- 217,221 ---- loginFailedResponder = new FileResponder(getApplicationFile("login-failed.html", bundle, appClass), mimeMapper, false); ! tm.addResponder("login", new FileResponder(getApplicationFile("login.html", bundle, appClass), mimeMapper, false)); tm.addResponder("login-validate", new Responder() { @Override *************** *** 224,233 **** private boolean initialiseController(Class<?> sessionClass, String logTag, Bundle bundle) { ! ControllerManager tm = new ControllerManager(sessionClass, "controller", "main", "logout", mimeMapper, bundle); controllerManagerMap.put(sessionClass, tm); - tm.addResponder(tm.getExitPoint(), new FileResponder(getApplicationFile("logout.html", bundle, sessionClass), mimeMapper, false)); - return tm.initialise(); } --- 231,238 ---- private boolean initialiseController(Class<?> sessionClass, String logTag, Bundle bundle) { ! ControllerManager tm = new ControllerManager(sessionClass, "controller", mimeMapper, bundle); controllerManagerMap.put(sessionClass, tm); return tm.initialise(); } *************** *** 312,315 **** --- 317,321 ---- SessionCompound sc = sessionMap.get(targetKey); + SessionManager sm = sc.getManager(); Controller target = sc.getController(controllerKey); *************** *** 324,328 **** } ! ControllerManager tm = sc.getManager().getManager(controllerKey); if(tm == null) --- 330,334 ---- } ! ControllerManager tm = sm.getManager(controllerKey); if(tm == null) *************** *** 347,351 **** "Method Execution Failure", "Failed to execute method " + logMethodName + "."); ! if(method.equals(tm.getExitPoint())) { logger.info("Dropping session " + targetKey); dropSessionFor(targetKey); --- 353,359 ---- "Method Execution Failure", "Failed to execute method " + logMethodName + "."); ! String keyAndMethod = controllerKey.length() == 0 ? method : (controllerKey + "/" + method); ! ! if(keyAndMethod.equals(sm.getExitPoint())) { logger.info("Dropping session " + targetKey); dropSessionFor(targetKey); *************** *** 450,454 **** String key = storeSession(sc); ! response.addHeader("Location", "/" + getUriPrefix() + "/" + key + "/" + tm.getEntryPoint()); response.setStatusCode(HttpStatus.SC_MOVED_TEMPORARILY); } --- 458,462 ---- String key = storeSession(sc); ! response.addHeader("Location", "/" + getUriPrefix() + "/" + key + "/" + sm.getEntryPoint()); response.setStatusCode(HttpStatus.SC_MOVED_TEMPORARILY); } *************** *** 465,469 **** return; ! response.addHeader("Location", uri + (uri.endsWith("/") ? "" : "/") + tm.getEntryPoint()); response.setStatusCode(HttpStatus.SC_MOVED_PERMANENTLY); } --- 473,477 ---- return; ! response.addHeader("Location", uri + (uri.endsWith("/") ? "" : "/") + "login"); response.setStatusCode(HttpStatus.SC_MOVED_PERMANENTLY); } |
|
From: Joerg B. <jb...@us...> - 2009-07-06 19:06:33
|
Update of /cvsroot/lipog/net.heilancoo.portal.examples/templates.prefs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24638/templates.prefs Removed Files: logout.html Log Message: tidied up entry/exit point handling --- logout.html DELETED --- |
|
From: Joerg B. <jb...@us...> - 2009-07-06 19:06:31
|
Update of /cvsroot/lipog/net.heilancoo.portal.examples/src/net/heilancoo/portal/examples/json In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24638/src/net/heilancoo/portal/examples/json Modified Files: JsonApplication.java Log Message: tidied up entry/exit point handling Index: JsonApplication.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.examples/src/net/heilancoo/portal/examples/json/JsonApplication.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JsonApplication.java 3 Jun 2009 20:50:11 -0000 1.1 --- JsonApplication.java 6 Jul 2009 19:06:10 -0000 1.2 *************** *** 17,20 **** --- 17,21 ---- import net.heilancoo.portal.htmlforms.FormFieldAccessException; import net.heilancoo.portal.htmlforms.FormFieldContainer; + import net.heilancoo.portal.responses.ResponseTemplateFolder; import net.heilancoo.portal.session.Session; *************** *** 23,26 **** --- 24,28 ---- * */ + @ResponseTemplateFolder("templates.json") @ValidSessions({ JsonSession.class }) public class JsonApplication implements Application { |
|
From: Joerg B. <jb...@us...> - 2009-07-06 19:06:21
|
Update of /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/test In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24608/src/net/heilancoo/portal/test Modified Files: PortalTestPlugin.java Log Message: tidied up entry/exit point handling Index: PortalTestPlugin.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/test/PortalTestPlugin.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PortalTestPlugin.java 5 Jul 2009 13:14:34 -0000 1.4 --- PortalTestPlugin.java 6 Jul 2009 19:06:07 -0000 1.5 *************** *** 14,17 **** --- 14,19 ---- import net.heilancoo.portal.PortalPlugin; + import org.apache.log4j.Level; + import org.apache.log4j.Logger; import org.eclipse.core.runtime.Plugin; import org.osgi.framework.BundleContext; *************** *** 43,46 **** --- 45,49 ---- plugin = this; PortalPlugin.getDefault().configureLogging(null, false); + Logger.getRootLogger().setLevel(Level.DEBUG); } |
|
From: Joerg B. <jb...@us...> - 2009-07-06 19:06:19
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/controller In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24568/src/net/heilancoo/portal/controller Modified Files: ControllerManager.java Log Message: tidied up entry/exit point handling Index: ControllerManager.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/controller/ControllerManager.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ControllerManager.java 6 Jul 2009 16:38:13 -0000 1.4 --- ControllerManager.java 6 Jul 2009 19:06:04 -0000 1.5 *************** *** 36,41 **** private final Class<?> targetClass; - private final String entryPoint; - private final String exitPoint; private final Map<String, Responder> responders; private final MimeTypeMapper mimeMapper; --- 36,39 ---- *************** *** 46,58 **** private boolean initialised; ! public ControllerManager(Class<?> targetClass, String logTag, String defaultEntryPoint, String defaultExitPoint, ! MimeTypeMapper mimeMapper, Bundle bundle) { ! EntryPoint enp = targetClass.getAnnotation(EntryPoint.class); ! ExitPoint exp = targetClass.getAnnotation(ExitPoint.class); ! this.targetClass = targetClass; this.responders = new HashMap<String, Responder>(); - this.entryPoint = enp != null ? enp.value() : defaultEntryPoint; - this.exitPoint = defaultEntryPoint == null ? null : (exp != null ? exp.value() : defaultExitPoint); this.initialised = false; this.stateOk = true; --- 44,50 ---- private boolean initialised; ! public ControllerManager(Class<?> targetClass, String logTag, MimeTypeMapper mimeMapper, Bundle bundle) { this.targetClass = targetClass; this.responders = new HashMap<String, Responder>(); this.initialised = false; this.stateOk = true; *************** *** 133,154 **** private boolean wrapUpInitialisations() { - logger.debug("Entry point " + entryPoint + "."); - - if(!responders.containsKey(entryPoint)) { - logger.error("Entry point " + entryPoint + " missing for " + logTag + " class " - + targetClass.getCanonicalName() + "."); - stateOk = false; - } - - if(exitPoint != null) { - logger.debug("Exit point " + exitPoint + "."); - - if(!responders.containsKey(exitPoint)) { - logger.error("Exit point " + exitPoint + " missing for " + logTag + " class " - + targetClass.getCanonicalName() + "."); - stateOk = false; - } - } - logger.info("Found " + responders.size() + " request handler method(s) for " + targetClass.getCanonicalName() + "."); --- 125,128 ---- *************** *** 165,176 **** return responders.containsKey(request); } - - public String getEntryPoint() { - return entryPoint; - } - - public String getExitPoint() { - return exitPoint; - } public Class<?> getTargetClass() { --- 139,142 ---- |
|
From: Joerg B. <jb...@us...> - 2009-07-06 19:06:12
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/session In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24568/src/net/heilancoo/portal/session Modified Files: SessionManager.java Log Message: tidied up entry/exit point handling Index: SessionManager.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/session/SessionManager.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SessionManager.java 28 Jun 2009 15:08:49 -0000 1.2 --- SessionManager.java 6 Jul 2009 19:06:04 -0000 1.3 *************** *** 18,26 **** --- 18,31 ---- import java.util.Map; + import org.apache.log4j.Logger; + import net.heilancoo.portal.controller.Controller; import net.heilancoo.portal.controller.ControllerMaker; import net.heilancoo.portal.controller.ControllerManager; + import net.heilancoo.portal.controller.EntryPoint; + import net.heilancoo.portal.controller.ExitPoint; import net.heilancoo.portal.controller.SubController; import net.heilancoo.portal.controller.SubControllers; + import net.heilancoo.portal.responders.Responder; /** *************** *** 30,42 **** public class SessionManager { ! private Map<String, Integer> controllerIndices; ! private List<ControllerMaker> controllerMakers; ! private List<ControllerManager> controllerManagers; ! public SessionManager(Class<?> sessionClass, Map<Class<?>, ControllerManager> controllerManagerMap) { this.controllerIndices = new HashMap<String, Integer>(); this.controllerMakers = new ArrayList<ControllerMaker>(); this.controllerManagers = new ArrayList<ControllerManager>(); ! addControllerForKey("", sessionClass, sessionClass, controllerManagerMap); --- 35,61 ---- public class SessionManager { ! private static final Logger logger = Logger.getLogger(SessionManager.class); ! ! private final Class<?> sessionClass; ! private final Map<String, Integer> controllerIndices; ! private final List<ControllerMaker> controllerMakers; ! private final List<ControllerManager> controllerManagers; ! private final String entryPoint; ! private final String exitPoint; ! private boolean initOk; ! ! public SessionManager(Class<?> sessionClass, Map<Class<?>, ControllerManager> controllerManagerMap, ! String defaultEntryPoint, String defaultExitPoint, Responder defaultLogoutResponder) { ! EntryPoint enp = sessionClass.getAnnotation(EntryPoint.class); ! ExitPoint exp = sessionClass.getAnnotation(ExitPoint.class); ! this.entryPoint = enp != null ? enp.value() : defaultEntryPoint; ! this.exitPoint = defaultEntryPoint == null ? null : (exp != null ? exp.value() : defaultExitPoint); ! this.initOk = true; ! this.sessionClass = sessionClass; this.controllerIndices = new HashMap<String, Integer>(); this.controllerMakers = new ArrayList<ControllerMaker>(); this.controllerManagers = new ArrayList<ControllerManager>(); ! addControllerForKey("", sessionClass, sessionClass, controllerManagerMap); *************** *** 51,54 **** --- 70,117 ---- for(SubController s : subs.value()) addControllerForKey(s.key(), s.controller(), sessionClass, controllerManagerMap); + + checkPoint(false, entryPoint, defaultLogoutResponder); + checkPoint(true, exitPoint, defaultLogoutResponder); + } + + public boolean isInitOk() { + return initOk; + } + + private void checkPoint(boolean isExit, String fullPoint, Responder defaultLogoutResponder) { + String label = isExit ? "exit" : "entry"; + + int slashPos = fullPoint.indexOf("/", 0); + String key = slashPos == -1 ? "" : fullPoint.substring(0, slashPos); + String point = slashPos == -1 ? fullPoint : fullPoint.substring(slashPos + 1); + + if(!controllerIndices.containsKey(key)) { + logger.error("Bad " + label + " point '" + fullPoint + "' in session " + + sessionClass.getCanonicalName() + "; no subcontroller for key '" + key + "'."); + initOk = false; + } + + ControllerManager m = controllerManagers.get(controllerIndices.get(key)); + + if(isExit && m.getResponder(exitPoint) == null) { + logger.debug("Adding default responder for exit point '" + exitPoint + "' for controller " + + m.getTargetClass().getCanonicalName() + "."); + m.addResponder(exitPoint, defaultLogoutResponder); + } + + if(m.getResponder(point) == null) { + logger.error("Bad " + label + " point '" + fullPoint + "' in session " + + sessionClass.getCanonicalName() + "; no request handler " + + m.getTargetClass().getCanonicalName() + "." + point + "(..)."); + initOk = false; + } + } + + public String getEntryPoint() { + return entryPoint; + } + + public String getExitPoint() { + return exitPoint; } *************** *** 97,99 **** --- 160,163 ---- } + } |
|
From: Joerg B. <jb...@us...> - 2009-07-06 16:44:27
|
Update of /cvsroot/lipog/net.heilancoo.portal.documentation/doc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19138/doc Modified Files: change-log.html Log Message: --init-only option Index: change-log.html =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.documentation/doc/change-log.html,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** change-log.html 4 Jul 2009 11:29:31 -0000 1.24 --- change-log.html 6 Jul 2009 16:44:23 -0000 1.25 *************** *** 11,14 **** --- 11,17 ---- <h2>Release 4 (upcoming)</h2> <ul> + <li>Command line option "--init-only" to run system initialisation with DEBUG logging enabled + and stop right after this. Use this option to check which applications, sessions and controllers + the Gizmo finds and which request methods are defined.</li> <li>Web folder tutorial.</li> <li>Custom login, login-failed and logout pages.</li> |
|
From: Joerg B. <jb...@us...> - 2009-07-06 16:38:21
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/application In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18061/src/net/heilancoo/portal/application Modified Files: ApplicationRequestHandler.java Log Message: initialisation cleanups + initialisation logging improvements Index: ApplicationRequestHandler.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/application/ApplicationRequestHandler.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** ApplicationRequestHandler.java 4 Jul 2009 15:38:58 -0000 1.22 --- ApplicationRequestHandler.java 6 Jul 2009 16:38:13 -0000 1.23 *************** *** 182,195 **** logger.warn("No sessions configured for web application '" + uriPrefix + "'."); else { ! logger.info("Processing " + sessionClasses.length + " session class(es)."); for(Class<?> sessionClass : sessionClasses) { List<Class<?>> ctrls = AnnotationHelper.getControllersFor(sessionClass); ! for(Class<?> controllerClass : ctrls) ! initialiseController(controllerClass, "controller", bundle); ! for(ControllerManager tm : controllerManagerMap.values()) ! if(!tm.wrapUpInitialisations("controller")) stateOk = false; --- 182,195 ---- logger.warn("No sessions configured for web application '" + uriPrefix + "'."); else { ! logger.info("Processing " + sessionClasses.length + " session(s)."); for(Class<?> sessionClass : sessionClasses) { List<Class<?>> ctrls = AnnotationHelper.getControllersFor(sessionClass); ! logger.info("Processing " + ctrls.size() + " controller(s) for session " ! + sessionClass.getCanonicalName()); ! for(Class<?> controllerClass : ctrls) ! if(!initialiseController(controllerClass, "controller", bundle)) stateOk = false; *************** *** 220,229 **** }); ! tm.initialise(); ! ! return tm.wrapUpInitialisations("application"); } ! private void initialiseController(Class<?> sessionClass, String logTag, Bundle bundle) { ControllerManager tm = new ControllerManager(sessionClass, "controller", "main", "logout", mimeMapper, bundle); --- 220,227 ---- }); ! return tm.initialise(); } ! private boolean initialiseController(Class<?> sessionClass, String logTag, Bundle bundle) { ControllerManager tm = new ControllerManager(sessionClass, "controller", "main", "logout", mimeMapper, bundle); *************** *** 232,236 **** tm.addResponder(tm.getExitPoint(), new FileResponder(getApplicationFile("logout.html", bundle, sessionClass), mimeMapper, false)); ! tm.initialise(); } --- 230,234 ---- tm.addResponder(tm.getExitPoint(), new FileResponder(getApplicationFile("logout.html", bundle, sessionClass), mimeMapper, false)); ! return tm.initialise(); } *************** *** 410,415 **** f = new File(Utils.makePathFor(PortalPlugin.getDefault(), "statics/" + fileName)); ! logger.info("File " + fileName + " for "+ controllerClass.getCanonicalName() ! + ": " + f); return f; --- 408,412 ---- f = new File(Utils.makePathFor(PortalPlugin.getDefault(), "statics/" + fileName)); ! logger.debug("File " + fileName + " for "+ controllerClass.getCanonicalName() + ": " + f); return f; |
|
From: Joerg B. <jb...@us...> - 2009-07-06 16:38:21
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/responders In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18061/src/net/heilancoo/portal/responders Modified Files: Responder.java PlainResponder.java Log Message: initialisation cleanups + initialisation logging improvements Index: Responder.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/responders/Responder.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Responder.java 12 May 2009 16:15:13 -0000 1.3 --- Responder.java 6 Jul 2009 16:38:13 -0000 1.4 *************** *** 28,31 **** --- 28,40 ---- protected Method method; + protected String fullMethodName; + + public Responder() { + } + + public Responder(Method method) { + this.method = method; + this.fullMethodName = method.getDeclaringClass().getCanonicalName() + "." + method.getName() + "(..)"; + } public abstract boolean execute(Controller target, String format, HttpRequest request, FormFieldContainer fields, Index: PlainResponder.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/responders/PlainResponder.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PlainResponder.java 12 May 2009 16:15:13 -0000 1.3 --- PlainResponder.java 6 Jul 2009 16:38:13 -0000 1.4 *************** *** 29,33 **** public PlainResponder(Method method) { ! this.method = method; } --- 29,33 ---- public PlainResponder(Method method) { ! super(method); } |
|
From: Joerg B. <jb...@us...> - 2009-07-06 16:38:19
|
Update of /cvsroot/lipog/net.heilancoo.portal.json/src/net/heilancoo/portal/json In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18087/src/net/heilancoo/portal/json Modified Files: JsonResponderFactory.java Log Message: initialisation cleanups + initialisation logging improvements Index: JsonResponderFactory.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.json/src/net/heilancoo/portal/json/JsonResponderFactory.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JsonResponderFactory.java 11 May 2009 16:43:20 -0000 1.6 --- JsonResponderFactory.java 6 Jul 2009 16:38:16 -0000 1.7 *************** *** 22,26 **** import org.apache.http.HttpResponse; import org.apache.http.protocol.HttpContext; - import org.apache.log4j.Logger; import org.json.JSONObject; import org.osgi.framework.Bundle; --- 22,25 ---- *************** *** 32,37 **** public class JsonResponderFactory extends ResponderFactory { - private static final Logger logger = Logger.getLogger(JsonResponderFactory.class); - public JsonResponderFactory() { super(new Class<?> [] { --- 31,34 ---- *************** *** 50,55 **** @Override public Responder makeGeneratorFor(Method method, Bundle bundle, MimeTypeMapper mimeMapper) { - logger.info("Making JSON responder for method " + method.getName() + "."); - return new JsonResponder(method); } --- 47,50 ---- |
|
From: Joerg B. <jb...@us...> - 2009-07-06 16:38:16
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/controller In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18061/src/net/heilancoo/portal/controller Modified Files: ControllerManager.java Log Message: initialisation cleanups + initialisation logging improvements Index: ControllerManager.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/controller/ControllerManager.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ControllerManager.java 29 May 2009 18:26:58 -0000 1.3 --- ControllerManager.java 6 Jul 2009 16:38:13 -0000 1.4 *************** *** 62,73 **** } ! public void initialise() { if(initialised) { logger.error("Attempt at multiple initialisation of " + logTag + " class " + targetClass.getCanonicalName() + "."); ! return; } initialiseMethods(); initialiseStaticFiles(); } --- 62,75 ---- } ! public boolean initialise() { if(initialised) { logger.error("Attempt at multiple initialisation of " + logTag + " class " + targetClass.getCanonicalName() + "."); ! return false; } initialiseMethods(); initialiseStaticFiles(); + + return wrapUpInitialisations(); } *************** *** 79,83 **** return; ! logger.info("Initialising static files for " + logTag + " class " + targetClass.getCanonicalName() + "."); for(String f : stf.value()) { --- 81,87 ---- return; ! logger.debug("Initialising static files for " + logTag + " class " + targetClass.getCanonicalName() + "."); ! ! int count = 0; for(String f : stf.value()) { *************** *** 85,127 **** if(responders.containsKey(stem)) { ! logger.error("Static file " + f + " conflicts with other static file or responder method."); stateOk = false; } ! ! File file = new File(Utils.makePathFor(bundle, templates) + "/" + stem); ! FileResponder fr = new FileResponder(file, mimeMapper, true); ! responders.put(stem, fr); } ! logger.info("Done initialising static files for " + logTag + " class " + targetClass.getCanonicalName() + "."); } private void initialiseMethods() { ! logger.info("Initialising methods for " + logTag + " class " + targetClass.getCanonicalName() + "."); ! ! for(Method m : targetClass.getMethods()) { ! String methodName = m.getName(); if(m.getAnnotation(Request.class) != null) { Responder g = PortalPlugin.getDefault().findResponseGeneratorFor(m, bundle, mimeMapper); if(g == null) { ! logger.error("No response generator for method " + methodName + "."); stateOk = false; } ! else ! addResponder(methodName, g); } - } ! logger.info("Done initialising methods for " + logTag + " class " + targetClass.getCanonicalName() + "."); } ! public boolean wrapUpInitialisations(String logTag) { ! logger.info("Summarize initialisation for " + logTag + " class " + targetClass.getCanonicalName() + "."); ! ! logger.info("Found " + responders.size() + " response method(s)."); ! ! logger.info("Entry point " + entryPoint + "."); if(!responders.containsKey(entryPoint)) { --- 89,137 ---- if(responders.containsKey(stem)) { ! logger.error("Static file " + f + " conflicts with other request handler method."); stateOk = false; } ! else { ! String folder = Utils.makePathFor(bundle, templates); ! File file = new File(folder + "/" + stem); ! FileResponder fr = new FileResponder(file, mimeMapper, true); ! addResponder(stem, fr); ! logger.debug("File responder: " + f + " (" + folder + f + ")"); ! count += 1; ! } } ! logger.debug(count + " file request handler(s) for " + logTag + " class " + targetClass.getCanonicalName() + "."); } private void initialiseMethods() { ! logger.debug("Initialising methods for " + logTag + " class " + targetClass.getCanonicalName() + "."); + int count = 0; + + for(Method m : targetClass.getMethods()) if(m.getAnnotation(Request.class) != null) { + String methodFullName = m.getDeclaringClass().getCanonicalName() + "." + m.getName() + "(..)"; + + logger.debug("Request method: " + methodFullName); + Responder g = PortalPlugin.getDefault().findResponseGeneratorFor(m, bundle, mimeMapper); if(g == null) { ! logger.error("No response generator found."); stateOk = false; } ! else { ! logger.debug("Responder: " + g.getClass().getCanonicalName()); ! addResponder(m.getName(), g); ! count += 1; ! } } ! logger.debug(count + " request method(s) for " + logTag + " class " + targetClass.getCanonicalName() + "."); } ! private boolean wrapUpInitialisations() { ! logger.debug("Entry point " + entryPoint + "."); if(!responders.containsKey(entryPoint)) { *************** *** 132,136 **** if(exitPoint != null) { ! logger.info("Exit point " + exitPoint + "."); if(!responders.containsKey(exitPoint)) { --- 142,146 ---- if(exitPoint != null) { ! logger.debug("Exit point " + exitPoint + "."); if(!responders.containsKey(exitPoint)) { *************** *** 141,147 **** } ! if(stateOk) ! logger.info("Finished initialising " + logTag + " class " + targetClass.getCanonicalName() + "."); ! else logger.error("Errors encountered when initialising " + logTag + " class " + targetClass.getCanonicalName() + "."); --- 151,158 ---- } ! logger.info("Found " + responders.size() + " request handler method(s) for " ! + targetClass.getCanonicalName() + "."); ! ! if(!stateOk) logger.error("Errors encountered when initialising " + logTag + " class " + targetClass.getCanonicalName() + "."); |
|
From: Joerg B. <jb...@us...> - 2009-07-06 16:38:15
|
Update of /cvsroot/lipog/net.heilancoo.portal.freemarker/src/net/heilancoo/portal/freemarker In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18004/src/net/heilancoo/portal/freemarker Modified Files: FreeMarkerResponder.java FreeMarkerResponderFactory.java Log Message: initialisation cleanups + initialisation logging improvements Index: FreeMarkerResponder.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.freemarker/src/net/heilancoo/portal/freemarker/FreeMarkerResponder.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** FreeMarkerResponder.java 29 May 2009 18:26:55 -0000 1.12 --- FreeMarkerResponder.java 6 Jul 2009 16:38:10 -0000 1.13 *************** *** 55,59 **** public FreeMarkerResponder(Method method, Bundle bundle, MimeTypeMapper mimeMapper) throws ResponderCreationException { ! this.method = method; this.templateStem = method.getName(); this.responseFormatMimeTypes = new HashMap<String, String>(); --- 55,59 ---- public FreeMarkerResponder(Method method, Bundle bundle, MimeTypeMapper mimeMapper) throws ResponderCreationException { ! super(method); this.templateStem = method.getName(); this.responseFormatMimeTypes = new HashMap<String, String>(); *************** *** 92,96 **** } ! logger.info("Default response format is " + defaultResponseFormat + "."); templateFolder = ResponseHelper.getTemplateFolder(method.getDeclaringClass()); --- 92,96 ---- } ! logger.debug("Default response format: '" + defaultResponseFormat + "'"); templateFolder = ResponseHelper.getTemplateFolder(method.getDeclaringClass()); *************** *** 113,119 **** if(e.getValue() != null) ! logger.info("Valid response format " + e.getKey() + " maps to " + e.getValue() + "."); else { ! logger.error("No MIME type configured for response format " + e.getKey() + "."); stateOk = false; } --- 113,119 ---- if(e.getValue() != null) ! logger.debug("Response format: '" + e.getKey() + "' maps to '" + e.getValue() + "'"); else { ! logger.error("No MIME type configured for response format '" + e.getKey() + "'."); stateOk = false; } *************** *** 142,146 **** if(mimeType == null) { ! logger.error("Response format " + format + " not supported for method " + method.getName() + "."); return false; --- 142,146 ---- if(mimeType == null) { ! logger.error("Response format '" + format + "' not supported for method " + method.getName() + "."); return false; Index: FreeMarkerResponderFactory.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.freemarker/src/net/heilancoo/portal/freemarker/FreeMarkerResponderFactory.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FreeMarkerResponderFactory.java 11 May 2009 16:43:18 -0000 1.7 --- FreeMarkerResponderFactory.java 6 Jul 2009 16:38:10 -0000 1.8 *************** *** 23,27 **** import org.apache.http.HttpResponse; import org.apache.http.protocol.HttpContext; - import org.apache.log4j.Logger; import org.osgi.framework.Bundle; --- 23,26 ---- *************** *** 32,37 **** public class FreeMarkerResponderFactory extends ResponderFactory { - private static final Logger logger = Logger.getLogger(FreeMarkerResponderFactory.class); - public FreeMarkerResponderFactory() { super(new Class<?> [] { --- 31,34 ---- *************** *** 50,55 **** public Responder makeGeneratorFor(Method method, Bundle bundle, MimeTypeMapper mimeMapper) throws ResponderCreationException { - logger.info("Making FreeMarker responder for method " + method.getName() + "."); - return new FreeMarkerResponder(method, bundle, mimeMapper); } --- 47,50 ---- |
|
From: Joerg B. <jb...@us...> - 2009-07-06 16:35:01
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17435/src/net/heilancoo/portal Modified Files: PortalPlugin.java Log Message: normal logging at INFO level; init-only: DEBUG Index: PortalPlugin.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/PortalPlugin.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** PortalPlugin.java 5 Jul 2009 14:01:17 -0000 1.21 --- PortalPlugin.java 6 Jul 2009 16:34:58 -0000 1.22 *************** *** 35,38 **** --- 35,39 ---- import org.apache.http.protocol.HttpRequestHandler; + import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.log4j.PropertyConfigurator; *************** *** 274,278 **** if(fileName != null) { ! props.put("log4j.rootLogger", "DEBUG, file"); props.put("log4j.appender.file.File", fileName); } --- 275,279 ---- if(fileName != null) { ! props.put("log4j.rootLogger", "INFO, file"); props.put("log4j.appender.file.File", fileName); } *************** *** 292,295 **** --- 293,299 ---- PropertyConfigurator.configure(props); + + if(initOnly) + Logger.getRootLogger().setLevel(Level.DEBUG); } |
|
From: Joerg B. <jb...@us...> - 2009-07-06 16:35:00
|
Update of /cvsroot/lipog/net.heilancoo.portal/config In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17435/config Modified Files: log.properties Log Message: normal logging at INFO level; init-only: DEBUG Index: log.properties =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/config/log.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** log.properties 11 May 2009 18:34:19 -0000 1.5 --- log.properties 6 Jul 2009 16:34:58 -0000 1.6 *************** *** 10,14 **** # ! log4j.rootLogger=DEBUG, console log4j.appender.console=org.apache.log4j.ConsoleAppender log4j.appender.console.layout=org.apache.log4j.PatternLayout --- 10,14 ---- # ! log4j.rootLogger=INFO, console log4j.appender.console=org.apache.log4j.ConsoleAppender log4j.appender.console.layout=org.apache.log4j.PatternLayout |
|
From: Joerg B. <jb...@us...> - 2009-07-05 14:01:20
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18809/src/net/heilancoo/portal Modified Files: PortalPlugin.java Log Message: --init-only status message fix Index: PortalPlugin.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/PortalPlugin.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** PortalPlugin.java 5 Jul 2009 13:12:14 -0000 1.20 --- PortalPlugin.java 5 Jul 2009 14:01:17 -0000 1.21 *************** *** 305,312 **** public void initialiseHttpService() { logger.info("Preparing HTTP service."); collectContributions(); - } - public void startHttpService() { if(!initialized) { logger.error("Service not initialised. Aborting."); --- 305,311 ---- public void initialiseHttpService() { logger.info("Preparing HTTP service."); + collectContributions(); if(!initialized) { logger.error("Service not initialised. Aborting."); *************** *** 318,321 **** --- 317,325 ---- return; } + } + + public void startHttpService() { + if(!initialized || !initialisationOk) + return; HttpService s = new HttpService(requestHandlerMap); |
|
From: Joerg B. <jb...@us...> - 2009-07-05 13:14:42
|
Update of /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/test In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13173/src/net/heilancoo/portal/test Modified Files: PortalTestPlugin.java Log Message: command line option --init-only to only perform system initialisation for test purposes Index: PortalTestPlugin.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/test/PortalTestPlugin.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PortalTestPlugin.java 15 May 2009 19:21:05 -0000 1.3 --- PortalTestPlugin.java 5 Jul 2009 13:14:34 -0000 1.4 *************** *** 42,46 **** super.start(context); plugin = this; ! PortalPlugin.getDefault().configureLogging(null); } --- 42,46 ---- super.start(context); plugin = this; ! PortalPlugin.getDefault().configureLogging(null, false); } |
|
From: Joerg B. <jb...@us...> - 2009-07-05 13:12:27
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12962/src/net/heilancoo/portal Modified Files: ServiceStarter.java PortalPlugin.java Log Message: command line option --init-only to only perform system initialisation for test purposes Index: PortalPlugin.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/PortalPlugin.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** PortalPlugin.java 15 May 2009 19:20:58 -0000 1.19 --- PortalPlugin.java 5 Jul 2009 13:12:14 -0000 1.20 *************** *** 265,269 **** } ! public void configureLogging(String fileName) { Properties props = new Properties(); String configFile = null; --- 265,269 ---- } ! public void configureLogging(String fileName, boolean initOnly) { Properties props = new Properties(); String configFile = null; *************** *** 277,280 **** --- 277,285 ---- props.put("log4j.appender.file.File", fileName); } + + if(initOnly) { + props.put("log4j.appender.console.layout.ConversionPattern", "%p %m%n"); + props.put("log4j.appender.file.layout.ConversionPattern", "%p %m%n"); + } } catch (FileNotFoundException e) { *************** *** 298,308 **** } ! public void startHttpService() { logger.info("Preparing HTTP service."); - collectContributions(); if(!initialisationOk) { ! logger.error("Aborting due to initialisation errors."); return; } --- 303,319 ---- } ! public void initialiseHttpService() { logger.info("Preparing HTTP service."); collectContributions(); + } + public void startHttpService() { + if(!initialized) { + logger.error("Service not initialised. Aborting."); + return; + } + if(!initialisationOk) { ! logger.error("Errors in service initialisation. Aborting."); return; } Index: ServiceStarter.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/ServiceStarter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ServiceStarter.java 11 May 2009 18:34:02 -0000 1.3 --- ServiceStarter.java 5 Jul 2009 13:12:14 -0000 1.4 *************** *** 12,15 **** --- 12,16 ---- package net.heilancoo.portal; + import org.apache.log4j.Logger; import org.eclipse.equinox.app.IApplication; import org.eclipse.equinox.app.IApplicationContext; *************** *** 21,24 **** --- 22,33 ---- public class ServiceStarter implements IApplication { + private static final Logger logger = Logger.getLogger(ServiceStarter.class); + + boolean initOnly; + + public ServiceStarter() { + this.initOnly = false; + } + /* (non-Javadoc) * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext) *************** *** 29,43 **** String logFile = trawlForLoggingArgs(args); ! PortalPlugin.getDefault().configureLogging(logFile); PortalPlugin.getDefault().startHttpService(); return null; } private String trawlForLoggingArgs(String[] args) { ! for(String a : args) if(a.startsWith("--log=")) ! return a.substring(6); ! return null; } --- 38,65 ---- String logFile = trawlForLoggingArgs(args); ! PortalPlugin.getDefault().configureLogging(logFile, initOnly); ! PortalPlugin.getDefault().initialiseHttpService(); ! ! if(initOnly == true) { ! logger.info("Stopping after initialisation."); ! return null; ! } ! PortalPlugin.getDefault().startHttpService(); + return null; } private String trawlForLoggingArgs(String[] args) { ! String log = null; ! ! for(String a : args) { if(a.startsWith("--log=")) ! log = a.substring(6); ! else if(a.startsWith("--init-only")) ! initOnly = true; ! } ! return log; } |
|
From: Joerg B. <jb...@us...> - 2009-07-04 15:39:09
|
Update of /cvsroot/lipog/net.heilancoo.portal.examples/templates In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23131/templates Removed Files: prefs.html Log Message: custom login/logout page improvements --- prefs.html DELETED --- |
|
From: Joerg B. <jb...@us...> - 2009-07-04 15:39:06
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/responders In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23114/src/net/heilancoo/portal/responders Modified Files: FileResponder.java Log Message: custom login/logout page improvements Index: FileResponder.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/responders/FileResponder.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FileResponder.java 29 May 2009 18:26:58 -0000 1.4 --- FileResponder.java 4 Jul 2009 15:38:58 -0000 1.5 *************** *** 13,17 **** import java.io.File; - import java.lang.reflect.InvocationTargetException; import net.heilancoo.portal.MimeTypeMapper; --- 13,16 ---- *************** *** 46,51 **** public boolean execute(Controller target, String format, HttpRequest request, FormFieldContainer fields, HttpResponse response, ! HttpContext context) throws IllegalArgumentException, ! IllegalAccessException, InvocationTargetException { File f = mapExtension ? new File(file.getAbsolutePath() + "." + format) : file; --- 45,49 ---- public boolean execute(Controller target, String format, HttpRequest request, FormFieldContainer fields, HttpResponse response, ! HttpContext context) { File f = mapExtension ? new File(file.getAbsolutePath() + "." + format) : file; |
|
From: Joerg B. <jb...@us...> - 2009-07-04 15:39:04
|
Update of /cvsroot/lipog/net.heilancoo.portal.examples/templates.prefs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23131/templates.prefs Added Files: logout.html prefs.html Log Message: custom login/logout page improvements --- NEW FILE: prefs.html --- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>This is ${s.user}'s Preferences</title> </head> <body> <h1>My Session (Preferences)</h1> <p>user = ${s.user}</p> <p>serial = ${s.serial}</p> <p>access count = ${s.access}</p> <p>Try this page again in <a href="prefs">HTML</a>.</p> <p>Or: go back to <a href="../main">normal operation</a>.</p> </body> </html> --- NEW FILE: logout.html --- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Logout (from Preferences)</title> </head> <body> <h1>Logout (from Preferences)</h1> <p>You have been logged out now.</p> <p>Thank you and good bye!</p> </body> </html> |
|
From: Joerg B. <jb...@us...> - 2009-07-04 15:39:04
|
Update of /cvsroot/lipog/net.heilancoo.portal.examples/src/net/heilancoo/portal/examples/multicontrollers In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23131/src/net/heilancoo/portal/examples/multicontrollers Modified Files: ThePreferences.java Log Message: custom login/logout page improvements Index: ThePreferences.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.examples/src/net/heilancoo/portal/examples/multicontrollers/ThePreferences.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ThePreferences.java 4 Jul 2009 11:28:32 -0000 1.3 --- ThePreferences.java 4 Jul 2009 15:39:02 -0000 1.4 *************** *** 17,20 **** --- 17,21 ---- import net.heilancoo.portal.freemarker.FreeMarkerModel; import net.heilancoo.portal.htmlforms.FormFieldContainer; + import net.heilancoo.portal.responses.ResponseTemplateFolder; import org.apache.http.HttpRequest; *************** *** 26,29 **** --- 27,31 ---- * */ + @ResponseTemplateFolder("templates.prefs") @EntryPoint("prefs") public class ThePreferences implements Controller { |
|
From: Joerg B. <jb...@us...> - 2009-07-04 15:39:02
|
Update of /cvsroot/lipog/net.heilancoo.portal.examples/templates.prefs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23100/templates.prefs Log Message: Directory /cvsroot/lipog/net.heilancoo.portal.examples/templates.prefs added to the repository |
