lipog-commit Mailing List for Little Portal Gizmo (Page 6)
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-25 06:03:34
|
Update of /cvsroot/lipog/com.gargoylesoftware.htmlunit In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8708/com.gargoylesoftware.htmlunit Log Message: Directory /cvsroot/lipog/com.gargoylesoftware.htmlunit added to the repository |
|
From: Joerg B. <jb...@us...> - 2009-07-24 06:58:57
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/responders In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6061/src/net/heilancoo/portal/responders Added Files: ResponderException.java Log Message: handle responder problem exceptions separately to avoid confusing stack traces from general exception handler --- NEW FILE: ResponderException.java --- /* * Copyright (c) 2009 Heilan' Coo -- Joerg Bullmann * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which is available at http://www.eclipse.org/legal/epl-v10.html * * Contributors: * Joerg Bullmann <jb...@he...> */ package net.heilancoo.portal.responders; /** * @author joerg * */ public class ResponderException extends Exception { /** * */ private static final long serialVersionUID = -4059180460019159162L; /** * @param message */ public ResponderException(String message) { super(message); } /** * @param cause */ public ResponderException(Throwable cause) { super(cause); } /** * @param message * @param cause */ public ResponderException(String message, Throwable cause) { super(message, cause); } } |
|
From: Joerg B. <jb...@us...> - 2009-07-24 06:58:51
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/application In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6061/src/net/heilancoo/portal/application Modified Files: ApplicationRequestHandler.java Log Message: handle responder problem exceptions separately to avoid confusing stack traces from general exception handler Index: ApplicationRequestHandler.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/application/ApplicationRequestHandler.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** ApplicationRequestHandler.java 24 Jul 2009 06:40:11 -0000 1.29 --- ApplicationRequestHandler.java 24 Jul 2009 06:58:41 -0000 1.30 *************** *** 34,37 **** --- 34,38 ---- import net.heilancoo.portal.responders.FileResponder; import net.heilancoo.portal.responders.Responder; + import net.heilancoo.portal.responders.ResponderException; import net.heilancoo.portal.responses.ResponseHelper; import net.heilancoo.portal.session.AnnotationHelper; *************** *** 291,294 **** --- 292,300 ---- logger.error("Problem in responder execution.", ite.getTargetException()); } + catch (ResponderException e) { + ResponseHelper.error(HttpStatus.SC_INTERNAL_SERVER_ERROR, response, + "Method Execution Failure", "Failed to execute " + what + "."); + logger.error(e.getMessage()); + } catch (Exception e) { ResponseHelper.error(HttpStatus.SC_INTERNAL_SERVER_ERROR, response, |
|
From: Joerg B. <jb...@us...> - 2009-07-24 06:58:48
|
Update of /cvsroot/lipog/net.heilancoo.portal.freemarker/src/net/heilancoo/portal/freemarker In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6049/src/net/heilancoo/portal/freemarker Modified Files: FreeMarkerResponder.java Log Message: handle responder problem exceptions separately to avoid confusing stack traces from general exception handler Index: FreeMarkerResponder.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.freemarker/src/net/heilancoo/portal/freemarker/FreeMarkerResponder.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** FreeMarkerResponder.java 24 Jul 2009 06:40:07 -0000 1.14 --- FreeMarkerResponder.java 24 Jul 2009 06:58:38 -0000 1.15 *************** *** 23,26 **** --- 23,27 ---- import net.heilancoo.portal.responders.Responder; import net.heilancoo.portal.responders.ResponderCreationException; + import net.heilancoo.portal.responders.ResponderException; import net.heilancoo.portal.responses.DefaultResponseFormat; import net.heilancoo.portal.responses.ResponseHelper; *************** *** 143,147 **** if(mimeType == null) ! throw new Exception("Response format '" + format + "' not supported for method " + method.getName() + "."); --- 144,148 ---- if(mimeType == null) ! throw new ResponderException("Response format '" + format + "' not supported for method " + method.getName() + "."); |
|
From: Joerg B. <jb...@us...> - 2009-07-24 06:40:49
|
Update of /cvsroot/lipog/net.heilancoo.portal.examples/src/net/heilancoo/portal/examples/redirect In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2751/src/net/heilancoo/portal/examples/redirect Log Message: Directory /cvsroot/lipog/net.heilancoo.portal.examples/src/net/heilancoo/portal/examples/redirect added to the repository |
|
From: Joerg B. <jb...@us...> - 2009-07-24 06:40:48
|
Update of /cvsroot/lipog/net.heilancoo.portal.examples/src/net/heilancoo/portal/examples/redirect/model In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2751/src/net/heilancoo/portal/examples/redirect/model Log Message: Directory /cvsroot/lipog/net.heilancoo.portal.examples/src/net/heilancoo/portal/examples/redirect/model added to the repository |
|
From: Joerg B. <jb...@us...> - 2009-07-24 06:40:47
|
Update of /cvsroot/lipog/net.heilancoo.portal.examples/src/net/heilancoo/portal/examples/redirect In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2788/src/net/heilancoo/portal/examples/redirect Added Files: ToDoSession.java ToDoApplication.java ToDoPlugin.java Log Message: added redirect example (To Do List) --- NEW FILE: ToDoSession.java --- /* * Copyright (c) 2009 Heilan' Coo -- Joerg Bullmann * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which is available at http://www.eclipse.org/legal/epl-v10.html * * Contributors: * Joerg Bullmann <jb...@he...> */ package net.heilancoo.portal.examples.redirect; import java.util.List; import org.apache.http.HttpRequest; import org.apache.http.HttpResponse; import org.apache.http.protocol.HttpContext; import net.heilancoo.portal.controller.Request; import net.heilancoo.portal.examples.redirect.model.Item; import net.heilancoo.portal.examples.redirect.model.User; import net.heilancoo.portal.freemarker.FreeMarkerModel; import net.heilancoo.portal.htmlforms.FormFieldAccessException; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.responses.ResponseTemplateFolder; import net.heilancoo.portal.session.EntryPoint; import net.heilancoo.portal.session.Session; /** * @author joerg * */ @EntryPoint("listItems") @ResponseTemplateFolder("redirect/templates") public class ToDoSession implements Session { private final User user; private final List<Item> items; private int nextId; public User getUser() { return user; } public List<Item> getItems() { return items; } public ToDoSession(User user, List<Item> items) { this.user = user; this.items = items; nextId = 0; for(Item i : items) if(i.getId() > nextId) nextId = i.getId(); } @Request public void listItems(HttpRequest request, FormFieldContainer fields, HttpResponse response, HttpContext context, FreeMarkerModel model) { model.put("items", items); model.put("user", user); } @Request public void add(HttpRequest request, FormFieldContainer fields, HttpResponse response, HttpContext context, FreeMarkerModel model) { model.put("user", user); } @Request public Object addSubmit(HttpRequest request, FormFieldContainer fields, HttpResponse response, HttpContext context) throws FormFieldAccessException { String text = fields.getStringValue("text"); items.add(new Item(text, nextId++)); return "listItems"; } @Request public Object editSubmit(HttpRequest request, FormFieldContainer fields, HttpResponse response, HttpContext context) throws FormFieldAccessException { String text = fields.getStringValue("text"); int id = fields.getIntValue("id"); if(fields.hasFieldName("edit")) for(Item i : items) if(i.getId() == id) { i.setText(text); break; } return "listItems"; } @Request public Object delEdit(HttpRequest request, FormFieldContainer fields, HttpResponse response, HttpContext context, FreeMarkerModel model) throws FormFieldAccessException { int id = fields.getIntValue("id"); if(fields.hasFieldName("del")) { for(Item i : items) if(i.getId() == id) { items.remove(i); break; } return "listItems"; } for(Item i : items) if(i.getId() == id) { model.put("user", user); model.put("id", id); model.put("text", i.getText()); break; } return null; } } --- NEW FILE: ToDoApplication.java --- /* * Copyright (c) 2009 Heilan' Coo -- Joerg Bullmann * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which is available at http://www.eclipse.org/legal/epl-v10.html * * Contributors: * Joerg Bullmann <jb...@he...> */ package net.heilancoo.portal.examples.redirect; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import net.heilancoo.portal.application.Application; import net.heilancoo.portal.application.ApplicationInfo; import net.heilancoo.portal.application.ValidSessions; import net.heilancoo.portal.examples.redirect.model.Item; import net.heilancoo.portal.examples.redirect.model.User; import net.heilancoo.portal.htmlforms.FormFieldAccessException; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.responses.ResponseTemplateFolder; import net.heilancoo.portal.session.Session; /** * @author joerg * */ @ValidSessions({ ToDoSession.class }) @ResponseTemplateFolder("redirect/templates") public class ToDoApplication implements Application { private final Map<String, List<Item>> lists; /** * */ public ToDoApplication() { this.lists = new HashMap<String, List<Item>>(); } /* (non-Javadoc) * @see net.heilancoo.portal.application.Application#getVersion() */ @Override public String getVersion() { // TODO Auto-generated method stub return "1.0-alpha"; } /* (non-Javadoc) * @see net.heilancoo.portal.application.Application#initialise(net.heilancoo.portal.application.ApplicationInfo) */ @Override public void initialise(ApplicationInfo info) { // TODO Auto-generated method stub } /* (non-Javadoc) * @see net.heilancoo.portal.application.Application#validateCredentialsAndMakeNewSession(net.heilancoo.portal.htmlforms.FormFieldContainer) */ @Override public Session validateCredentialsAndMakeNewSession( FormFieldContainer fields) throws FormFieldAccessException { String user = fields.getStringValue("user"); String password = fields.getStringValue("password"); if(!user.equals(password)) return null; User u = new User(user, user, 4); List<Item> l; synchronized(lists) { l = lists.get(user); if(l == null) { l = new ArrayList<Item>(); lists.put(user, l); } } return new ToDoSession(u, l); } } --- NEW FILE: ToDoPlugin.java --- package net.heilancoo.portal.examples.redirect; import org.eclipse.core.runtime.Plugin; import org.osgi.framework.BundleContext; /** * The activator class controls the plug-in life cycle */ public class ToDoPlugin extends Plugin { // The plug-in ID public static final String PLUGIN_ID = "net.heilancoo.web.app.todo"; // The shared instance private static ToDoPlugin plugin; /** * The constructor */ public ToDoPlugin() { } /* * (non-Javadoc) * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext) */ public void start(BundleContext context) throws Exception { super.start(context); plugin = this; } /* * (non-Javadoc) * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext) */ public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); } /** * Returns the shared instance * * @return the shared instance */ public static ToDoPlugin getDefault() { return plugin; } } |
|
From: Joerg B. <jb...@us...> - 2009-07-24 06:40:47
|
Update of /cvsroot/lipog/net.heilancoo.portal.examples/src/net/heilancoo/portal/examples/redirect/model In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2788/src/net/heilancoo/portal/examples/redirect/model Added Files: Item.java User.java Log Message: added redirect example (To Do List) --- NEW FILE: Item.java --- /* * Copyright (c) 2009 Heilan' Coo -- Joerg Bullmann * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which is available at http://www.eclipse.org/legal/epl-v10.html * * Contributors: * Joerg Bullmann <jb...@he...> */ package net.heilancoo.portal.examples.redirect.model; /** * @author joerg * */ public class Item { private String text; private final int id; public Item(String text, int id) { this.text = text; this.id = id; } public void setText(String text) { this.text = text; } public String getText() { return text; } public int getId() { return id; } } --- NEW FILE: User.java --- /* * Copyright (c) 2009 Heilan' Coo -- Joerg Bullmann * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which is available at http://www.eclipse.org/legal/epl-v10.html * * Contributors: * Joerg Bullmann <jb...@he...> */ package net.heilancoo.portal.examples.redirect.model; /** * @author joerg * */ public class User { private final String name; private final String passwd; private final int id; public User(String name, String passwd, int id) { this.name = name; this.passwd = passwd; this.id = id; } public String getName() { return name; } public String getPasswd() { return passwd; } public int getId() { return id; } } |
|
From: Joerg B. <jb...@us...> - 2009-07-24 06:40:46
|
Update of /cvsroot/lipog/net.heilancoo.portal.examples/redirect/templates In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2788/redirect/templates Added Files: listItems.html delEdit.html add.html Log Message: added redirect example (To Do List) --- NEW FILE: delEdit.html --- <html> <head> <title>Edit To Do Item</title> </head> <body> <link rel="stylesheet" type="text/css" href="/files/default.css" /> <h1>Edit To Do Item</h1> <p>User: ${user.name}</p> <form id="editForm" action="editSubmit"> <p>Text: </p> <input name="id" type="hidden" value="${id}"/> <input name="text" type="text" value="${text}"/> <input name="edit" type="submit" value="Submit"/> <input name="cancel" type="submit" value="Cancel"/> </form> </body> </html> --- NEW FILE: add.html --- <html> <head> <title>Add To Do Item</title> </head> <body> <link rel="stylesheet" type="text/css" href="/files/default.css" /> <h1>Add To Do Item</h1> <p>User: ${user.name}</p> <form id="addForm" action="addSubmit"> <p>Text: </p> <input name="text" type="text" value=""/> <input name="add" type="submit" value="Add"/> </form> </body> </html> --- NEW FILE: listItems.html --- <html> <head> <title>To Do List</title> </head> <body> <link rel="stylesheet" type="text/css" href="/files/default.css" /> <h1>To Do List</h1> <p>User: ${user.name}</p> <form id="addForm" action="add"> <input name="add" type="submit" value="Add To Do Item"/> </form> <table> <tr> <th class="inp">Id</th><th class="inp">What</th><th class="ctrl"></th> </tr> <#list items as t> <tr><td class="inp">${t.id}</td><td class="inp">${t.text}</td><td class="ctrl"> <form id="delEditForm" action="delEdit"> <input name="id" type="hidden" value="${t.id}"/> <input name="del" type="submit" value="Delete"/> <input name="edit" type="submit" value="Edit"/> </form> </td></tr> </#list> </table> </body> </html> |
|
From: Joerg B. <jb...@us...> - 2009-07-24 06:40:46
|
Update of /cvsroot/lipog/net.heilancoo.portal.examples/redirect/staticfiles In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2751/redirect/staticfiles Log Message: Directory /cvsroot/lipog/net.heilancoo.portal.examples/redirect/staticfiles added to the repository |
|
From: Joerg B. <jb...@us...> - 2009-07-24 06:40:45
|
Update of /cvsroot/lipog/net.heilancoo.portal.examples In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2788 Modified Files: plugin.xml Log Message: added redirect example (To Do List) Index: plugin.xml =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.examples/plugin.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** plugin.xml 13 Jul 2009 16:31:41 -0000 1.3 --- plugin.xml 24 Jul 2009 06:40:36 -0000 1.4 *************** *** 28,31 **** --- 28,47 ---- </description> </webapp> + <webapp + application="net.heilancoo.portal.examples.redirect.ToDoApplication" + name="To Do" + uri-prefix="todo"> + <description> + A simple to do list. The classic web app way (non AJAX), using a few redirects. + </description> + </webapp> + </extension> + + <extension + point="net.heilancoo.portal.webfolder"> + <webfolder + private-path="redirect/staticfiles" + public-path="files"> + </webfolder> </extension> |
|
From: Joerg B. <jb...@us...> - 2009-07-24 06:40:44
|
Update of /cvsroot/lipog/net.heilancoo.portal.examples/redirect/staticfiles In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2788/redirect/staticfiles Added Files: default.css Log Message: added redirect example (To Do List) --- NEW FILE: default.css --- h1,p { font-family: "Lucida Grande", Arial, Helvetica, sans-serif; } th { font-weight: bold; } table { border-collapse: collapse; } th.inpxxx { width: 180px; } td { color: #000000; } td,th { font-family: "Lucida Grande", Arial, Helvetica, sans-serif; font-size: 14px; text-align: left; padding: 0.3em; padding-left: 0.5em; border: 2px ridge gray; } td.ctrl,th.ctrl { border: none; } p.menu { font: 18px "Lucida Grande"; } |
|
From: Joerg B. <jb...@us...> - 2009-07-24 06:40:41
|
Update of /cvsroot/lipog/net.heilancoo.portal.examples/redirect In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2751/redirect Log Message: Directory /cvsroot/lipog/net.heilancoo.portal.examples/redirect added to the repository |
|
From: Joerg B. <jb...@us...> - 2009-07-24 06:40:41
|
Update of /cvsroot/lipog/net.heilancoo.portal.examples/redirect/templates In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2751/redirect/templates Log Message: Directory /cvsroot/lipog/net.heilancoo.portal.examples/redirect/templates added to the repository |
|
From: Joerg B. <jb...@us...> - 2009-07-24 06:40:24
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/application In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2682/src/net/heilancoo/portal/application Modified Files: ApplicationRequestHandler.java Log Message: HTTP redirects Index: ApplicationRequestHandler.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/application/ApplicationRequestHandler.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** ApplicationRequestHandler.java 13 Jul 2009 18:22:19 -0000 1.28 --- ApplicationRequestHandler.java 24 Jul 2009 06:40:11 -0000 1.29 *************** *** 231,238 **** tm.addResponder("login-validate", new Responder() { @Override ! public boolean execute(Controller target, String format, HttpRequest request, FormFieldContainer fields, HttpResponse response, HttpContext context) throws Exception { ! return doLogin(request.getRequestLine().getUri(), request, fields, response, context); } }); --- 231,239 ---- tm.addResponder("login-validate", new Responder() { @Override ! 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; } }); *************** *** 316,322 **** logger.info("Method " + method + ", application " + getUriPrefix()); ! if(!g.execute(application, presentation, request, fields, response, context)) ! ResponseHelper.error(HttpStatus.SC_INTERNAL_SERVER_ERROR, response, ! "Method Execution Failure", "Failed to execute method " + method + "."); } } --- 317,326 ---- logger.info("Method " + method + ", application " + getUriPrefix()); ! Object redirect = g.execute(application, presentation, request, fields, response, context); ! ! if(redirect != null) { ! response.addHeader("Location", "/" + getUriPrefix() + "/" + redirect); ! response.setStatusCode(HttpStatus.SC_MOVED_TEMPORARILY); ! } } } *************** *** 360,366 **** + ", session " + targetKey); ! if(!g.execute(target, presentation, request, fields, response, context)) ! ResponseHelper.error(HttpStatus.SC_INTERNAL_SERVER_ERROR, response, ! "Method Execution Failure", "Failed to execute method " + logMethodName + "."); String keyAndMethod = controllerKey.length() == 0 ? method : (controllerKey + "/" + method); --- 364,368 ---- + ", session " + targetKey); ! Object redirect = g.execute(target, presentation, request, fields, response, context); String keyAndMethod = controllerKey.length() == 0 ? method : (controllerKey + "/" + method); *************** *** 370,373 **** --- 372,379 ---- dropSessionFor(targetKey); } + else if(redirect != null) { + response.addHeader("Location", "/" + getUriPrefix() + "/" + targetKey + "/" + redirect); + response.setStatusCode(HttpStatus.SC_MOVED_TEMPORARILY); + } } } *************** *** 469,473 **** } ! private boolean doLogin(String uri, HttpRequest request, FormFieldContainer fields, HttpResponse response, HttpContext context) throws FormFieldAccessException { String user = fields.getStringValue("user"); --- 475,479 ---- } ! private void doLogin(String uri, HttpRequest request, FormFieldContainer fields, HttpResponse response, HttpContext context) throws FormFieldAccessException { String user = fields.getStringValue("user"); *************** *** 488,492 **** if(tm == null) ! return true; String key = storeSession(sc); --- 494,498 ---- if(tm == null) ! return; String key = storeSession(sc); *************** *** 495,500 **** } } - - return true; } --- 501,504 ---- |
|
From: Joerg B. <jb...@us...> - 2009-07-24 06:40:20
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/responders In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2682/src/net/heilancoo/portal/responders Modified Files: FileResponder.java Responder.java PlainResponder.java Log Message: HTTP redirects Index: FileResponder.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/responders/FileResponder.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FileResponder.java 4 Jul 2009 15:38:58 -0000 1.5 --- FileResponder.java 24 Jul 2009 06:40:11 -0000 1.6 *************** *** 43,47 **** */ @Override ! public boolean execute(Controller target, String format, HttpRequest request, FormFieldContainer fields, HttpResponse response, HttpContext context) { --- 43,47 ---- */ @Override ! public Object execute(Controller target, String format, HttpRequest request, FormFieldContainer fields, HttpResponse response, HttpContext context) { *************** *** 51,55 **** FileRequestHandler.serveFile(f, request, response, context, mimeMapper, false); ! return true; } --- 51,55 ---- FileRequestHandler.serveFile(f, request, response, context, mimeMapper, false); ! return null; } Index: Responder.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/responders/Responder.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Responder.java 6 Jul 2009 16:38:13 -0000 1.4 --- Responder.java 24 Jul 2009 06:40:11 -0000 1.5 *************** *** 38,42 **** } ! public abstract boolean execute(Controller target, String format, HttpRequest request, FormFieldContainer fields, HttpResponse response, HttpContext context) throws Exception; --- 38,42 ---- } ! public abstract Object execute(Controller target, String format, HttpRequest request, FormFieldContainer fields, HttpResponse response, HttpContext context) throws Exception; Index: PlainResponder.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/responders/PlainResponder.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PlainResponder.java 6 Jul 2009 16:38:13 -0000 1.4 --- PlainResponder.java 24 Jul 2009 06:40:11 -0000 1.5 *************** *** 36,47 **** */ @Override ! public boolean execute(Controller target, String format, HttpRequest request, FormFieldContainer fields, HttpResponse response, HttpContext context) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException { ! method.invoke(target, request, fields, response, context); ! return true; } --- 36,47 ---- */ @Override ! public Object execute(Controller target, String format, HttpRequest request, FormFieldContainer fields, HttpResponse response, HttpContext context) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException { ! Object o = method.invoke(target, request, fields, response, context); ! return o; } |
|
From: Joerg B. <jb...@us...> - 2009-07-24 06:40:17
|
Update of /cvsroot/lipog/net.heilancoo.portal.freemarker/src/net/heilancoo/portal/freemarker In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2666/src/net/heilancoo/portal/freemarker Modified Files: FreeMarkerResponder.java Log Message: HTTP redirects Index: FreeMarkerResponder.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.freemarker/src/net/heilancoo/portal/freemarker/FreeMarkerResponder.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** FreeMarkerResponder.java 6 Jul 2009 16:38:10 -0000 1.13 --- FreeMarkerResponder.java 24 Jul 2009 06:40:07 -0000 1.14 *************** *** 127,131 **** * @see net.heilancoo.portal.responses.Responder#execute(net.heilancoo.portal.session.Session, org.apache.http.HttpRequest, net.heilancoo.portal.htmlforms.FormFieldContainer, org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) */ ! public boolean execute(Controller target, String format, HttpRequest request, FormFieldContainer fields, HttpResponse response, HttpContext context) --- 127,131 ---- * @see net.heilancoo.portal.responses.Responder#execute(net.heilancoo.portal.session.Session, org.apache.http.HttpRequest, net.heilancoo.portal.htmlforms.FormFieldContainer, org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) */ ! public Object execute(Controller target, String format, HttpRequest request, FormFieldContainer fields, HttpResponse response, HttpContext context) *************** *** 134,150 **** FreeMarkerModel model = new FreeMarkerModel(); ! method.invoke(target, request, fields, response, context, model); ! ! if(format == null) ! format = defaultResponseFormat; ! String mimeType = responseFormatMimeTypes.get(format); - if(mimeType == null) { - logger.error("Response format '" + format + "' not supported for method " - + method.getName() + "."); - return false; - } - else { String template = templateStem + "." + format; Template tpl = cfg.getTemplate(template); --- 134,149 ---- FreeMarkerModel model = new FreeMarkerModel(); ! Object redirect = method.invoke(target, request, fields, response, context, model); ! if(redirect == null) { ! if(format == null) ! format = defaultResponseFormat; ! ! String mimeType = responseFormatMimeTypes.get(format); ! ! if(mimeType == null) ! throw new Exception("Response format '" + format + "' not supported for method " ! + method.getName() + "."); String template = templateStem + "." + format; Template tpl = cfg.getTemplate(template); *************** *** 160,165 **** response.setEntity(body); - return true; } } --- 159,165 ---- response.setEntity(body); } + + return redirect; } |
|
From: Joerg B. <jb...@us...> - 2009-07-24 06:40:14
|
Update of /cvsroot/lipog/net.heilancoo.portal.json/src/net/heilancoo/portal/json In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2646/src/net/heilancoo/portal/json Modified Files: JsonResponder.java Log Message: HTTP redirects Index: JsonResponder.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.json/src/net/heilancoo/portal/json/JsonResponder.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** JsonResponder.java 12 May 2009 16:15:22 -0000 1.8 --- JsonResponder.java 24 Jul 2009 06:40:04 -0000 1.9 *************** *** 39,43 **** */ @Override ! public boolean execute(Controller target, String format, HttpRequest request, FormFieldContainer fields, HttpResponse response, HttpContext context) throws Exception { --- 39,43 ---- */ @Override ! public Object execute(Controller target, String format, HttpRequest request, FormFieldContainer fields, HttpResponse response, HttpContext context) throws Exception { *************** *** 45,63 **** JSONObject model = new JSONObject(); ! method.invoke(target, request, fields, response, context, model); ! StringWriter sw = new StringWriter(); ! ! model.write(sw); ! sw.close(); ! ! String encoding = "UTF-8"; ! NStringEntity body = new NStringEntity(sw.toString(), encoding); ! body.setContentType("application/json");//; charset=" + encoding); ! response.setEntity(body); ! return true; } --- 45,65 ---- JSONObject model = new JSONObject(); ! Object redirect = method.invoke(target, request, fields, response, context, model); ! if(redirect == null) { ! StringWriter sw = new StringWriter(); ! model.write(sw); ! sw.close(); ! String encoding = "UTF-8"; ! NStringEntity body = new NStringEntity(sw.toString(), encoding); ! body.setContentType("application/json");//; charset=" + encoding); ! ! response.setEntity(body); ! } ! ! return redirect; } |
|
From: Joerg B. <jb...@us...> - 2009-07-24 06:40:11
|
Update of /cvsroot/lipog/net.heilancoo.portal.documentation/doc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2590/doc Modified Files: change-log.html Log Message: HTTP redirects Index: change-log.html =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.documentation/doc/change-log.html,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** change-log.html 13 Jul 2009 18:36:39 -0000 1.26 --- change-log.html 24 Jul 2009 06:40:00 -0000 1.27 *************** *** 11,14 **** --- 11,15 ---- <h2>Release 4 (upcoming)</h2> <ul> + <li>Handle HTTP 302/303 redirects using return values in @Request methods. See the To Do List application example.</li> <li>Application objects have a little bit of an insight now what's going on: existing sessions and session keys.</li> |
|
From: Joerg B. <jb...@us...> - 2009-07-13 18:54:54
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9676/src/net/heilancoo/portal Modified Files: HttpService.java Log Message: don't log full stack traces where they don't really help Index: HttpService.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/HttpService.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** HttpService.java 11 May 2009 16:43:11 -0000 1.1 --- HttpService.java 13 Jul 2009 18:54:47 -0000 1.2 *************** *** 18,21 **** --- 18,23 ---- + import net.heilancoo.utils.Utils; + import org.apache.http.impl.DefaultConnectionReuseStrategy; import org.apache.http.impl.DefaultHttpResponseFactory; *************** *** 24,27 **** --- 26,30 ---- import org.apache.http.nio.protocol.BufferingHttpServiceHandler; import org.apache.http.nio.reactor.IOEventDispatch; + import org.apache.http.nio.reactor.IOReactorException; import org.apache.http.nio.reactor.ListeningIOReactor; import org.apache.http.params.BasicHttpParams; *************** *** 113,121 **** ioReactor.execute(ioEventDispatch); } ! catch (InterruptedIOException ex) { logger.error("I/O interrupted."); } catch (IOException e) { logger.error("I/O error: " + e.getMessage(), e); } --- 116,130 ---- ioReactor.execute(ioEventDispatch); } ! catch (InterruptedIOException e) { logger.error("I/O interrupted."); + Utils.logCauses(e); + } + catch (IOReactorException e) { + logger.error("I/O reactor error: " + e.getMessage()); + Utils.logCauses(e); } catch (IOException e) { logger.error("I/O error: " + e.getMessage(), e); + Utils.logCauses(e); } |
|
From: Joerg B. <jb...@us...> - 2009-07-13 18:54:20
|
Update of /cvsroot/lipog/net.heilancoo.utils/src/net/heilancoo/utils In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9626/src/net/heilancoo/utils Modified Files: Utils.java Log Message: log exception cause chain Index: Utils.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.utils/src/net/heilancoo/utils/Utils.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Utils.java 11 Apr 2009 14:43:56 -0000 1.4 --- Utils.java 13 Jul 2009 18:54:16 -0000 1.5 *************** *** 28,31 **** --- 28,36 ---- private static final Logger logger = Logger.getLogger(Utils.class); + + public static void logCauses(Exception e) { + for(Throwable c = e.getCause(); c != null; c = c.getCause()) + logger.error("Cause: " + c.getMessage()); + } public static String makePathFor(Plugin p, String file) { |
|
From: Joerg B. <jb...@us...> - 2009-07-13 18:37:28
|
Update of /cvsroot/lipog/net.heilancoo.portal.documentation/doc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6858/doc Modified Files: index.html Log Message: cleaned up description text (removed controller swapping blurb) Index: index.html =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.documentation/doc/index.html,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** index.html 4 Jul 2009 11:46:28 -0000 1.17 --- index.html 13 Jul 2009 18:37:16 -0000 1.18 *************** *** 20,27 **** <p>Instead of supporting the Java Servlet API, the Gizmo uses its own custom and very light weight ! API. This hinges on the Model-View-Controller design pattern. Controllers ! can be swapped in and out to allow an application's behaviour to be spread over multiple ! controllers. The web applications you develop for the Gizmo have the form of Eclipse plug-ins. ! </p> <p>A Gizmo instance can run any number of web applications at a time.</p> --- 20,25 ---- <p>Instead of supporting the Java Servlet API, the Gizmo uses its own custom and very light weight ! API. This hinges on the Model-View-Controller design pattern. The web applications you develop for ! the Gizmo have the form of Eclipse plug-ins.</p> <p>A Gizmo instance can run any number of web applications at a time.</p> |
|
From: Joerg B. <jb...@us...> - 2009-07-13 18:36:45
|
Update of /cvsroot/lipog/net.heilancoo.portal.documentation/doc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6735/doc Modified Files: change-log.html Log Message: ApplicationInfo Index: change-log.html =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.documentation/doc/change-log.html,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** change-log.html 6 Jul 2009 16:44:23 -0000 1.25 --- change-log.html 13 Jul 2009 18:36:39 -0000 1.26 *************** *** 11,14 **** --- 11,16 ---- <h2>Release 4 (upcoming)</h2> <ul> + <li>Application objects have a little bit of an insight now what's going on: existing sessions + and session keys.</li> <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 |
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/application In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4413/src/net/heilancoo/portal/application Modified Files: Application.java ApplicationRequestHandler.java Added Files: ApplicationInfo.java Removed Files: ApplicationParameters.java Log Message: ApplicationParameters become ApplicationInfo and also allow access to some dynamic aspects of an application Index: Application.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/application/Application.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Application.java 15 May 2009 19:20:58 -0000 1.6 --- Application.java 13 Jul 2009 18:22:18 -0000 1.7 *************** *** 8,12 **** public interface Application extends Controller { ! public void initialise(ApplicationParameters parameters); public Session validateCredentialsAndMakeNewSession(FormFieldContainer fields) throws FormFieldAccessException; public String getVersion(); --- 8,12 ---- public interface Application extends Controller { ! public void initialise(ApplicationInfo info); public Session validateCredentialsAndMakeNewSession(FormFieldContainer fields) throws FormFieldAccessException; public String getVersion(); --- ApplicationParameters.java DELETED --- --- NEW FILE: ApplicationInfo.java --- /* * Copyright (c) 2009 Heilan' Coo -- Joerg Bullmann * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which is available at http://www.eclipse.org/legal/epl-v10.html * * Contributors: * Joerg Bullmann <jb...@he...> */ package net.heilancoo.portal.application; import java.util.Properties; import java.util.Set; import net.heilancoo.portal.session.Session; /** * @author joerg * */ public class ApplicationInfo { private final Properties properties; private final String fileName; private final ApplicationRequestHandler handler; public ApplicationInfo(Properties properties, String fileName, ApplicationRequestHandler handler) { this.properties = properties; this.fileName = fileName; this.handler = handler; } public Properties getProperties() { return properties; } public String getFileName() { return fileName; } public int getNumSessions() { return handler.getNumSessions(); } /** * The returned set of session keys is bound to be changed by other threads * and access to it must be synchronised. * @return the set of session keys currently in use. */ public Set<String> getSessionKeys() { return handler.getSessionKeys(); } /** * The returned session keys is bound to be changed by other threads and * access to it must be synchronised. * @return the session for the given key or null if the key is not in use. */ public Session getSessionFor(String key) { return handler.getSessionFor(key).getSession(); } } Index: ApplicationRequestHandler.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/application/ApplicationRequestHandler.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** ApplicationRequestHandler.java 13 Jul 2009 16:31:10 -0000 1.27 --- ApplicationRequestHandler.java 13 Jul 2009 18:22:19 -0000 1.28 *************** *** 23,26 **** --- 23,27 ---- import java.util.Properties; import java.util.Random; + import java.util.Set; import net.heilancoo.portal.MimeTypeMapper; *************** *** 72,76 **** private FileResponder loginFailedResponder; private String uriPrefix; ! private ApplicationParameters parameters; public String getName() { --- 73,77 ---- private FileResponder loginFailedResponder; private String uriPrefix; ! private ApplicationInfo info; public String getName() { *************** *** 86,91 **** } ! public ApplicationParameters getParameters() { ! return parameters; } --- 87,92 ---- } ! public ApplicationInfo getApplicationInfo() { ! return info; } *************** *** 101,104 **** --- 102,110 ---- boolean stateOk = true; + if(configFile == null) { + info = new ApplicationInfo(null, null, this); + return stateOk; + } + configFile = Utils.makePathFor(bundle, configFile); *************** *** 123,127 **** } else ! parameters = new ApplicationParameters(null, configFile); } else { --- 129,133 ---- } else ! info = new ApplicationInfo(null, configFile, this); } else { *************** *** 134,138 **** p.load(r); ! parameters = new ApplicationParameters(p, configFile); } catch (FileNotFoundException e) { --- 140,144 ---- p.load(r); ! info = new ApplicationInfo(p, configFile, this); } catch (FileNotFoundException e) { *************** *** 147,151 **** if(stateOk == false) ! parameters = new ApplicationParameters(null, null); return stateOk; --- 153,157 ---- if(stateOk == false) ! info = new ApplicationInfo(null, null, null); return stateOk; *************** *** 164,171 **** this.application = application; ! if(configFile != null) ! stateOk = initialiseConfigFile(configFile); ! application.initialise(parameters); if(mimeConfig == null) --- 170,176 ---- this.application = application; ! stateOk = initialiseConfigFile(configFile); ! application.initialise(info); if(mimeConfig == null) *************** *** 374,378 **** } ! private SessionCompound getSessionFor(String key) { synchronized(sessionMap) { return sessionMap.get(key); --- 379,405 ---- } ! protected int getNumSessions() { ! synchronized(sessionMap) { ! return sessionMap.size(); ! } ! } ! ! /** ! * The returned set of session keys is bound to be changed by other threads ! * and access to it must be synchronised. ! * @return the set of session keys currently in use. ! */ ! protected Set<String> getSessionKeys() { ! synchronized(sessionMap) { ! return sessionMap.keySet(); ! } ! } ! ! /** ! * The returned session keys is bound to be changed by other threads and ! * access to it must be synchronised. ! * @return the session for the given key or null if the key is not in use. ! */ ! protected SessionCompound getSessionFor(String key) { synchronized(sessionMap) { return sessionMap.get(key); |
|
From: Joerg B. <jb...@us...> - 2009-07-13 18:22:22
|
Update of /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/webapps/test In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4346/src/net/heilancoo/portal/webapps/test Modified Files: TestWebApp6.java TestWebApp4.java TestWebApp.java TestWebAppProps.java InitialisationTests.java TestWebApp7.java TestWebApp8.java TestWebApp5.java TestWebApp2.java TestWebApp3.java TestWebApp9.java Log Message: ApplicationParameters become ApplicationInfo and also allow access to some dynamic aspects of an application Index: InitialisationTests.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/webapps/test/InitialisationTests.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** InitialisationTests.java 6 Jul 2009 19:51:04 -0000 1.11 --- InitialisationTests.java 13 Jul 2009 18:22:15 -0000 1.12 *************** *** 125,129 **** TestWebAppProps a = new TestWebAppProps(); assertTrue(h.initialise(bundle, a, "uri-prefix", "Test Web Application", "Some text", null, "data/good-file.properties")); ! p = h.getParameters().getProperties(); assertEquals("1", a.getProp("a.b.c")); assertEquals("1", p.getProperty("a.b.c")); --- 125,129 ---- TestWebAppProps a = new TestWebAppProps(); assertTrue(h.initialise(bundle, a, "uri-prefix", "Test Web Application", "Some text", null, "data/good-file.properties")); ! p = h.getApplicationInfo().getProperties(); assertEquals("1", a.getProp("a.b.c")); assertEquals("1", p.getProperty("a.b.c")); *************** *** 132,136 **** assertEquals("at the end of it all", p.getProperty("x.y.z")); assertEquals(3, p.size()); ! assertEquals(Utils.makePathFor(bundle, "data/good-file.properties"), h.getParameters().getFileName()); } --- 132,136 ---- assertEquals("at the end of it all", p.getProperty("x.y.z")); assertEquals(3, p.size()); ! assertEquals(Utils.makePathFor(bundle, "data/good-file.properties"), h.getApplicationInfo().getFileName()); } *************** *** 138,143 **** public void webAppWithMissingProperties() { assertFalse(h.initialise(bundle, new TestWebApp(), "uri-prefix", "Test Web Application", "Some text", null, "data/missing-file.properties")); ! assertNull(h.getParameters().getFileName()); ! assertNull(h.getParameters().getProperties()); } --- 138,143 ---- public void webAppWithMissingProperties() { assertFalse(h.initialise(bundle, new TestWebApp(), "uri-prefix", "Test Web Application", "Some text", null, "data/missing-file.properties")); ! assertNull(h.getApplicationInfo().getFileName()); ! assertNull(h.getApplicationInfo().getProperties()); } *************** *** 145,150 **** public void webAppWithOtherConfigFile() { assertTrue(h.initialise(bundle, new TestWebApp(), "uri-prefix", "Test Web Application", "Some text", null, "data/another-file.txt")); ! assertNull(h.getParameters().getProperties()); ! assertEquals(Utils.makePathFor(bundle, "data/another-file.txt"), h.getParameters().getFileName()); } --- 145,150 ---- public void webAppWithOtherConfigFile() { assertTrue(h.initialise(bundle, new TestWebApp(), "uri-prefix", "Test Web Application", "Some text", null, "data/another-file.txt")); ! assertNull(h.getApplicationInfo().getProperties()); ! assertEquals(Utils.makePathFor(bundle, "data/another-file.txt"), h.getApplicationInfo().getFileName()); } *************** *** 152,157 **** public void webAppWithMissingOtherConfigFile() { assertFalse(h.initialise(bundle, new TestWebApp(), "uri-prefix", "Test Web Application", "Some text", null, "data/another-missing-file.txt")); ! assertNull(h.getParameters().getProperties()); ! assertNull(h.getParameters().getFileName()); } --- 152,157 ---- public void webAppWithMissingOtherConfigFile() { assertFalse(h.initialise(bundle, new TestWebApp(), "uri-prefix", "Test Web Application", "Some text", null, "data/another-missing-file.txt")); ! assertNull(h.getApplicationInfo().getProperties()); ! assertNull(h.getApplicationInfo().getFileName()); } *************** *** 159,164 **** public void webAppWithWrongOtherConfigFile() { assertFalse(h.initialise(bundle, new TestWebApp(), "uri-prefix", "Test Web Application", "Some text", null, "data")); ! assertNull(h.getParameters().getProperties()); ! assertNull(h.getParameters().getFileName()); } --- 159,164 ---- public void webAppWithWrongOtherConfigFile() { assertFalse(h.initialise(bundle, new TestWebApp(), "uri-prefix", "Test Web Application", "Some text", null, "data")); ! assertNull(h.getApplicationInfo().getProperties()); ! assertNull(h.getApplicationInfo().getFileName()); } Index: TestWebApp8.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/webapps/test/TestWebApp8.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TestWebApp8.java 15 May 2009 19:21:05 -0000 1.3 --- TestWebApp8.java 13 Jul 2009 18:22:15 -0000 1.4 *************** *** 13,17 **** import net.heilancoo.portal.application.Application; ! import net.heilancoo.portal.application.ApplicationParameters; import net.heilancoo.portal.application.ValidSessions; import net.heilancoo.portal.htmlforms.FormFieldContainer; --- 13,17 ---- import net.heilancoo.portal.application.Application; ! import net.heilancoo.portal.application.ApplicationInfo; import net.heilancoo.portal.application.ValidSessions; import net.heilancoo.portal.htmlforms.FormFieldContainer; *************** *** 40,44 **** */ @Override ! public void initialise(ApplicationParameters parameters) { // TODO Auto-generated method stub --- 40,44 ---- */ @Override ! public void initialise(ApplicationInfo info) { // TODO Auto-generated method stub Index: TestWebApp2.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/webapps/test/TestWebApp2.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TestWebApp2.java 15 May 2009 19:21:05 -0000 1.6 --- TestWebApp2.java 13 Jul 2009 18:22:15 -0000 1.7 *************** *** 13,17 **** import net.heilancoo.portal.application.Application; ! import net.heilancoo.portal.application.ApplicationParameters; import net.heilancoo.portal.application.ValidSessions; import net.heilancoo.portal.htmlforms.FormFieldContainer; --- 13,17 ---- import net.heilancoo.portal.application.Application; ! import net.heilancoo.portal.application.ApplicationInfo; import net.heilancoo.portal.application.ValidSessions; import net.heilancoo.portal.htmlforms.FormFieldContainer; *************** *** 40,44 **** */ @Override ! public void initialise(ApplicationParameters parameters) { // TODO Auto-generated method stub } --- 40,44 ---- */ @Override ! public void initialise(ApplicationInfo info) { // TODO Auto-generated method stub } Index: TestWebApp4.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/webapps/test/TestWebApp4.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TestWebApp4.java 15 May 2009 19:21:05 -0000 1.6 --- TestWebApp4.java 13 Jul 2009 18:22:15 -0000 1.7 *************** *** 13,17 **** import net.heilancoo.portal.application.Application; ! import net.heilancoo.portal.application.ApplicationParameters; import net.heilancoo.portal.application.ValidSessions; import net.heilancoo.portal.htmlforms.FormFieldContainer; --- 13,17 ---- import net.heilancoo.portal.application.Application; ! import net.heilancoo.portal.application.ApplicationInfo; import net.heilancoo.portal.application.ValidSessions; import net.heilancoo.portal.htmlforms.FormFieldContainer; *************** *** 40,44 **** */ @Override ! public void initialise(ApplicationParameters parameters) { // TODO Auto-generated method stub } --- 40,44 ---- */ @Override ! public void initialise(ApplicationInfo info) { // TODO Auto-generated method stub } Index: TestWebApp5.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/webapps/test/TestWebApp5.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TestWebApp5.java 15 May 2009 19:21:05 -0000 1.6 --- TestWebApp5.java 13 Jul 2009 18:22:15 -0000 1.7 *************** *** 13,17 **** import net.heilancoo.portal.application.Application; ! import net.heilancoo.portal.application.ApplicationParameters; import net.heilancoo.portal.application.ValidSessions; import net.heilancoo.portal.htmlforms.FormFieldContainer; --- 13,17 ---- import net.heilancoo.portal.application.Application; ! import net.heilancoo.portal.application.ApplicationInfo; import net.heilancoo.portal.application.ValidSessions; import net.heilancoo.portal.htmlforms.FormFieldContainer; *************** *** 40,44 **** */ @Override ! public void initialise(ApplicationParameters parameters) { // TODO Auto-generated method stub } --- 40,44 ---- */ @Override ! public void initialise(ApplicationInfo info) { // TODO Auto-generated method stub } Index: TestWebApp.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/webapps/test/TestWebApp.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** TestWebApp.java 15 May 2009 19:21:05 -0000 1.8 --- TestWebApp.java 13 Jul 2009 18:22:15 -0000 1.9 *************** *** 13,17 **** import net.heilancoo.portal.application.Application; ! import net.heilancoo.portal.application.ApplicationParameters; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.session.Session; --- 13,17 ---- import net.heilancoo.portal.application.Application; ! import net.heilancoo.portal.application.ApplicationInfo; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.session.Session; *************** *** 38,42 **** */ @Override ! public void initialise(ApplicationParameters parameters) { // TODO Auto-generated method stub --- 38,42 ---- */ @Override ! public void initialise(ApplicationInfo info) { // TODO Auto-generated method stub Index: TestWebApp6.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/webapps/test/TestWebApp6.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TestWebApp6.java 15 May 2009 19:21:05 -0000 1.6 --- TestWebApp6.java 13 Jul 2009 18:22:15 -0000 1.7 *************** *** 13,17 **** import net.heilancoo.portal.application.Application; ! import net.heilancoo.portal.application.ApplicationParameters; import net.heilancoo.portal.application.ValidSessions; import net.heilancoo.portal.htmlforms.FormFieldContainer; --- 13,17 ---- import net.heilancoo.portal.application.Application; ! import net.heilancoo.portal.application.ApplicationInfo; import net.heilancoo.portal.application.ValidSessions; import net.heilancoo.portal.htmlforms.FormFieldContainer; *************** *** 40,44 **** */ @Override ! public void initialise(ApplicationParameters parameters) { // TODO Auto-generated method stub --- 40,44 ---- */ @Override ! public void initialise(ApplicationInfo info) { // TODO Auto-generated method stub Index: TestWebApp7.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/webapps/test/TestWebApp7.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TestWebApp7.java 15 May 2009 19:21:05 -0000 1.6 --- TestWebApp7.java 13 Jul 2009 18:22:15 -0000 1.7 *************** *** 13,17 **** import net.heilancoo.portal.application.Application; ! import net.heilancoo.portal.application.ApplicationParameters; import net.heilancoo.portal.application.ValidSessions; import net.heilancoo.portal.htmlforms.FormFieldContainer; --- 13,17 ---- import net.heilancoo.portal.application.Application; ! import net.heilancoo.portal.application.ApplicationInfo; import net.heilancoo.portal.application.ValidSessions; import net.heilancoo.portal.htmlforms.FormFieldContainer; *************** *** 40,44 **** */ @Override ! public void initialise(ApplicationParameters parameters) { // TODO Auto-generated method stub --- 40,44 ---- */ @Override ! public void initialise(ApplicationInfo info) { // TODO Auto-generated method stub Index: TestWebApp9.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/webapps/test/TestWebApp9.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TestWebApp9.java 6 Jul 2009 19:51:04 -0000 1.1 --- TestWebApp9.java 13 Jul 2009 18:22:15 -0000 1.2 *************** *** 13,17 **** import net.heilancoo.portal.application.Application; ! import net.heilancoo.portal.application.ApplicationParameters; import net.heilancoo.portal.application.ValidSessions; import net.heilancoo.portal.htmlforms.FormFieldContainer; --- 13,17 ---- import net.heilancoo.portal.application.Application; ! import net.heilancoo.portal.application.ApplicationInfo; import net.heilancoo.portal.application.ValidSessions; import net.heilancoo.portal.htmlforms.FormFieldContainer; *************** *** 43,47 **** */ @Override ! public void initialise(ApplicationParameters parameters) { // TODO Auto-generated method stub --- 43,47 ---- */ @Override ! public void initialise(ApplicationInfo info) { // TODO Auto-generated method stub Index: TestWebApp3.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/webapps/test/TestWebApp3.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TestWebApp3.java 15 May 2009 19:21:05 -0000 1.6 --- TestWebApp3.java 13 Jul 2009 18:22:15 -0000 1.7 *************** *** 13,17 **** import net.heilancoo.portal.application.Application; ! import net.heilancoo.portal.application.ApplicationParameters; import net.heilancoo.portal.application.ValidSessions; import net.heilancoo.portal.htmlforms.FormFieldContainer; --- 13,17 ---- import net.heilancoo.portal.application.Application; ! import net.heilancoo.portal.application.ApplicationInfo; import net.heilancoo.portal.application.ValidSessions; import net.heilancoo.portal.htmlforms.FormFieldContainer; *************** *** 40,44 **** */ @Override ! public void initialise(ApplicationParameters parameters) { // TODO Auto-generated method stub } --- 40,44 ---- */ @Override ! public void initialise(ApplicationInfo info) { // TODO Auto-generated method stub } Index: TestWebAppProps.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/webapps/test/TestWebAppProps.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TestWebAppProps.java 25 May 2009 19:22:42 -0000 1.1 --- TestWebAppProps.java 13 Jul 2009 18:22:15 -0000 1.2 *************** *** 15,19 **** import net.heilancoo.portal.application.Application; ! import net.heilancoo.portal.application.ApplicationParameters; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.session.Session; --- 15,19 ---- import net.heilancoo.portal.application.Application; ! import net.heilancoo.portal.application.ApplicationInfo; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.session.Session; *************** *** 42,47 **** */ @Override ! public void initialise(ApplicationParameters parameters) { ! props = parameters.getProperties(); } --- 42,47 ---- */ @Override ! public void initialise(ApplicationInfo info) { ! props = info.getProperties(); } |
