lipog-commit Mailing List for Little Portal Gizmo (Page 12)
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-05-11 18:34:27
|
Update of /cvsroot/lipog/net.heilancoo.portal/config In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31564/config Modified Files: log.properties Log Message: option to log to file Index: log.properties =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/config/log.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** log.properties 11 May 2009 16:43:11 -0000 1.4 --- log.properties 11 May 2009 18:34:19 -0000 1.5 *************** *** 13,21 **** log4j.appender.console=org.apache.log4j.ConsoleAppender log4j.appender.console.layout=org.apache.log4j.PatternLayout - - # Print the date in ISO 8601 format - #log4j.appender.console.layout.ConversionPattern=%d [%t] %p %c - %m%n log4j.appender.console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %p %m%n # Print only messages of level WARN or above in the package com.foo. log4j.logger.net.heilancoo.portal.EventLogger=WARN --- 13,27 ---- log4j.appender.console=org.apache.log4j.ConsoleAppender log4j.appender.console.layout=org.apache.log4j.PatternLayout log4j.appender.console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %p %m%n + # Print the date in ISO 8601 format log4j.appender.console.layout.ConversionPattern=%d [%t] %p %c - %m%n + + log4j.appender.file=org.apache.log4j.RollingFileAppender + log4j.appender.file.layout=org.apache.log4j.PatternLayout + log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %p %m%n + log4j.appender.file.maxFileSize=256KB + log4j.appender.file.maxBackupIndex=16 + log4j.appender.file.File=gizmo.log + # Print only messages of level WARN or above in the package com.foo. log4j.logger.net.heilancoo.portal.EventLogger=WARN |
|
From: Joerg B. <jb...@us...> - 2009-05-11 18:34:12
|
Update of /cvsroot/lipog/net.heilancoo.portal.documentation/doc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31524/doc Modified Files: change-log.html Log Message: option to log to file Index: change-log.html =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.documentation/doc/change-log.html,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** change-log.html 10 May 2009 20:17:09 -0000 1.18 --- change-log.html 11 May 2009 18:34:05 -0000 1.19 *************** *** 11,14 **** --- 11,15 ---- <h2>Release 4 (upcoming)</h2> <ul> + <li>Command line option "--log=<i>FILE</i>" to log to (rolling) log file(s) instead of the console.</li> <li>Request target (controller) changing improved and simplified (@ChangeControllers annotation).</li> <li>Form field decoding is now done much later, just before the form fields are actually needed; as a |
|
From: Joerg B. <jb...@us...> - 2009-05-11 18:34:06
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31511/src/net/heilancoo/portal Modified Files: ServiceStarter.java PortalPlugin.java Log Message: option to log to file Index: PortalPlugin.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/PortalPlugin.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** PortalPlugin.java 11 May 2009 16:43:11 -0000 1.17 --- PortalPlugin.java 11 May 2009 18:34:02 -0000 1.18 *************** *** 12,15 **** --- 12,18 ---- package net.heilancoo.portal; + import java.io.FileNotFoundException; + import java.io.FileReader; + import java.io.IOException; import java.lang.reflect.Method; import java.util.ArrayList; *************** *** 17,20 **** --- 20,24 ---- import java.util.List; import java.util.Map; + import java.util.Properties; import java.util.Set; import java.util.TreeMap; *************** *** 259,267 **** public void start(BundleContext context) throws Exception { super.start(context); ! plugin = this; ! PropertyConfigurator.configure(Utils.makePathFor(this, "config/log.properties")); ! logger.info("Activating " + PLUGIN_ID); } --- 263,291 ---- public void start(BundleContext context) throws Exception { super.start(context); ! plugin = this; ! } ! ! public void configureLogging(String fileName) { ! Properties props = new Properties(); ! String configFile = null; ! try { ! configFile = Utils.makePathFor(this, "config/log.properties"); ! props.load(new FileReader(configFile)); ! ! if(fileName != null) { ! props.put("log4j.rootLogger", "DEBUG, file"); ! props.put("log4j.appender.file.File", fileName); ! } ! } ! catch (FileNotFoundException e) { ! System.err.println("Cannot find log configuration file " + configFile + "."); ! } ! catch (IOException e) { ! System.err.println("Failed reading configuration file " + configFile + "."); ! e.printStackTrace(); ! } ! PropertyConfigurator.configure(props); } Index: ServiceStarter.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/ServiceStarter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ServiceStarter.java 10 Apr 2009 15:08:33 -0000 1.2 --- ServiceStarter.java 11 May 2009 18:34:02 -0000 1.3 *************** *** 20,31 **** --- 20,45 ---- */ public class ServiceStarter implements IApplication { + /* (non-Javadoc) * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext) */ public Object start(IApplicationContext context) throws Exception { + String [] args = (String[]) context.getArguments().get("application.args"); + + 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; + } + /* (non-Javadoc) * @see org.eclipse.equinox.app.IApplication#stop() |
|
From: Joerg B. <jb...@us...> - 2009-05-11 17:30:47
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/application In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18516/src/net/heilancoo/portal/application Modified Files: ApplicationRequestHandler.java Log Message: more initialisation cross-checking Index: ApplicationRequestHandler.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/application/ApplicationRequestHandler.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ApplicationRequestHandler.java 11 May 2009 16:43:11 -0000 1.11 --- ApplicationRequestHandler.java 11 May 2009 17:30:31 -0000 1.12 *************** *** 189,192 **** --- 189,195 ---- for(RequestTargetManager tm : targetManagerMap.values()) + tm.checkChangers("controller", targetManagerMap); + + for(RequestTargetManager tm : targetManagerMap.values()) if(!tm.wrapUpInitialisations("controller")) stateOk = false; *************** *** 320,324 **** if(c.change(getSessionFor(targetKey), fields, response)) { logger.info("Controller change " + method + ", application " + getUriPrefix() ! + ", session " + targetKey + ", " + c.getControllerClassName()); dispatchSessionMethod(method, presentation, targetKey, request, fields, response, context); } --- 323,327 ---- if(c.change(getSessionFor(targetKey), fields, response)) { logger.info("Controller change " + method + ", application " + getUriPrefix() ! + ", session " + targetKey + ", " + c.getNewControllerClassName()); dispatchSessionMethod(method, presentation, targetKey, request, fields, response, context); } |
|
From: Joerg B. <jb...@us...> - 2009-05-11 17:30:38
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/controller In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18516/src/net/heilancoo/portal/controller Modified Files: RequestTargetManager.java ControllerChanger.java Log Message: more initialisation cross-checking Index: RequestTargetManager.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/controller/RequestTargetManager.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RequestTargetManager.java 11 May 2009 16:43:11 -0000 1.1 --- RequestTargetManager.java 11 May 2009 17:30:31 -0000 1.2 *************** *** 77,81 **** ControllerChanger c = new ControllerChanger(m); changers.put(methodName, c); ! logger.info("Controller change method " + c.getName() + " creates " + c.getControllerClassName() + "."); } } --- 77,81 ---- ControllerChanger c = new ControllerChanger(m); changers.put(methodName, c); ! logger.info("Controller change method " + c.getName() + " creates " + c.getNewControllerClassName() + "."); } } *************** *** 112,116 **** ControllerChanger c = new ControllerChanger(sessionClass, targetClass, newManager); changers.put(newManager.getEntryPoint(), c); ! logger.info("Controller change method " + c.getName() + " creates " + c.getControllerClassName() + "."); } } --- 112,127 ---- ControllerChanger c = new ControllerChanger(sessionClass, targetClass, newManager); changers.put(newManager.getEntryPoint(), c); ! logger.info("Controller change method " + c.getName() + " creates " + c.getNewControllerClassName() + "."); ! } ! else { ! ControllerChanger c = changers.get(entry); ! ! if(!c.getNewControllerClassName().equals(newTarget.getCanonicalName())) { ! logger.error("Controller change method " + c.getName() ! + " in " + targetClass.getCanonicalName() ! + " cannot create both " + c.getNewControllerClassName() ! + " and " + newTarget.getCanonicalName() + "."); ! stateOk = false; ! } } } *************** *** 118,121 **** --- 129,151 ---- logger.info("Done initialising target changers for " + logTag + " class " + targetClass.getCanonicalName() + "."); } + + public void checkChangers(String logTag, Map<Class<?>, RequestTargetManager> targetManagerMap) { + logger.info("Checking target changers for " + logTag + " class " + targetClass.getCanonicalName() + "."); + + for(Map.Entry<String, ControllerChanger> e : changers.entrySet()) { + String req = e.getKey(); + ControllerChanger chng = e.getValue(); + Class<?> newClass = chng.getNewControllerClass(); + RequestTargetManager mgr = targetManagerMap.get(newClass); + + if(!mgr.handlesRequest(req)) { + logger.error("Target changer " + req + " has no corresponding response method in " + + newClass.getCanonicalName() + "."); + stateOk = false; + } + } + + logger.info("Done checking target changers for " + logTag + " class " + targetClass.getCanonicalName() + "."); + } public boolean wrapUpInitialisations(String logTag) { Index: ControllerChanger.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/controller/ControllerChanger.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ControllerChanger.java 11 May 2009 16:43:11 -0000 1.1 --- ControllerChanger.java 11 May 2009 17:30:31 -0000 1.2 *************** *** 268,272 **** } ! public String getControllerClassName() { return newControllerClass.getCanonicalName(); } --- 268,276 ---- } ! public Class<?> getNewControllerClass() { ! return newControllerClass; ! } ! ! public String getNewControllerClassName() { return newControllerClass.getCanonicalName(); } |
|
From: Joerg B. <jb...@us...> - 2009-05-11 16:43:31
|
Update of /cvsroot/lipog/net.heilancoo.bingo/src/net/heilancoo/bingo In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10118/src/net/heilancoo/bingo Modified Files: BingoSession.java Log Message: one monstrous cleanup of packages -- hopefully clearer now Index: BingoSession.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.bingo/src/net/heilancoo/bingo/BingoSession.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** BingoSession.java 1 May 2009 13:30:48 -0000 1.6 --- BingoSession.java 11 May 2009 16:43:27 -0000 1.7 *************** *** 14,21 **** import net.heilancoo.portal.application.Application; import net.heilancoo.portal.application.ApplicationRequestHandler; import net.heilancoo.portal.freemarker.FreeMarkerModel; import net.heilancoo.portal.htmlforms.FormFieldContainer; - import net.heilancoo.portal.responses.Request; - import net.heilancoo.portal.responses.RequestTarget; import net.heilancoo.portal.responses.ValidResponseFormats; import net.heilancoo.portal.session.Session; --- 14,21 ---- import net.heilancoo.portal.application.Application; import net.heilancoo.portal.application.ApplicationRequestHandler; + import net.heilancoo.portal.controller.Request; + import net.heilancoo.portal.controller.RequestTarget; import net.heilancoo.portal.freemarker.FreeMarkerModel; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.responses.ValidResponseFormats; import net.heilancoo.portal.session.Session; |
|
From: Joerg B. <jb...@us...> - 2009-05-11 16:43:30
|
Update of /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/webapps/test In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10094/src/net/heilancoo/portal/webapps/test Modified Files: SessionWithCustomDefaultResponseFormat.java SessionWithMultipleResponseFormats.java SimpleSession.java SessionWithMultipleResponseFormatsTemplateMissing.java SimpleSessionMainEntryMissing.java SessionWithCustomTemplateFolder.java SessionWithCustomEntry.java Log Message: one monstrous cleanup of packages -- hopefully clearer now Index: SimpleSession.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/webapps/test/SimpleSession.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SimpleSession.java 1 May 2009 13:30:59 -0000 1.3 --- SimpleSession.java 11 May 2009 16:43:24 -0000 1.4 *************** *** 18,25 **** import net.heilancoo.portal.application.Application; import net.heilancoo.portal.application.ApplicationRequestHandler; import net.heilancoo.portal.freemarker.FreeMarkerModel; import net.heilancoo.portal.htmlforms.FormFieldContainer; - import net.heilancoo.portal.responses.Request; - import net.heilancoo.portal.responses.RequestTarget; import net.heilancoo.portal.session.Session; --- 18,25 ---- import net.heilancoo.portal.application.Application; import net.heilancoo.portal.application.ApplicationRequestHandler; + import net.heilancoo.portal.controller.Request; + import net.heilancoo.portal.controller.RequestTarget; import net.heilancoo.portal.freemarker.FreeMarkerModel; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.session.Session; Index: SessionWithCustomDefaultResponseFormat.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/webapps/test/SessionWithCustomDefaultResponseFormat.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SessionWithCustomDefaultResponseFormat.java 1 May 2009 13:30:59 -0000 1.4 --- SessionWithCustomDefaultResponseFormat.java 11 May 2009 16:43:24 -0000 1.5 *************** *** 18,26 **** import net.heilancoo.portal.application.Application; import net.heilancoo.portal.application.ApplicationRequestHandler; import net.heilancoo.portal.freemarker.FreeMarkerModel; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.responses.DefaultResponseFormat; - import net.heilancoo.portal.responses.Request; - import net.heilancoo.portal.responses.RequestTarget; import net.heilancoo.portal.responses.ResponseTemplateFolder; import net.heilancoo.portal.session.Session; --- 18,26 ---- import net.heilancoo.portal.application.Application; import net.heilancoo.portal.application.ApplicationRequestHandler; + import net.heilancoo.portal.controller.Request; + import net.heilancoo.portal.controller.RequestTarget; import net.heilancoo.portal.freemarker.FreeMarkerModel; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.responses.DefaultResponseFormat; import net.heilancoo.portal.responses.ResponseTemplateFolder; import net.heilancoo.portal.session.Session; Index: SessionWithCustomEntry.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/webapps/test/SessionWithCustomEntry.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SessionWithCustomEntry.java 1 May 2009 13:30:59 -0000 1.2 --- SessionWithCustomEntry.java 11 May 2009 16:43:24 -0000 1.3 *************** *** 18,26 **** import net.heilancoo.portal.application.Application; import net.heilancoo.portal.application.ApplicationRequestHandler; import net.heilancoo.portal.freemarker.FreeMarkerModel; import net.heilancoo.portal.htmlforms.FormFieldContainer; - import net.heilancoo.portal.responses.EntryPoint; - import net.heilancoo.portal.responses.Request; - import net.heilancoo.portal.responses.RequestTarget; import net.heilancoo.portal.session.Session; --- 18,26 ---- import net.heilancoo.portal.application.Application; import net.heilancoo.portal.application.ApplicationRequestHandler; + import net.heilancoo.portal.controller.EntryPoint; + import net.heilancoo.portal.controller.Request; + import net.heilancoo.portal.controller.RequestTarget; import net.heilancoo.portal.freemarker.FreeMarkerModel; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.session.Session; Index: SessionWithMultipleResponseFormats.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/webapps/test/SessionWithMultipleResponseFormats.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SessionWithMultipleResponseFormats.java 1 May 2009 13:30:59 -0000 1.3 --- SessionWithMultipleResponseFormats.java 11 May 2009 16:43:24 -0000 1.4 *************** *** 18,25 **** import net.heilancoo.portal.application.Application; import net.heilancoo.portal.application.ApplicationRequestHandler; import net.heilancoo.portal.freemarker.FreeMarkerModel; import net.heilancoo.portal.htmlforms.FormFieldContainer; - import net.heilancoo.portal.responses.Request; - import net.heilancoo.portal.responses.RequestTarget; import net.heilancoo.portal.responses.ResponseTemplateFolder; import net.heilancoo.portal.responses.ValidResponseFormats; --- 18,25 ---- import net.heilancoo.portal.application.Application; import net.heilancoo.portal.application.ApplicationRequestHandler; + import net.heilancoo.portal.controller.Request; + import net.heilancoo.portal.controller.RequestTarget; import net.heilancoo.portal.freemarker.FreeMarkerModel; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.responses.ResponseTemplateFolder; import net.heilancoo.portal.responses.ValidResponseFormats; Index: SessionWithCustomTemplateFolder.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/webapps/test/SessionWithCustomTemplateFolder.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SessionWithCustomTemplateFolder.java 1 May 2009 13:30:59 -0000 1.3 --- SessionWithCustomTemplateFolder.java 11 May 2009 16:43:24 -0000 1.4 *************** *** 18,25 **** import net.heilancoo.portal.application.Application; import net.heilancoo.portal.application.ApplicationRequestHandler; import net.heilancoo.portal.freemarker.FreeMarkerModel; import net.heilancoo.portal.htmlforms.FormFieldContainer; - import net.heilancoo.portal.responses.Request; - import net.heilancoo.portal.responses.RequestTarget; import net.heilancoo.portal.responses.ResponseTemplateFolder; import net.heilancoo.portal.session.Session; --- 18,25 ---- import net.heilancoo.portal.application.Application; import net.heilancoo.portal.application.ApplicationRequestHandler; + import net.heilancoo.portal.controller.Request; + import net.heilancoo.portal.controller.RequestTarget; import net.heilancoo.portal.freemarker.FreeMarkerModel; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.responses.ResponseTemplateFolder; import net.heilancoo.portal.session.Session; Index: SessionWithMultipleResponseFormatsTemplateMissing.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/webapps/test/SessionWithMultipleResponseFormatsTemplateMissing.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SessionWithMultipleResponseFormatsTemplateMissing.java 1 May 2009 13:30:59 -0000 1.3 --- SessionWithMultipleResponseFormatsTemplateMissing.java 11 May 2009 16:43:24 -0000 1.4 *************** *** 18,25 **** import net.heilancoo.portal.application.Application; import net.heilancoo.portal.application.ApplicationRequestHandler; import net.heilancoo.portal.freemarker.FreeMarkerModel; import net.heilancoo.portal.htmlforms.FormFieldContainer; - import net.heilancoo.portal.responses.Request; - import net.heilancoo.portal.responses.RequestTarget; import net.heilancoo.portal.responses.ResponseTemplateFolder; import net.heilancoo.portal.responses.ValidResponseFormats; --- 18,25 ---- import net.heilancoo.portal.application.Application; import net.heilancoo.portal.application.ApplicationRequestHandler; + import net.heilancoo.portal.controller.Request; + import net.heilancoo.portal.controller.RequestTarget; import net.heilancoo.portal.freemarker.FreeMarkerModel; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.responses.ResponseTemplateFolder; import net.heilancoo.portal.responses.ValidResponseFormats; Index: SimpleSessionMainEntryMissing.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/webapps/test/SimpleSessionMainEntryMissing.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SimpleSessionMainEntryMissing.java 1 May 2009 13:30:59 -0000 1.3 --- SimpleSessionMainEntryMissing.java 11 May 2009 16:43:24 -0000 1.4 *************** *** 14,18 **** import net.heilancoo.portal.application.Application; import net.heilancoo.portal.application.ApplicationRequestHandler; ! import net.heilancoo.portal.responses.RequestTarget; import net.heilancoo.portal.session.Session; --- 14,18 ---- import net.heilancoo.portal.application.Application; import net.heilancoo.portal.application.ApplicationRequestHandler; ! import net.heilancoo.portal.controller.RequestTarget; import net.heilancoo.portal.session.Session; |
|
From: Joerg B. <jb...@us...> - 2009-05-11 16:43:30
|
Update of /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/requests/test In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10094/src/net/heilancoo/portal/requests/test Modified Files: MimeTypeMapperTest.java Log Message: one monstrous cleanup of packages -- hopefully clearer now Index: MimeTypeMapperTest.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.test/src/net/heilancoo/portal/requests/test/MimeTypeMapperTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MimeTypeMapperTest.java 10 Apr 2009 15:08:39 -0000 1.2 --- MimeTypeMapperTest.java 11 May 2009 16:43:24 -0000 1.3 *************** *** 16,20 **** import java.io.File; ! import net.heilancoo.portal.requests.MimeTypeMapper; import net.heilancoo.portal.test.PortalTestPlugin; import net.heilancoo.utils.Utils; --- 16,20 ---- import java.io.File; ! import net.heilancoo.portal.MimeTypeMapper; import net.heilancoo.portal.test.PortalTestPlugin; import net.heilancoo.utils.Utils; |
|
From: Joerg B. <jb...@us...> - 2009-05-11 16:43:29
|
Update of /cvsroot/lipog/net.heilancoo.portal.json/src/net/heilancoo/portal/json In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10065/src/net/heilancoo/portal/json Modified Files: JsonResponderFactory.java JsonResponder.java Log Message: one monstrous cleanup of packages -- hopefully clearer now Index: JsonResponderFactory.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.json/src/net/heilancoo/portal/json/JsonResponderFactory.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JsonResponderFactory.java 10 May 2009 20:19:20 -0000 1.5 --- JsonResponderFactory.java 11 May 2009 16:43:20 -0000 1.6 *************** *** 14,19 **** import java.lang.reflect.Method; import net.heilancoo.portal.htmlforms.FormFieldContainer; - import net.heilancoo.portal.requests.MimeTypeMapper; import net.heilancoo.portal.responders.Responder; import net.heilancoo.portal.responders.ResponderFactory; --- 14,19 ---- import java.lang.reflect.Method; + import net.heilancoo.portal.MimeTypeMapper; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.responders.Responder; import net.heilancoo.portal.responders.ResponderFactory; Index: JsonResponder.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.json/src/net/heilancoo/portal/json/JsonResponder.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JsonResponder.java 10 May 2009 20:19:20 -0000 1.6 --- JsonResponder.java 11 May 2009 16:43:20 -0000 1.7 *************** *** 15,21 **** import java.lang.reflect.Method; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.responders.Responder; - import net.heilancoo.portal.responses.RequestTarget; import org.apache.http.HttpRequest; --- 15,21 ---- import java.lang.reflect.Method; + import net.heilancoo.portal.controller.RequestTarget; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.responders.Responder; import org.apache.http.HttpRequest; |
|
From: Joerg B. <jb...@us...> - 2009-05-11 16:43:26
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/session In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9944/src/net/heilancoo/portal/session Modified Files: Session.java SessionCompound.java Removed Files: ControllerChanger.java ValidControllers.java ChangeControllers.java ChangeController.java Log Message: one monstrous cleanup of packages -- hopefully clearer now --- ChangeControllers.java DELETED --- Index: SessionCompound.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/session/SessionCompound.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SessionCompound.java 4 May 2009 21:55:22 -0000 1.2 --- SessionCompound.java 11 May 2009 16:43:11 -0000 1.3 *************** *** 12,16 **** package net.heilancoo.portal.session; ! import net.heilancoo.portal.responses.RequestTarget; /** --- 12,16 ---- package net.heilancoo.portal.session; ! import net.heilancoo.portal.controller.RequestTarget; /** --- ChangeController.java DELETED --- --- ControllerChanger.java DELETED --- --- ValidControllers.java DELETED --- Index: Session.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/session/Session.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Session.java 1 May 2009 13:30:55 -0000 1.4 --- Session.java 11 May 2009 16:43:11 -0000 1.5 *************** *** 14,18 **** import net.heilancoo.portal.application.Application; import net.heilancoo.portal.application.ApplicationRequestHandler; ! import net.heilancoo.portal.responses.RequestTarget; /** --- 14,18 ---- import net.heilancoo.portal.application.Application; import net.heilancoo.portal.application.ApplicationRequestHandler; ! import net.heilancoo.portal.controller.RequestTarget; /** |
|
From: Joerg B. <jb...@us...> - 2009-05-11 16:43:23
|
Update of /cvsroot/lipog/net.heilancoo.portal.examples/src/net/heilancoo/portal/examples/controllerchange In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10029/src/net/heilancoo/portal/examples/controllerchange Modified Files: ThePreferences.java TheMain.java TheExport.java TheSession.java Log Message: one monstrous cleanup of packages -- hopefully clearer now Index: TheMain.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.examples/src/net/heilancoo/portal/examples/controllerchange/TheMain.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TheMain.java 10 May 2009 19:51:40 -0000 1.2 --- TheMain.java 11 May 2009 16:43:15 -0000 1.3 *************** *** 12,21 **** package net.heilancoo.portal.examples.controllerchange; import net.heilancoo.portal.freemarker.FreeMarkerModel; import net.heilancoo.portal.htmlforms.FormFieldContainer; - import net.heilancoo.portal.responses.Request; - import net.heilancoo.portal.responses.RequestTarget; import net.heilancoo.portal.responses.ValidResponseFormats; - import net.heilancoo.portal.session.ChangeControllers; import org.apache.http.HttpRequest; --- 12,21 ---- package net.heilancoo.portal.examples.controllerchange; + import net.heilancoo.portal.controller.ChangeControllers; + import net.heilancoo.portal.controller.Request; + import net.heilancoo.portal.controller.RequestTarget; import net.heilancoo.portal.freemarker.FreeMarkerModel; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.responses.ValidResponseFormats; import org.apache.http.HttpRequest; Index: TheExport.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.examples/src/net/heilancoo/portal/examples/controllerchange/TheExport.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TheExport.java 10 May 2009 19:51:40 -0000 1.1 --- TheExport.java 11 May 2009 16:43:15 -0000 1.2 *************** *** 16,26 **** import org.apache.http.protocol.HttpContext; import net.heilancoo.portal.freemarker.FreeMarkerModel; import net.heilancoo.portal.htmlforms.FormFieldContainer; - import net.heilancoo.portal.responses.EntryPoint; - import net.heilancoo.portal.responses.Request; - import net.heilancoo.portal.responses.RequestTarget; - import net.heilancoo.portal.session.ChangeController; - import net.heilancoo.portal.session.ChangeControllers; /** --- 16,26 ---- import org.apache.http.protocol.HttpContext; + import net.heilancoo.portal.controller.ChangeController; + import net.heilancoo.portal.controller.ChangeControllers; + import net.heilancoo.portal.controller.EntryPoint; + import net.heilancoo.portal.controller.Request; + import net.heilancoo.portal.controller.RequestTarget; import net.heilancoo.portal.freemarker.FreeMarkerModel; import net.heilancoo.portal.htmlforms.FormFieldContainer; /** Index: ThePreferences.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.examples/src/net/heilancoo/portal/examples/controllerchange/ThePreferences.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ThePreferences.java 10 May 2009 19:51:40 -0000 1.2 --- ThePreferences.java 11 May 2009 16:43:15 -0000 1.3 *************** *** 16,25 **** import org.apache.http.protocol.HttpContext; import net.heilancoo.portal.freemarker.FreeMarkerModel; import net.heilancoo.portal.htmlforms.FormFieldContainer; - import net.heilancoo.portal.responses.EntryPoint; - import net.heilancoo.portal.responses.Request; - import net.heilancoo.portal.responses.RequestTarget; - import net.heilancoo.portal.session.ChangeController; /** --- 16,25 ---- import org.apache.http.protocol.HttpContext; + import net.heilancoo.portal.controller.ChangeController; + import net.heilancoo.portal.controller.EntryPoint; + import net.heilancoo.portal.controller.Request; + import net.heilancoo.portal.controller.RequestTarget; import net.heilancoo.portal.freemarker.FreeMarkerModel; import net.heilancoo.portal.htmlforms.FormFieldContainer; /** Index: TheSession.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.examples/src/net/heilancoo/portal/examples/controllerchange/TheSession.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TheSession.java 10 May 2009 19:51:40 -0000 1.2 --- TheSession.java 11 May 2009 16:43:15 -0000 1.3 *************** *** 14,20 **** import net.heilancoo.portal.application.Application; import net.heilancoo.portal.application.ApplicationRequestHandler; ! import net.heilancoo.portal.responses.RequestTarget; import net.heilancoo.portal.session.Session; - import net.heilancoo.portal.session.ValidControllers; /** --- 14,20 ---- import net.heilancoo.portal.application.Application; import net.heilancoo.portal.application.ApplicationRequestHandler; ! import net.heilancoo.portal.controller.RequestTarget; ! import net.heilancoo.portal.controller.ValidControllers; import net.heilancoo.portal.session.Session; /** |
|
From: Joerg B. <jb...@us...> - 2009-05-11 16:43:21
|
Update of /cvsroot/lipog/net.heilancoo.portal.freemarker/src/net/heilancoo/portal/freemarker In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10048/src/net/heilancoo/portal/freemarker Modified Files: FreeMarkerResponder.java FreeMarkerResponderFactory.java Log Message: one monstrous cleanup of packages -- hopefully clearer now Index: FreeMarkerResponder.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.freemarker/src/net/heilancoo/portal/freemarker/FreeMarkerResponder.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** FreeMarkerResponder.java 10 May 2009 20:19:17 -0000 1.9 --- FreeMarkerResponder.java 11 May 2009 16:43:18 -0000 1.10 *************** *** 18,27 **** import java.util.Map; import net.heilancoo.portal.htmlforms.FormFieldContainer; - import net.heilancoo.portal.requests.MimeTypeMapper; import net.heilancoo.portal.responders.Responder; import net.heilancoo.portal.responders.ResponderCreationException; import net.heilancoo.portal.responses.DefaultResponseFormat; - import net.heilancoo.portal.responses.RequestTarget; import net.heilancoo.portal.responses.ResponseTemplateFolder; import net.heilancoo.portal.responses.ValidResponseFormats; --- 18,27 ---- import java.util.Map; + import net.heilancoo.portal.MimeTypeMapper; + import net.heilancoo.portal.controller.RequestTarget; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.responders.Responder; import net.heilancoo.portal.responders.ResponderCreationException; import net.heilancoo.portal.responses.DefaultResponseFormat; import net.heilancoo.portal.responses.ResponseTemplateFolder; import net.heilancoo.portal.responses.ValidResponseFormats; Index: FreeMarkerResponderFactory.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.freemarker/src/net/heilancoo/portal/freemarker/FreeMarkerResponderFactory.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FreeMarkerResponderFactory.java 10 May 2009 20:19:17 -0000 1.6 --- FreeMarkerResponderFactory.java 11 May 2009 16:43:18 -0000 1.7 *************** *** 14,19 **** import java.lang.reflect.Method; import net.heilancoo.portal.htmlforms.FormFieldContainer; - import net.heilancoo.portal.requests.MimeTypeMapper; import net.heilancoo.portal.responders.Responder; import net.heilancoo.portal.responders.ResponderCreationException; --- 14,19 ---- import java.lang.reflect.Method; + import net.heilancoo.portal.MimeTypeMapper; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.responders.Responder; import net.heilancoo.portal.responders.ResponderCreationException; |
|
From: Joerg B. <jb...@us...> - 2009-05-11 16:43:21
|
Update of /cvsroot/lipog/net.heilancoo.portal/config In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9944/config Modified Files: log.properties Log Message: one monstrous cleanup of packages -- hopefully clearer now Index: log.properties =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/config/log.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** log.properties 10 Apr 2009 15:08:33 -0000 1.3 --- log.properties 11 May 2009 16:43:11 -0000 1.4 *************** *** 20,23 **** # Print only messages of level WARN or above in the package com.foo. log4j.logger.net.heilancoo.portal.EventLogger=WARN ! log4j.logger.net.heilancoo.portal.requests.MimeTypeMapper=WARN #log4j.logger.com.foo=WARN \ No newline at end of file --- 20,23 ---- # Print only messages of level WARN or above in the package com.foo. log4j.logger.net.heilancoo.portal.EventLogger=WARN ! log4j.logger.net.heilancoo.portal.MimeTypeMapper=WARN #log4j.logger.com.foo=WARN \ No newline at end of file |
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/responses In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9944/src/net/heilancoo/portal/responses Added Files: ResponseHelper.java Removed Files: RequestTarget.java EntryPoint.java ExitPoint.java RequestTargetManager.java Request.java Log Message: one monstrous cleanup of packages -- hopefully clearer now --- RequestTarget.java DELETED --- --- NEW FILE: ResponseHelper.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.responses; import java.io.UnsupportedEncodingException; import org.apache.http.HttpResponse; import org.apache.http.nio.entity.NStringEntity; import org.apache.log4j.Logger; /** * @author joerg * */ public class ResponseHelper { private static final Logger logger = Logger.getLogger(ResponseHelper.class); public static void error(final int statusCode, final HttpResponse response, final String reasonPhrase, final String description, final String internalMessage) { error(statusCode, response, reasonPhrase, description); logger.error(internalMessage); } public static void error(final int statusCode, final HttpResponse response, final String reasonPhrase, final String description) { errorResponse(statusCode, reasonPhrase, description, response); logger.error(description); } public static void errorResponse(final int statusCode, final String reasonPhrase, final String description, HttpResponse response) { response.setStatusCode(statusCode); response.setReasonPhrase(reasonPhrase); try { String encoding = "UTF-8"; NStringEntity body = new NStringEntity( "<html><head><title>" + reasonPhrase + "</title></head><body><h1>Status " + statusCode + " — " + reasonPhrase + "</h1>" + "<p>" + description + "</p></body></html>"); body.setContentType("text/html; charset=" + encoding); response.setEntity(body); } catch (UnsupportedEncodingException e) { logger.error(e, e); } } } --- ExitPoint.java DELETED --- --- RequestTargetManager.java DELETED --- --- Request.java DELETED --- --- EntryPoint.java DELETED --- |
|
From: Joerg B. <jb...@us...> - 2009-05-11 16:43:18
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/controller In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9944/src/net/heilancoo/portal/controller Added Files: RequestTarget.java ExitPoint.java ControllerChanger.java ChangeController.java ChangeControllers.java Request.java ValidControllers.java RequestTargetManager.java EntryPoint.java Log Message: one monstrous cleanup of packages -- hopefully clearer now --- NEW FILE: RequestTarget.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.controller; /** * @author joerg * */ public interface RequestTarget { } --- NEW FILE: ChangeControllers.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.controller; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** * @author joerg * */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface ChangeControllers { Class<?> [] value(); } --- NEW FILE: EntryPoint.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.controller; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** * @author joerg * */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface EntryPoint { String value(); } --- NEW FILE: ExitPoint.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.controller; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** * @author joerg * */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface ExitPoint { String value(); } --- NEW FILE: ChangeController.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.controller; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** * @author joerg * */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) public @interface ChangeController { Class<?> value() default Object.class; } --- NEW FILE: RequestTargetManager.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.controller; import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; import net.heilancoo.portal.MimeTypeMapper; import net.heilancoo.portal.PortalPlugin; import net.heilancoo.portal.responders.Responder; import org.apache.log4j.Logger; import org.osgi.framework.Bundle; /** * @author joerg * */ public class RequestTargetManager { private static final Logger logger = Logger.getLogger(RequestTargetManager.class); private final Class<?> targetClass; private final String entryPoint; private final String exitPoint; private final Map<String, Responder> responders; private final Map<String, ControllerChanger> changers; private boolean stateOk; private boolean initialised; public RequestTargetManager(Class<?> targetClass, String defaultEntryPoint, String defaultExitPoint) { EntryPoint enp = targetClass.getAnnotation(EntryPoint.class); ExitPoint exp = targetClass.getAnnotation(ExitPoint.class); this.targetClass = targetClass; this.responders = new HashMap<String, Responder>(); this.changers = new HashMap<String, ControllerChanger>(); this.entryPoint = enp != null ? enp.value() : defaultEntryPoint; this.exitPoint = defaultEntryPoint == null ? null : (exp != null ? exp.value() : defaultExitPoint); this.initialised = false; this.stateOk = true; } public void initialiseMethods(Bundle bundle, String logTag, MimeTypeMapper mimeMapper) { if(initialised) { logger.error("Attempt at multiple initialisation of " + logTag + " class " + targetClass.getCanonicalName() + "."); return; } 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); } else if(m.getAnnotation(ChangeController.class) != null) { ControllerChanger c = new ControllerChanger(m); changers.put(methodName, c); logger.info("Controller change method " + c.getName() + " creates " + c.getControllerClassName() + "."); } } logger.info("Done initialising methods for " + logTag + " class " + targetClass.getCanonicalName() + "."); } public void initialiseChangers(String logTag, Class<?> sessionClass, Map<Class<?>, RequestTargetManager> targetManagerMap) { ChangeControllers vc = targetClass.getAnnotation(ChangeControllers.class); if(vc == null) return; logger.info("Initialising target changers for " + logTag + " class " + targetClass.getCanonicalName() + "."); Class<?> [] changeTargets = vc.value(); for(Class<?> newTarget : changeTargets) { RequestTargetManager newManager = targetManagerMap.get(newTarget); if(newManager == null) { logger.error("Unknown target manager class " + newTarget.getCanonicalName() + "."); stateOk = false; continue; } String entry = newManager.getEntryPoint(); if(responders.containsKey(entry)) { logger.error("Responder method " + entry + " hides target changer in " + targetClass.getCanonicalName() + "."); stateOk = false; } else if(!changers.containsKey(entry)) { ControllerChanger c = new ControllerChanger(sessionClass, targetClass, newManager); changers.put(newManager.getEntryPoint(), c); logger.info("Controller change method " + c.getName() + " creates " + c.getControllerClassName() + "."); } } logger.info("Done initialising target changers 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)."); if(changers.size() > 0) logger.info("Found " + changers.size() + " controller change method(s)."); logger.info("Entry point " + entryPoint + "."); if(!responders.containsKey(entryPoint)) { logger.error("Entry point " + entryPoint + " missing for " + logTag + " class " + targetClass.getCanonicalName() + "."); stateOk = false; } if(exitPoint != null) { logger.info("Exit point " + exitPoint + "."); if(!responders.containsKey(exitPoint)) { logger.error("Exit point " + exitPoint + " missing for " + logTag + " class " + targetClass.getCanonicalName() + "."); stateOk = false; } } if(stateOk) logger.info("Finished initialising " + logTag + " class " + targetClass.getCanonicalName() + "."); else logger.error("Errors encountered when initialising " + logTag + " class " + targetClass.getCanonicalName() + "."); initialised = true; return stateOk; } public boolean handlesRequest(String request) { return responders.containsKey(request); } public String getEntryPoint() { return entryPoint; } public String getExitPoint() { return exitPoint; } public Class<?> getTargetClass() { return targetClass; } public ControllerChanger getChanger(String request) { return changers.get(request); } public Responder getResponder(String request) { return responders.get(request); } public void addResponder(String request, Responder responder) { responders.put(request, responder); } } --- NEW FILE: ControllerChanger.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.controller; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.responses.ResponseHelper; import net.heilancoo.portal.session.Session; import net.heilancoo.portal.session.SessionCompound; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; /** * @author joerg * */ public class ControllerChanger { /* * Below enum defines the the priority for constructor/ * initialiser selection. Highest priority at the top. */ public enum InitMode { CtorSessionControllerFields(0, true), InitSessionControllerFields(0, false), CtorSessionFields(1, true), InitSessionFields(1, false), CtorSessionController(2, true), InitSessionController(2, false), CtorSession(3, true), InitSession(3, false), None(4, false); public int id; public boolean ctor; InitMode(int id, boolean ctor) { this.id = id; this.ctor = ctor; } boolean lessThan(InitMode m) { return id < m.id; } }; private final Method method; private final String name; private final Class<?> sessionClass; private Class<?> newControllerClass; private final Class<?> currentControllerClass; private InitMode initMode; private Method initialiser; private Constructor<?> constructor; public ControllerChanger(Class<?> sessionClass, Class<?> currentControllerClass, RequestTargetManager targetManager) { this.method = null; this.name = targetManager.getEntryPoint(); this.newControllerClass = targetManager.getTargetClass(); this.currentControllerClass = currentControllerClass; this.sessionClass = sessionClass; determineInitMode(); } public ControllerChanger(Method method) { this.method = method; this.name = method.getName(); this.sessionClass = method.getParameterTypes()[0]; this.currentControllerClass = method.getDeclaringClass(); determineNewControllerClass(); determineInitMode(); } /** * Find out which class the controller is of that this controller changer * method changes to. */ private void determineNewControllerClass() { ChangeController c = method.getAnnotation(ChangeController.class); newControllerClass = method.getReturnType(); if(newControllerClass.getName().equals("void") && c != null && !c.value().equals(Object.class)) newControllerClass = c.value(); } /** * Find out how instances of the new controller are initialised, if * created implicitly. */ private void determineInitMode() { InitMode cMode = InitMode.None; InitMode iMode = InitMode.None; for(Constructor<?> c : newControllerClass.getConstructors()) { Class<?> p[] = c.getParameterTypes(); if(p.length == 3 && p[0].equals(sessionClass) && p[1].equals(currentControllerClass) && p[2].equals(FormFieldContainer.class) && InitMode.CtorSessionControllerFields.lessThan(cMode)) { constructor = c; cMode = InitMode.CtorSessionControllerFields; } else if(p.length == 2 && p[0].equals(sessionClass) && p[1].equals(FormFieldContainer.class) && InitMode.CtorSessionFields.lessThan(cMode)) { constructor = c; cMode = InitMode.CtorSessionFields; } else if(p.length == 2 && p[0].equals(sessionClass) && p[1].equals(currentControllerClass) && InitMode.CtorSessionController.lessThan(cMode)) { constructor = c; cMode = InitMode.CtorSessionController; } else if(p.length == 1 && p[0].equals(sessionClass) && InitMode.CtorSession.lessThan(cMode)) { constructor = c; cMode = InitMode.CtorSession; } } for(Method m : newControllerClass.getMethods()) if(m.getName().equals("initialise")) { Class<?> p[] = m.getParameterTypes(); if(p.length == 3 && p[0].equals(sessionClass) && p[1].equals(currentControllerClass) && p[2].equals(FormFieldContainer.class) && InitMode.InitSessionControllerFields.lessThan(iMode)) { initialiser = m; iMode = InitMode.InitSessionControllerFields; } else if(p.length == 2 && p[0].equals(sessionClass) && p[1].equals(FormFieldContainer.class) && InitMode.InitSessionFields.lessThan(iMode)) { initialiser = m; iMode = InitMode.InitSessionFields; } else if(p.length == 2 && p[0].equals(sessionClass) && p[1].equals(currentControllerClass) && InitMode.InitSessionController.lessThan(iMode)) { initialiser = m; iMode = InitMode.InitSessionController; } else if(p.length == 1 && p[0].equals(sessionClass) && InitMode.InitSession.lessThan(iMode)) { initialiser = m; iMode = InitMode.InitSession; } } if(iMode.equals(InitMode.None)) initMode = cMode; else if(cMode.equals(InitMode.None)) initMode = iMode; else if(cMode.lessThan(iMode)) initMode = iMode; else initMode = cMode; } public boolean change(SessionCompound sessionCompound, FormFieldContainer fields, HttpResponse response) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException, ClassCastException, InstantiationException { RequestTarget c = sessionCompound.getController(); Session s = sessionCompound.getSession(); Object o = null; if(method != null) o = method.invoke(c, sessionClass.cast(s), fields); if(o == null) o = createNew(sessionCompound, fields); if(o == null) { ResponseHelper.error(HttpStatus.SC_INTERNAL_SERVER_ERROR, response, "Method Dispatch Failure", "Failed to dispatch method " + getName() + ".", "Controller changer does not return new controller."); return false; } else if(! (o instanceof RequestTarget)) { ResponseHelper.error(HttpStatus.SC_INTERNAL_SERVER_ERROR, response, "Method Dispatch Failure", "Failed to dispatch method " + getName() + ".", "Controller changer does not return new controller of type RequestTarget."); return false; } sessionCompound.setController((RequestTarget) o); return true; } private Object createNew(SessionCompound sc, FormFieldContainer fields) throws IllegalArgumentException, InstantiationException, IllegalAccessException, InvocationTargetException { Object o; switch(initMode) { case CtorSessionControllerFields: o = constructor.newInstance(sc.getSession(), sc.getController(), fields); break; case CtorSessionFields: o = constructor.newInstance(sc.getSession(), fields); break; case CtorSessionController: o = constructor.newInstance(sc.getSession(), sc.getController()); break; case CtorSession: o = constructor.newInstance(sc.getSession()); break; case InitSessionControllerFields: o = newControllerClass.newInstance(); initialiser.invoke(o, sc.getSession(), sc.getController(), fields); break; case InitSessionFields: o = newControllerClass.newInstance(); initialiser.invoke(o, sc.getSession(), fields); break; case InitSessionController: o = newControllerClass.newInstance(); initialiser.invoke(o, sc.getSession(), sc.getController()); break; case InitSession: o = newControllerClass.newInstance(); initialiser.invoke(o, sc.getSession()); break; default: o = null; } return o; } public String getName() { return name; } public String getControllerClassName() { return newControllerClass.getCanonicalName(); } } --- NEW FILE: ValidControllers.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.controller; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** * @author joerg * */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface ValidControllers { Class<?> [] value(); } --- NEW FILE: Request.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.controller; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** * @author joerg * */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) public @interface Request { } |
|
From: Joerg B. <jb...@us...> - 2009-05-11 16:43:17
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9944/src/net/heilancoo/portal Modified Files: PortalPlugin.java Added Files: HttpService.java MimeTypeMapper.java Log Message: one monstrous cleanup of packages -- hopefully clearer now --- NEW FILE: MimeTypeMapper.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; import java.io.BufferedReader; import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.TreeMap; import org.apache.log4j.Logger; /** * @author joerg * */ public class MimeTypeMapper { private static final Logger logger = Logger.getLogger(MimeTypeMapper.class); public class MimeItem { private final String extension; private final String type; public MimeItem(String type, String extension) { this.extension = extension; this.type = type; } public String getExtension() { return extension; } public String getType() { return type; } public String toString() { return extension + " -> " + type; } } private Map<String, String> mappedFiles; private List<MimeItem> mappings; public MimeTypeMapper() { this.mappedFiles = new HashMap<String, String>(); this.mappings = new ArrayList<MimeItem>(); } public boolean initFromFile(File configFile) { int count = 0; logger.info("Processing MIME type map file " + configFile + "."); try { BufferedReader r = new BufferedReader(new FileReader(configFile)); Map<String, MimeItem> revMap = new TreeMap<String, MimeItem>(); String line; while((line = r.readLine()) != null) { count += 1; String normalized = line.replaceAll("#.*$", "").replaceAll("[ \t]+", " ").trim(); if(normalized.length() == 0) continue; String [] comps = normalized.split(" "); if(comps.length == 1) { logger.warn("Ignoring invalid line " + count + "; \"" + line + "\"."); continue; } String type = comps[0]; for(int i = 1; i < comps.length; i++) { StringBuilder revExt = new StringBuilder(); revExt.append(comps[i]); revMap.put(revExt.reverse().toString(), new MimeItem(type, "." + comps[i])); } } List<String> keys = new ArrayList<String>(); keys.addAll(revMap.keySet()); for(int i = keys.size() - 1; i >= 0; i--) { MimeItem mi = revMap.get(keys.get(i)); logger.info("map: " + mi); mappings.add(mi); } logger.info("Collected " + mappings.size() + " item(s)."); } catch (FileNotFoundException e) { logger.error("Failed to find MIME type map file " + configFile + "."); return false; } catch (IOException e) { logger.error("Failed to read line " + (count + 1) + " of file " + configFile + ".", e); return false; } return true; } public int getNumMappings() { return mappings.size(); } public synchronized String getMimeTypeForFile(String name) { String type = mappedFiles.get(name); if(type == null) for(MimeItem i : mappings) { if(name.endsWith(i.getExtension())) { type = i.getType(); mappedFiles.put(name, type); break; } } return type; } } --- NEW FILE: HttpService.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; import java.io.IOException; import java.io.InterruptedIOException; import java.net.InetSocketAddress; import java.util.Map; import org.apache.http.impl.DefaultConnectionReuseStrategy; import org.apache.http.impl.DefaultHttpResponseFactory; import org.apache.http.impl.nio.DefaultServerIOEventDispatch; import org.apache.http.impl.nio.reactor.DefaultListeningIOReactor; import org.apache.http.nio.protocol.BufferingHttpServiceHandler; import org.apache.http.nio.reactor.IOEventDispatch; import org.apache.http.nio.reactor.ListeningIOReactor; import org.apache.http.params.BasicHttpParams; import org.apache.http.params.CoreConnectionPNames; import org.apache.http.params.CoreProtocolPNames; import org.apache.http.params.HttpParams; import org.apache.http.protocol.BasicHttpProcessor; import org.apache.http.protocol.HttpRequestHandler; import org.apache.http.protocol.HttpRequestHandlerRegistry; import org.apache.http.protocol.ResponseConnControl; import org.apache.http.protocol.ResponseContent; import org.apache.http.protocol.ResponseDate; import org.apache.http.protocol.ResponseServer; import org.apache.log4j.Logger; /** * @author joerg * */ public class HttpService implements Runnable { private static final Logger logger = Logger.getLogger(HttpService.class); Map<String, HttpRequestHandler> requestHandlerMap; public HttpService(Map<String, HttpRequestHandler> requestHandlerMap) { this.requestHandlerMap = requestHandlerMap; } public void run() { try { doTheServing(); } catch (Exception e) { logger.error(e, e); } } public void doTheServing() throws Exception { HttpParams params = new BasicHttpParams(); params .setIntParameter(CoreConnectionPNames.SO_TIMEOUT, 5000) .setIntParameter(CoreConnectionPNames.SOCKET_BUFFER_SIZE, 8 * 1024) .setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK, false) .setBooleanParameter(CoreConnectionPNames.TCP_NODELAY, true) .setParameter(CoreProtocolPNames.ORIGIN_SERVER, "Little-Portal-Gizmo/1.1"); BasicHttpProcessor httpproc = new BasicHttpProcessor(); httpproc.addInterceptor(new ResponseDate()); httpproc.addInterceptor(new ResponseServer()); httpproc.addInterceptor(new ResponseContent()); httpproc.addInterceptor(new ResponseConnControl()); BufferingHttpServiceHandler handler = new BufferingHttpServiceHandler( httpproc, new DefaultHttpResponseFactory(), new DefaultConnectionReuseStrategy(), params); // Set up request handlers HttpRequestHandlerRegistry registry = new HttpRequestHandlerRegistry(); for(Map.Entry<String, HttpRequestHandler> e : requestHandlerMap.entrySet()) { String uriPrefix = e.getKey(); HttpRequestHandler h = e.getValue(); registry.register(uriPrefix, h); } handler.setHandlerResolver(registry); // Provide an event logger handler.setEventListener(new EventLogger()); // SSLContext context = SSLContext.getInstance("SSL"); // context.init(null, null, null); // // SSLIOSessionHandler sessionHandler = null; IOEventDispatch ioEventDispatch = new DefaultServerIOEventDispatch(handler, params); //new SSLServerIOEventDispatch(handler, context, sessionHandler, params); ListeningIOReactor ioReactor = new DefaultListeningIOReactor(2, params); try { ioReactor.listen(new InetSocketAddress(8080)); ioReactor.execute(ioEventDispatch); } catch (InterruptedIOException ex) { logger.error("I/O interrupted."); } catch (IOException e) { logger.error("I/O error: " + e.getMessage(), e); } logger.info("Shutdown"); } } Index: PortalPlugin.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/PortalPlugin.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** PortalPlugin.java 10 May 2009 20:19:14 -0000 1.16 --- PortalPlugin.java 11 May 2009 16:43:11 -0000 1.17 *************** *** 25,33 **** import net.heilancoo.portal.requests.FileRequestHandler; import net.heilancoo.portal.requests.LogRequestHandler; - import net.heilancoo.portal.requests.MimeTypeMapper; import net.heilancoo.portal.requests.RequestHandler; import net.heilancoo.portal.responders.Responder; import net.heilancoo.portal.responders.ResponderFactory; - import net.heilancoo.portal.service.HttpService; import net.heilancoo.utils.Utils; --- 25,31 ---- |
|
From: Joerg B. <jb...@us...> - 2009-05-11 16:43:16
|
Update of /cvsroot/lipog/net.heilancoo.portal/META-INF In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9944/META-INF Modified Files: MANIFEST.MF Log Message: one monstrous cleanup of packages -- hopefully clearer now Index: MANIFEST.MF =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/META-INF/MANIFEST.MF,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MANIFEST.MF 10 May 2009 20:19:14 -0000 1.3 --- MANIFEST.MF 11 May 2009 16:43:12 -0000 1.4 *************** *** 13,21 **** Export-Package: net.heilancoo.portal, net.heilancoo.portal.application, net.heilancoo.portal.htmlforms, net.heilancoo.portal.requests, net.heilancoo.portal.responders, net.heilancoo.portal.responses, - net.heilancoo.portal.service, net.heilancoo.portal.session Bundle-RequiredExecutionEnvironment: JavaSE-1.6 --- 13,21 ---- Export-Package: net.heilancoo.portal, net.heilancoo.portal.application, + net.heilancoo.portal.controller, net.heilancoo.portal.htmlforms, net.heilancoo.portal.requests, net.heilancoo.portal.responders, net.heilancoo.portal.responses, net.heilancoo.portal.session Bundle-RequiredExecutionEnvironment: JavaSE-1.6 |
|
From: Joerg B. <jb...@us...> - 2009-05-11 16:43:16
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/service In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9944/src/net/heilancoo/portal/service Removed Files: OriginalFileRequestHandler.java HttpService.java Log Message: one monstrous cleanup of packages -- hopefully clearer now --- HttpService.java DELETED --- --- OriginalFileRequestHandler.java DELETED --- |
|
From: Joerg B. <jb...@us...> - 2009-05-11 16:43:16
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/requests In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9944/src/net/heilancoo/portal/requests Modified Files: FileRequestHandler.java LogRequestHandler.java Removed Files: MimeTypeMapper.java ResponseHelper.java Log Message: one monstrous cleanup of packages -- hopefully clearer now --- MimeTypeMapper.java DELETED --- Index: LogRequestHandler.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/requests/LogRequestHandler.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** LogRequestHandler.java 1 May 2009 13:30:55 -0000 1.3 --- LogRequestHandler.java 11 May 2009 16:43:11 -0000 1.4 *************** *** 14,17 **** --- 14,19 ---- import java.io.IOException; + import net.heilancoo.portal.responses.ResponseHelper; + import org.apache.http.HttpException; import org.apache.http.HttpRequest; Index: FileRequestHandler.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/requests/FileRequestHandler.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FileRequestHandler.java 1 May 2009 13:30:55 -0000 1.7 --- FileRequestHandler.java 11 May 2009 16:43:11 -0000 1.8 *************** *** 23,27 **** --- 23,29 ---- import java.util.TimeZone; + import net.heilancoo.portal.MimeTypeMapper; import net.heilancoo.portal.PortalPlugin; + import net.heilancoo.portal.responses.ResponseHelper; import net.heilancoo.utils.Utils; --- ResponseHelper.java DELETED --- |
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/responders In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9944/src/net/heilancoo/portal/responders Modified Files: ResponderFactory.java PlainResponder.java FileResponder.java Responder.java PlainResponderFactory.java Log Message: one monstrous cleanup of packages -- hopefully clearer now Index: PlainResponderFactory.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/responders/PlainResponderFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PlainResponderFactory.java 10 May 2009 20:19:14 -0000 1.1 --- PlainResponderFactory.java 11 May 2009 16:43:11 -0000 1.2 *************** *** 14,19 **** import java.lang.reflect.Method; import net.heilancoo.portal.htmlforms.FormFieldContainer; - import net.heilancoo.portal.requests.MimeTypeMapper; import org.apache.http.HttpRequest; --- 14,19 ---- import java.lang.reflect.Method; + import net.heilancoo.portal.MimeTypeMapper; import net.heilancoo.portal.htmlforms.FormFieldContainer; import org.apache.http.HttpRequest; Index: FileResponder.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/responders/FileResponder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FileResponder.java 10 May 2009 20:19:14 -0000 1.1 --- FileResponder.java 11 May 2009 16:43:11 -0000 1.2 *************** *** 15,22 **** import java.lang.reflect.InvocationTargetException; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.requests.FileRequestHandler; - import net.heilancoo.portal.requests.MimeTypeMapper; - import net.heilancoo.portal.responses.RequestTarget; import org.apache.http.HttpRequest; --- 15,22 ---- import java.lang.reflect.InvocationTargetException; + import net.heilancoo.portal.MimeTypeMapper; + import net.heilancoo.portal.controller.RequestTarget; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.requests.FileRequestHandler; import org.apache.http.HttpRequest; Index: ResponderFactory.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/responders/ResponderFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ResponderFactory.java 10 May 2009 20:19:14 -0000 1.1 --- ResponderFactory.java 11 May 2009 16:43:11 -0000 1.2 *************** *** 14,18 **** import java.lang.reflect.Method; ! import net.heilancoo.portal.requests.MimeTypeMapper; import org.osgi.framework.Bundle; --- 14,18 ---- import java.lang.reflect.Method; ! import net.heilancoo.portal.MimeTypeMapper; import org.osgi.framework.Bundle; Index: Responder.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/responders/Responder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Responder.java 10 May 2009 20:19:14 -0000 1.1 --- Responder.java 11 May 2009 16:43:11 -0000 1.2 *************** *** 14,19 **** import java.lang.reflect.Method; import net.heilancoo.portal.htmlforms.FormFieldContainer; - import net.heilancoo.portal.responses.RequestTarget; import org.apache.http.HttpRequest; --- 14,19 ---- import java.lang.reflect.Method; + import net.heilancoo.portal.controller.RequestTarget; import net.heilancoo.portal.htmlforms.FormFieldContainer; import org.apache.http.HttpRequest; Index: PlainResponder.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/responders/PlainResponder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PlainResponder.java 10 May 2009 20:19:14 -0000 1.1 --- PlainResponder.java 11 May 2009 16:43:11 -0000 1.2 *************** *** 15,20 **** import java.lang.reflect.Method; import net.heilancoo.portal.htmlforms.FormFieldContainer; - import net.heilancoo.portal.responses.RequestTarget; import org.apache.http.HttpRequest; --- 15,20 ---- import java.lang.reflect.Method; + import net.heilancoo.portal.controller.RequestTarget; import net.heilancoo.portal.htmlforms.FormFieldContainer; import org.apache.http.HttpRequest; |
|
From: Joerg B. <jb...@us...> - 2009-05-11 16:43:16
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/application In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9944/src/net/heilancoo/portal/application Modified Files: Application.java ApplicationRequestHandler.java Log Message: one monstrous cleanup of packages -- hopefully clearer now Index: Application.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/application/Application.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Application.java 1 May 2009 13:30:55 -0000 1.2 --- Application.java 11 May 2009 16:43:11 -0000 1.3 *************** *** 1,6 **** package net.heilancoo.portal.application; import net.heilancoo.portal.htmlforms.FormFieldContainer; - import net.heilancoo.portal.responses.RequestTarget; import net.heilancoo.portal.session.Session; --- 1,6 ---- package net.heilancoo.portal.application; + import net.heilancoo.portal.controller.RequestTarget; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.session.Session; Index: ApplicationRequestHandler.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/application/ApplicationRequestHandler.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ApplicationRequestHandler.java 10 May 2009 20:19:14 -0000 1.10 --- ApplicationRequestHandler.java 11 May 2009 16:43:11 -0000 1.11 *************** *** 22,40 **** import java.util.Random; import net.heilancoo.portal.PortalPlugin; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.htmlforms.FormFieldDecoder; import net.heilancoo.portal.requests.FileRequestHandler; - import net.heilancoo.portal.requests.MimeTypeMapper; - import net.heilancoo.portal.requests.ResponseHelper; import net.heilancoo.portal.responders.FileResponder; import net.heilancoo.portal.responders.Responder; ! import net.heilancoo.portal.responses.RequestTarget; ! import net.heilancoo.portal.responses.RequestTargetManager; ! import net.heilancoo.portal.session.ControllerChanger; import net.heilancoo.portal.session.KeyGenerator; import net.heilancoo.portal.session.Session; import net.heilancoo.portal.session.SessionCompound; - import net.heilancoo.portal.session.ValidControllers; import net.heilancoo.utils.Utils; --- 22,40 ---- import java.util.Random; + import net.heilancoo.portal.MimeTypeMapper; import net.heilancoo.portal.PortalPlugin; + import net.heilancoo.portal.controller.ControllerChanger; + import net.heilancoo.portal.controller.RequestTarget; + import net.heilancoo.portal.controller.RequestTargetManager; + import net.heilancoo.portal.controller.ValidControllers; import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.htmlforms.FormFieldDecoder; import net.heilancoo.portal.requests.FileRequestHandler; import net.heilancoo.portal.responders.FileResponder; import net.heilancoo.portal.responders.Responder; ! import net.heilancoo.portal.responses.ResponseHelper; import net.heilancoo.portal.session.KeyGenerator; import net.heilancoo.portal.session.Session; import net.heilancoo.portal.session.SessionCompound; import net.heilancoo.utils.Utils; |
|
From: Joerg B. <jb...@us...> - 2009-05-11 16:43:12
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/controller In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9922/src/net/heilancoo/portal/controller Log Message: Directory /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/controller added to the repository |
|
From: Joerg B. <jb...@us...> - 2009-05-10 20:19:31
|
Update of /cvsroot/lipog/net.heilancoo.portal.json/src/net/heilancoo/portal/json In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31076/src/net/heilancoo/portal/json Modified Files: JsonResponderFactory.java JsonResponder.java Log Message: created responders package Index: JsonResponderFactory.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.json/src/net/heilancoo/portal/json/JsonResponderFactory.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JsonResponderFactory.java 11 Apr 2009 14:44:00 -0000 1.4 --- JsonResponderFactory.java 10 May 2009 20:19:20 -0000 1.5 *************** *** 16,21 **** import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.requests.MimeTypeMapper; ! import net.heilancoo.portal.responses.Responder; ! import net.heilancoo.portal.responses.ResponderFactory; import org.apache.http.HttpRequest; --- 16,21 ---- import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.requests.MimeTypeMapper; ! import net.heilancoo.portal.responders.Responder; ! import net.heilancoo.portal.responders.ResponderFactory; import org.apache.http.HttpRequest; Index: JsonResponder.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.json/src/net/heilancoo/portal/json/JsonResponder.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JsonResponder.java 20 Apr 2009 18:56:22 -0000 1.5 --- JsonResponder.java 10 May 2009 20:19:20 -0000 1.6 *************** *** 16,21 **** import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.responses.RequestTarget; - import net.heilancoo.portal.responses.Responder; import org.apache.http.HttpRequest; --- 16,21 ---- import net.heilancoo.portal.htmlforms.FormFieldContainer; + import net.heilancoo.portal.responders.Responder; import net.heilancoo.portal.responses.RequestTarget; import org.apache.http.HttpRequest; |
|
From: Joerg B. <jb...@us...> - 2009-05-10 20:19:30
|
Update of /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/application In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30817/src/net/heilancoo/portal/application Modified Files: ApplicationRequestHandler.java Log Message: created responders package Index: ApplicationRequestHandler.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/application/ApplicationRequestHandler.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ApplicationRequestHandler.java 10 May 2009 19:51:37 -0000 1.9 --- ApplicationRequestHandler.java 10 May 2009 20:19:14 -0000 1.10 *************** *** 28,35 **** import net.heilancoo.portal.requests.MimeTypeMapper; import net.heilancoo.portal.requests.ResponseHelper; ! import net.heilancoo.portal.responses.FileResponder; import net.heilancoo.portal.responses.RequestTarget; import net.heilancoo.portal.responses.RequestTargetManager; - import net.heilancoo.portal.responses.Responder; import net.heilancoo.portal.session.ControllerChanger; import net.heilancoo.portal.session.KeyGenerator; --- 28,35 ---- import net.heilancoo.portal.requests.MimeTypeMapper; import net.heilancoo.portal.requests.ResponseHelper; ! import net.heilancoo.portal.responders.FileResponder; ! import net.heilancoo.portal.responders.Responder; import net.heilancoo.portal.responses.RequestTarget; import net.heilancoo.portal.responses.RequestTargetManager; import net.heilancoo.portal.session.ControllerChanger; import net.heilancoo.portal.session.KeyGenerator; |
|
From: Joerg B. <jb...@us...> - 2009-05-10 20:19:28
|
Update of /cvsroot/lipog/net.heilancoo.portal.freemarker/src/net/heilancoo/portal/freemarker In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31066/src/net/heilancoo/portal/freemarker Modified Files: FreeMarkerResponder.java FreeMarkerResponderFactory.java Log Message: created responders package Index: FreeMarkerResponder.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.freemarker/src/net/heilancoo/portal/freemarker/FreeMarkerResponder.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** FreeMarkerResponder.java 20 Apr 2009 18:56:19 -0000 1.8 --- FreeMarkerResponder.java 10 May 2009 20:19:17 -0000 1.9 *************** *** 20,27 **** import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.requests.MimeTypeMapper; import net.heilancoo.portal.responses.DefaultResponseFormat; import net.heilancoo.portal.responses.RequestTarget; - import net.heilancoo.portal.responses.Responder; - import net.heilancoo.portal.responses.ResponderCreationException; import net.heilancoo.portal.responses.ResponseTemplateFolder; import net.heilancoo.portal.responses.ValidResponseFormats; --- 20,27 ---- import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.requests.MimeTypeMapper; + import net.heilancoo.portal.responders.Responder; + import net.heilancoo.portal.responders.ResponderCreationException; import net.heilancoo.portal.responses.DefaultResponseFormat; import net.heilancoo.portal.responses.RequestTarget; import net.heilancoo.portal.responses.ResponseTemplateFolder; import net.heilancoo.portal.responses.ValidResponseFormats; Index: FreeMarkerResponderFactory.java =================================================================== RCS file: /cvsroot/lipog/net.heilancoo.portal.freemarker/src/net/heilancoo/portal/freemarker/FreeMarkerResponderFactory.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FreeMarkerResponderFactory.java 11 Apr 2009 14:43:59 -0000 1.5 --- FreeMarkerResponderFactory.java 10 May 2009 20:19:17 -0000 1.6 *************** *** 16,22 **** import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.requests.MimeTypeMapper; ! import net.heilancoo.portal.responses.Responder; ! import net.heilancoo.portal.responses.ResponderCreationException; ! import net.heilancoo.portal.responses.ResponderFactory; import org.apache.http.HttpRequest; --- 16,22 ---- import net.heilancoo.portal.htmlforms.FormFieldContainer; import net.heilancoo.portal.requests.MimeTypeMapper; ! import net.heilancoo.portal.responders.Responder; ! import net.heilancoo.portal.responders.ResponderCreationException; ! import net.heilancoo.portal.responders.ResponderFactory; import org.apache.http.HttpRequest; |
