[Wikitty-commits] r1132 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication java/org/nuiton/wikitty/publication/ui java/org/nuiton/wikitty/publication/ui/action java/org/nuiton/wikitty/publication/ui/interceptor resources webapp/WEB-INF webapp/WEB-INF/jsp

Author: mfortun Date: 2011-08-12 15:13:53 +0200 (Fri, 12 Aug 2011) New Revision: 1132 Url: http://nuiton.org/repositories/revision/wikitty/1132 Log: *move ui specific class to ui package Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/ApplicationListener.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/CodeMirrorWrapper.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/SelectOption.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationConfig.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationProxy.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/interceptor/ Removed: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ApplicationListener.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/SelectOption.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/interceptor/ Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEdit.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogin.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogout.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRaw.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRegister.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRestoreWikitty.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionView.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationContext.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/interceptor/LoginInterceptor.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/interceptor/LogoutInterceptor.java trunk/wikitty-publication/src/main/resources/struts.xml trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/login.jsp trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp trunk/wikitty-publication/src/main/webapp/WEB-INF/web.xml Deleted: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ApplicationListener.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ApplicationListener.java 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ApplicationListener.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,40 +0,0 @@ -package org.nuiton.wikitty.publication; - -import java.util.Locale; - -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.i18n.I18n; -import org.nuiton.i18n.init.DefaultI18nInitializer; -import org.nuiton.i18n.init.I18nInitializer; - -public class ApplicationListener implements ServletContextListener { - - private static final Log log = LogFactory.getLog(ApplicationListener.class); - - @Override - public void contextInitialized(ServletContextEvent sce) { - - - if (log.isInfoEnabled()) { - log.info("Initializing I18n..."); - } - - I18nInitializer initializer = new DefaultI18nInitializer( - "wikitty-publication"); - - initializer.setMissingKeyReturnNull(true); - - I18n.init(initializer, Locale.FRENCH); - - } - - @Override - public void contextDestroyed(ServletContextEvent sce) { - - } - -} Deleted: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,157 +0,0 @@ -package org.nuiton.wikitty.publication; - -import java.util.LinkedList; -import java.util.List; - -/** - * class used as a collection of option and param to fill edit page with - * -codemirror css and script and supported langages - * - * @author mfortun - * - */ -public class CodeMirrorWrapper { - - // /wikitty-publication/js/codemirror-ui/lib/CodeMirror-2.0/mode - - protected String servContext; - protected String pathToCodeMirrorModeDir; - protected String pathToCodeMirorUi; - protected List<String> codeMirrorCssImport = new LinkedList<String>(); - protected List<String> codeMirrorScriptImport = new LinkedList<String>(); - - protected List<SelectOption> langages = new LinkedList<SelectOption>(); - - public CodeMirrorWrapper(String servContext, String pathToCodeMirorUi, - String pathToCodeMirrorModeDire) { - this.servContext = servContext; - this.pathToCodeMirorUi = pathToCodeMirorUi; - pathToCodeMirrorModeDir = pathToCodeMirorUi - + pathToCodeMirrorModeDire; - // TODO mfortun-2011-05-30 maybe change this - - codeMirrorScriptImport.add(servContext + pathToCodeMirorUi - + "lib/CodeMirror-2.0/lib/codemirror.js"); - codeMirrorScriptImport.add(servContext + pathToCodeMirorUi - + "js/codemirror-ui.js"); - - codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir - + "/javascript/javascript.js"); - codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir - + "/clike/clike.js"); - codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir - + "/css/css.js"); - codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir - + "/diff/diff.js"); - codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir - + "/haskell/haskell.js"); - codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir - + "/htmlmixed/htmlmixed.js"); - codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir - + "/php/php.js"); - codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir - + "/stex/stex.js"); - - codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir - + "/xml/xml.js"); - - codeMirrorCssImport.add(servContext + pathToCodeMirorUi - + "css/codemirror-ui.css"); - - codeMirrorCssImport.add(servContext + pathToCodeMirorUi - + "lib/CodeMirror-2.0/lib/codemirror.css"); - - codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir - + "/diff/diff.css"); - codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir - + "/stex/stex.css"); - codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir - + "/haskell/haskell.css"); - codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir - + "/css/css.css"); - codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir + "" - + "/clike/clike.css"); - codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir - + "/javascript/javascript.css"); - codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir - + "/xml/xml.css"); - - langages.add(new SelectOption("clike", "clike", false)); - langages.add(new SelectOption("javascript", "javascript", false)); - langages.add(new SelectOption("css", "css", false)); - langages.add(new SelectOption("diff", "diff", false)); - langages.add(new SelectOption("haskell", "haskell", false)); - langages.add(new SelectOption("htmlmixed", "htmlmixed", false)); - langages.add(new SelectOption("stex", "stex", false)); - langages.add(new SelectOption("php", "php", false)); - langages.add(new SelectOption("xml", "xml", false)); - } - - public String modeForMime(String mime) { - // TODO mfortun-2011-05-30 really implements this - if (mime != null) { - for (SelectOption opt : langages) { - if (mime.endsWith(opt.value)) { - return opt.value; - } - - } - } - return "javascript"; - } - - public String getPathToCodeMirorUiJs() { - return servContext + pathToCodeMirorUi + "/js/"; - } - - public String getPathToCodeMirorUi() { - return pathToCodeMirorUi; - } - - public void setPathToCodeMirorUi(String pathToCodeMirorUi) { - this.pathToCodeMirorUi = pathToCodeMirorUi; - } - - public String getServContext() { - return servContext; - } - - public void setServContext(String servContext) { - this.servContext = servContext; - } - - public String getPathToCodeMirrorModeDir() { - return pathToCodeMirrorModeDir; - } - - public void setPathToCodeMirrorModeDir(String pathToCodeMirrorModeDir) { - this.pathToCodeMirrorModeDir = pathToCodeMirrorModeDir; - } - - public List<String> getCodeMirrorCssImport() { - return codeMirrorCssImport; - } - - public void setCodeMirrorCssImport(List<String> codeMirrorCssImport) { - this.codeMirrorCssImport = codeMirrorCssImport; - } - - public List<String> getCodeMirrorScriptImport() { - return codeMirrorScriptImport; - } - - public void setCodeMirrorScriptImport(List<String> codeMirrorScriptImport) { - this.codeMirrorScriptImport = codeMirrorScriptImport; - } - - public List<SelectOption> getLangages() { - return langages; - } - - public void setLangages(List<SelectOption> langages) { - this.langages = langages; - } - - - -} Deleted: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/SelectOption.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/SelectOption.java 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/SelectOption.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,45 +0,0 @@ -package org.nuiton.wikitty.publication; - -/** - * Class used inside view page to load langage supported by code mirror - * @author mfortun - * - */ -public class SelectOption { - - protected String value; - protected String desc; - - protected boolean isSelected; - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - public String getDesc() { - return desc; - } - - public void setDesc(String desc) { - this.desc = desc; - } - - public boolean isSelected() { - return isSelected; - } - - public void setSelected(boolean isSelected) { - this.isSelected = isSelected; - } - - public SelectOption(String value, String desc, boolean isSelected) { - this.value = value; - this.desc = desc; - this.isSelected = isSelected; - } - -} Deleted: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,151 +0,0 @@ -package org.nuiton.wikitty.publication; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.ArgumentsParserException; -import org.nuiton.wikitty.WikittyConfig; -import org.nuiton.wikitty.WikittyConfigOption; - -import java.io.File; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - -import static org.nuiton.i18n.I18n._; - -public class WikittyPublicationConfig { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(WikittyPublicationConfig.class); - - static final public String CONFIG_FILE_KEY = "wikitty.publication.config.pattern"; - static final public String DEFAULT_FILE_COMPLEMENT = "default"; - static protected Map<String, ApplicationConfig> instanceMap = new HashMap<String, ApplicationConfig>(); - - private WikittyPublicationConfig() { - - } - - static public ApplicationConfig getConfig(String Context) { - return getConfig(null, null, Context); - } - - static public ApplicationConfig getConfig(Properties props, - String configFilename, String wsContext, String... args) { - - ApplicationConfig conf = new ApplicationConfig(Option.class, null, - props, configFilename); - try { - conf.parse(); - } catch (ArgumentsParserException e) { - e.printStackTrace(); - } - - String patternConfigFilename = conf.getOption(CONFIG_FILE_KEY); - - // load default configuration for all wikitty service - String filename = String.format(patternConfigFilename, - DEFAULT_FILE_COMPLEMENT); - log.info(String.format("Try to load config file '%s'", filename)); - ApplicationConfig wsConfigDefault; - - wsConfigDefault = WikittyConfig.getConfig(filename); - - // change just data dir with context path - String dataDir = wsConfigDefault - .getOption(WikittyConfigOption.WIKITTY_DATA_DIR.getKey()); - wsConfigDefault.setOption( - WikittyConfigOption.WIKITTY_DATA_DIR.getKey(), dataDir - + File.separator + wsContext); - - // read specific configuration with default config as default properties - filename = String.format(patternConfigFilename, wsContext); - log.info(String.format("Try to load config file '%s'", filename)); - ApplicationConfig wsConfig = null; - try { - wsConfig = new ApplicationConfig( - wsConfigDefault.getFlatOptions(false)); - wsConfig.setConfigFileName(filename); - wsConfig.parse(null); - } catch (ArgumentsParserException eee) { - if (log.isErrorEnabled()) { - log.error("Can't load Wikitty Publication configuration", eee); - } - } - - return wsConfig; - } - - public static ApplicationConfig getInstance(String context) { - if (!instanceMap.containsKey(context)) { - synchronized (WikittyPublicationConfig.class) { - if (!instanceMap.containsKey(context)) { - instanceMap.put(context, - getConfig(context)); - } - } - } - return instanceMap.get(context); - } - - public enum Option implements ApplicationConfig.OptionDef { - CONFIG_FILE(ApplicationConfig.CONFIG_FILE_NAME, - _("wikitty-publication.config.configFileName.description"), - "wikitty-publication.properties", String.class, false, false); - - public final String key; - public final String description; - public String defaultValue; - public final Class<?> type; - public boolean isTransient; - public boolean isFinal; - - Option(String key, String description, String defaultValue, - Class<?> type, boolean isTransient, boolean isFinal) { - this.key = key; - this.description = description; - this.defaultValue = defaultValue; - this.type = type; - this.isFinal = isFinal; - this.isTransient = isTransient; - } - - public String getKey() { - return key; - } - - public Class<?> getType() { - return type; - } - - public String getDescription() { - return description; - } - - public String getDefaultValue() { - return defaultValue; - } - - public boolean isTransient() { - return isTransient; - } - - public boolean isFinal() { - return isFinal; - } - - public void setDefaultValue(String defaultValue) { - this.defaultValue = defaultValue; - } - - public void setTransient(boolean isTransient) { - this.isTransient = isTransient; - } - - public void setFinal(boolean isFinal) { - this.isFinal = isFinal; - } - } - -} Deleted: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,56 +0,0 @@ -package org.nuiton.wikitty.publication; - -import java.util.HashMap; -import java.util.Map; - -import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.WikittyService; -import org.nuiton.wikitty.WikittyServiceFactory; - -/** - * Proxy implementation for wikitty publication, that handle instance of the - * wikitty service - * - * @author mfortun - * - */ -public class WikittyPublicationProxy extends WikittyProxy { - - /** - * - */ - private static final long serialVersionUID = -568462410130999972L; - - static protected Map<String, WikittyService> mapService = new HashMap<String, WikittyService>(); - - private WikittyPublicationProxy(ApplicationConfig config, WikittyService ws) { - super(config, ws); - - } - - static public WikittyPublicationProxy getInstance(String token, - String context) { - ApplicationConfig config = WikittyPublicationConfig - .getInstance(context); - WikittyService ws = getWikittyService(config, context); - WikittyPublicationProxy result = new WikittyPublicationProxy(config, ws); - result.setSecurityToken(token); - - return result; - } - - static protected WikittyService getWikittyService(ApplicationConfig config, - String context) { - if (!mapService.containsKey(context)) { - synchronized (WikittyPublicationProxy.class) { - if (!mapService.containsKey(context)) { - mapService.put(context, - WikittyServiceFactory.buildWikittyService(config)); - } - } - } - return mapService.get(context); - } - -} Deleted: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,114 +0,0 @@ -package org.nuiton.wikitty.publication; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.wikitty.entities.WikittyUser; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import java.io.Serializable; -import java.util.Map; - -public class WikittyPublicationSession implements Serializable { - - /** - * - */ - private static final long serialVersionUID = -3092501094068386098L; - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(WikittyPublicationSession.class); - - static final private String WIKITTY_PUBLICATION_SESSION_KEY = WikittyPublicationSession.class - .getSimpleName(); - - static final private String WIKITTY_PUBLICATION_SESSION_SEP = "_"; - - protected String securityToken = null; - transient protected WikittyUser user; - transient protected WikittyPublicationProxy proxy; - transient protected String context; - - public WikittyPublicationSession(String context) { - this.context = context; - proxy = WikittyPublicationProxy.getInstance(null, context); - } - - /** - * remove wikittypublicationSession from the httpsession - * - * @param session - */ - static public void invalidate(Map<String, Object> session, - String contextData) { - session.remove(WIKITTY_PUBLICATION_SESSION_KEY - + WIKITTY_PUBLICATION_SESSION_SEP + contextData); - } - - static public WikittyPublicationSession getWikittyPublicationSession( - HttpServletRequest request, String context) { - HttpSession session = request.getSession(); - WikittyPublicationSession result = getWikittyPublicationSession( - session, context); - return result; - } - - static public WikittyPublicationSession getWikittyPublicationSession( - HttpSession httpSession, String contextData) { - WikittyPublicationSession result = (WikittyPublicationSession) httpSession - .getAttribute(WIKITTY_PUBLICATION_SESSION_KEY - + WIKITTY_PUBLICATION_SESSION_SEP + contextData); - if (result == null || !result.getContext().equals(contextData)) { - result = new WikittyPublicationSession(contextData); - httpSession.setAttribute(WIKITTY_PUBLICATION_SESSION_KEY - + WIKITTY_PUBLICATION_SESSION_SEP + contextData, result); - } - return result; - } - - static public WikittyPublicationSession getWikittyPublicationSession( - Map<String, Object> session, String contextData) { - WikittyPublicationSession result = (WikittyPublicationSession) session - .get(WIKITTY_PUBLICATION_SESSION_KEY - + WIKITTY_PUBLICATION_SESSION_SEP + contextData); - if (result == null || !result.getContext().equals(contextData)) { - result = new WikittyPublicationSession(contextData); - session.put(WIKITTY_PUBLICATION_SESSION_KEY - + WIKITTY_PUBLICATION_SESSION_SEP + contextData, result); - } - return result; - } - - public void login(String context, String login, String password) { - WikittyPublicationProxy proxy = getProxy(context); - proxy.login(login, password); - securityToken = proxy.getSecurityToken(); - user = proxy.getUser(); - - } - - public WikittyPublicationProxy getProxy(String context) { - if (proxy == null) { - proxy = WikittyPublicationProxy.getInstance(securityToken, context); - } - return proxy; - - } - - public WikittyUser getUser() { - return user; - } - - public void setUser(WikittyUser user) { - this.user = user; - } - - public String getContext() { - return context; - } - - public void setContext(String context) { - this.context = context; - } - -} Copied: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/ApplicationListener.java (from rev 1130, trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ApplicationListener.java) =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/ApplicationListener.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/ApplicationListener.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -0,0 +1,40 @@ +package org.nuiton.wikitty.publication.ui; + +import java.util.Locale; + +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.DefaultI18nInitializer; +import org.nuiton.i18n.init.I18nInitializer; + +public class ApplicationListener implements ServletContextListener { + + private static final Log log = LogFactory.getLog(ApplicationListener.class); + + @Override + public void contextInitialized(ServletContextEvent sce) { + + + if (log.isInfoEnabled()) { + log.info("Initializing I18n..."); + } + + I18nInitializer initializer = new DefaultI18nInitializer( + "wikitty-publication"); + + initializer.setMissingKeyReturnNull(true); + + I18n.init(initializer, Locale.FRENCH); + + } + + @Override + public void contextDestroyed(ServletContextEvent sce) { + + } + +} Copied: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/CodeMirrorWrapper.java (from rev 1130, trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java) =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/CodeMirrorWrapper.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/CodeMirrorWrapper.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -0,0 +1,157 @@ +package org.nuiton.wikitty.publication.ui; + +import java.util.LinkedList; +import java.util.List; + +/** + * class used as a collection of option and param to fill edit page with + * -codemirror css and script and supported langages + * + * @author mfortun + * + */ +public class CodeMirrorWrapper { + + // /wikitty-publication/js/codemirror-ui/lib/CodeMirror-2.0/mode + + protected String servContext; + protected String pathToCodeMirrorModeDir; + protected String pathToCodeMirorUi; + protected List<String> codeMirrorCssImport = new LinkedList<String>(); + protected List<String> codeMirrorScriptImport = new LinkedList<String>(); + + protected List<SelectOption> langages = new LinkedList<SelectOption>(); + + public CodeMirrorWrapper(String servContext, String pathToCodeMirorUi, + String pathToCodeMirrorModeDire) { + this.servContext = servContext; + this.pathToCodeMirorUi = pathToCodeMirorUi; + pathToCodeMirrorModeDir = pathToCodeMirorUi + + pathToCodeMirrorModeDire; + // TODO mfortun-2011-05-30 maybe change this + + codeMirrorScriptImport.add(servContext + pathToCodeMirorUi + + "lib/CodeMirror-2.0/lib/codemirror.js"); + codeMirrorScriptImport.add(servContext + pathToCodeMirorUi + + "js/codemirror-ui.js"); + + codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir + + "/javascript/javascript.js"); + codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir + + "/clike/clike.js"); + codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir + + "/css/css.js"); + codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir + + "/diff/diff.js"); + codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir + + "/haskell/haskell.js"); + codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir + + "/htmlmixed/htmlmixed.js"); + codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir + + "/php/php.js"); + codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir + + "/stex/stex.js"); + + codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir + + "/xml/xml.js"); + + codeMirrorCssImport.add(servContext + pathToCodeMirorUi + + "css/codemirror-ui.css"); + + codeMirrorCssImport.add(servContext + pathToCodeMirorUi + + "lib/CodeMirror-2.0/lib/codemirror.css"); + + codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir + + "/diff/diff.css"); + codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir + + "/stex/stex.css"); + codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir + + "/haskell/haskell.css"); + codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir + + "/css/css.css"); + codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir + "" + + "/clike/clike.css"); + codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir + + "/javascript/javascript.css"); + codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir + + "/xml/xml.css"); + + langages.add(new SelectOption("clike", "clike", false)); + langages.add(new SelectOption("javascript", "javascript", false)); + langages.add(new SelectOption("css", "css", false)); + langages.add(new SelectOption("diff", "diff", false)); + langages.add(new SelectOption("haskell", "haskell", false)); + langages.add(new SelectOption("htmlmixed", "htmlmixed", false)); + langages.add(new SelectOption("stex", "stex", false)); + langages.add(new SelectOption("php", "php", false)); + langages.add(new SelectOption("xml", "xml", false)); + } + + public String modeForMime(String mime) { + // TODO mfortun-2011-05-30 really implements this + if (mime != null) { + for (SelectOption opt : langages) { + if (mime.endsWith(opt.value)) { + return opt.value; + } + + } + } + return "javascript"; + } + + public String getPathToCodeMirorUiJs() { + return servContext + pathToCodeMirorUi + "/js/"; + } + + public String getPathToCodeMirorUi() { + return pathToCodeMirorUi; + } + + public void setPathToCodeMirorUi(String pathToCodeMirorUi) { + this.pathToCodeMirorUi = pathToCodeMirorUi; + } + + public String getServContext() { + return servContext; + } + + public void setServContext(String servContext) { + this.servContext = servContext; + } + + public String getPathToCodeMirrorModeDir() { + return pathToCodeMirrorModeDir; + } + + public void setPathToCodeMirrorModeDir(String pathToCodeMirrorModeDir) { + this.pathToCodeMirrorModeDir = pathToCodeMirrorModeDir; + } + + public List<String> getCodeMirrorCssImport() { + return codeMirrorCssImport; + } + + public void setCodeMirrorCssImport(List<String> codeMirrorCssImport) { + this.codeMirrorCssImport = codeMirrorCssImport; + } + + public List<String> getCodeMirrorScriptImport() { + return codeMirrorScriptImport; + } + + public void setCodeMirrorScriptImport(List<String> codeMirrorScriptImport) { + this.codeMirrorScriptImport = codeMirrorScriptImport; + } + + public List<SelectOption> getLangages() { + return langages; + } + + public void setLangages(List<SelectOption> langages) { + this.langages = langages; + } + + + +} Copied: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/SelectOption.java (from rev 1130, trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/SelectOption.java) =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/SelectOption.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/SelectOption.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -0,0 +1,45 @@ +package org.nuiton.wikitty.publication.ui; + +/** + * Class used inside view page to load langage supported by code mirror + * @author mfortun + * + */ +public class SelectOption { + + protected String value; + protected String desc; + + protected boolean isSelected; + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } + + public boolean isSelected() { + return isSelected; + } + + public void setSelected(boolean isSelected) { + this.isSelected = isSelected; + } + + public SelectOption(String value, String desc, boolean isSelected) { + this.value = value; + this.desc = desc; + this.isSelected = isSelected; + } + +} Copied: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationConfig.java (from rev 1130, trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java) =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationConfig.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationConfig.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -0,0 +1,151 @@ +package org.nuiton.wikitty.publication.ui; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.ArgumentsParserException; +import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; + +import java.io.File; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import static org.nuiton.i18n.I18n._; + +public class WikittyPublicationConfig { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyPublicationConfig.class); + + static final public String CONFIG_FILE_KEY = "wikitty.publication.config.pattern"; + static final public String DEFAULT_FILE_COMPLEMENT = "default"; + static protected Map<String, ApplicationConfig> instanceMap = new HashMap<String, ApplicationConfig>(); + + private WikittyPublicationConfig() { + + } + + static public ApplicationConfig getConfig(String Context) { + return getConfig(null, null, Context); + } + + static public ApplicationConfig getConfig(Properties props, + String configFilename, String wsContext, String... args) { + + ApplicationConfig conf = new ApplicationConfig(Option.class, null, + props, configFilename); + try { + conf.parse(); + } catch (ArgumentsParserException e) { + e.printStackTrace(); + } + + String patternConfigFilename = conf.getOption(CONFIG_FILE_KEY); + + // load default configuration for all wikitty service + String filename = String.format(patternConfigFilename, + DEFAULT_FILE_COMPLEMENT); + log.info(String.format("Try to load config file '%s'", filename)); + ApplicationConfig wsConfigDefault; + + wsConfigDefault = WikittyConfig.getConfig(filename); + + // change just data dir with context path + String dataDir = wsConfigDefault + .getOption(WikittyConfigOption.WIKITTY_DATA_DIR.getKey()); + wsConfigDefault.setOption( + WikittyConfigOption.WIKITTY_DATA_DIR.getKey(), dataDir + + File.separator + wsContext); + + // read specific configuration with default config as default properties + filename = String.format(patternConfigFilename, wsContext); + log.info(String.format("Try to load config file '%s'", filename)); + ApplicationConfig wsConfig = null; + try { + wsConfig = new ApplicationConfig( + wsConfigDefault.getFlatOptions(false)); + wsConfig.setConfigFileName(filename); + wsConfig.parse(null); + } catch (ArgumentsParserException eee) { + if (log.isErrorEnabled()) { + log.error("Can't load Wikitty Publication configuration", eee); + } + } + + return wsConfig; + } + + public static ApplicationConfig getInstance(String context) { + if (!instanceMap.containsKey(context)) { + synchronized (WikittyPublicationConfig.class) { + if (!instanceMap.containsKey(context)) { + instanceMap.put(context, + getConfig(context)); + } + } + } + return instanceMap.get(context); + } + + public enum Option implements ApplicationConfig.OptionDef { + CONFIG_FILE(ApplicationConfig.CONFIG_FILE_NAME, + _("wikitty-publication.config.configFileName.description"), + "wikitty-publication.properties", String.class, false, false); + + public final String key; + public final String description; + public String defaultValue; + public final Class<?> type; + public boolean isTransient; + public boolean isFinal; + + Option(String key, String description, String defaultValue, + Class<?> type, boolean isTransient, boolean isFinal) { + this.key = key; + this.description = description; + this.defaultValue = defaultValue; + this.type = type; + this.isFinal = isFinal; + this.isTransient = isTransient; + } + + public String getKey() { + return key; + } + + public Class<?> getType() { + return type; + } + + public String getDescription() { + return description; + } + + public String getDefaultValue() { + return defaultValue; + } + + public boolean isTransient() { + return isTransient; + } + + public boolean isFinal() { + return isFinal; + } + + public void setDefaultValue(String defaultValue) { + this.defaultValue = defaultValue; + } + + public void setTransient(boolean isTransient) { + this.isTransient = isTransient; + } + + public void setFinal(boolean isFinal) { + this.isFinal = isFinal; + } + } + +} Copied: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationProxy.java (from rev 1130, trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java) =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationProxy.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationProxy.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -0,0 +1,56 @@ +package org.nuiton.wikitty.publication.ui; + +import java.util.HashMap; +import java.util.Map; + +import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.WikittyServiceFactory; + +/** + * Proxy implementation for wikitty publication, that handle instance of the + * wikitty service + * + * @author mfortun + * + */ +public class WikittyPublicationProxy extends WikittyProxy { + + /** + * + */ + private static final long serialVersionUID = -568462410130999972L; + + static protected Map<String, WikittyService> mapService = new HashMap<String, WikittyService>(); + + private WikittyPublicationProxy(ApplicationConfig config, WikittyService ws) { + super(config, ws); + + } + + static public WikittyPublicationProxy getInstance(String token, + String context) { + ApplicationConfig config = WikittyPublicationConfig + .getInstance(context); + WikittyService ws = getWikittyService(config, context); + WikittyPublicationProxy result = new WikittyPublicationProxy(config, ws); + result.setSecurityToken(token); + + return result; + } + + static protected WikittyService getWikittyService(ApplicationConfig config, + String context) { + if (!mapService.containsKey(context)) { + synchronized (WikittyPublicationProxy.class) { + if (!mapService.containsKey(context)) { + mapService.put(context, + WikittyServiceFactory.buildWikittyService(config)); + } + } + } + return mapService.get(context); + } + +} Copied: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java (from rev 1130, trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java) =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -0,0 +1,114 @@ +package org.nuiton.wikitty.publication.ui; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.wikitty.entities.WikittyUser; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import java.io.Serializable; +import java.util.Map; + +public class WikittyPublicationSession implements Serializable { + + /** + * + */ + private static final long serialVersionUID = -3092501094068386098L; + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyPublicationSession.class); + + static final private String WIKITTY_PUBLICATION_SESSION_KEY = WikittyPublicationSession.class + .getSimpleName(); + + static final private String WIKITTY_PUBLICATION_SESSION_SEP = "_"; + + protected String securityToken = null; + transient protected WikittyUser user; + transient protected WikittyPublicationProxy proxy; + transient protected String context; + + public WikittyPublicationSession(String context) { + this.context = context; + proxy = WikittyPublicationProxy.getInstance(null, context); + } + + /** + * remove wikittypublicationSession from the httpsession + * + * @param session + */ + static public void invalidate(Map<String, Object> session, + String contextData) { + session.remove(WIKITTY_PUBLICATION_SESSION_KEY + + WIKITTY_PUBLICATION_SESSION_SEP + contextData); + } + + static public WikittyPublicationSession getWikittyPublicationSession( + HttpServletRequest request, String context) { + HttpSession session = request.getSession(); + WikittyPublicationSession result = getWikittyPublicationSession( + session, context); + return result; + } + + static public WikittyPublicationSession getWikittyPublicationSession( + HttpSession httpSession, String contextData) { + WikittyPublicationSession result = (WikittyPublicationSession) httpSession + .getAttribute(WIKITTY_PUBLICATION_SESSION_KEY + + WIKITTY_PUBLICATION_SESSION_SEP + contextData); + if (result == null || !result.getContext().equals(contextData)) { + result = new WikittyPublicationSession(contextData); + httpSession.setAttribute(WIKITTY_PUBLICATION_SESSION_KEY + + WIKITTY_PUBLICATION_SESSION_SEP + contextData, result); + } + return result; + } + + static public WikittyPublicationSession getWikittyPublicationSession( + Map<String, Object> session, String contextData) { + WikittyPublicationSession result = (WikittyPublicationSession) session + .get(WIKITTY_PUBLICATION_SESSION_KEY + + WIKITTY_PUBLICATION_SESSION_SEP + contextData); + if (result == null || !result.getContext().equals(contextData)) { + result = new WikittyPublicationSession(contextData); + session.put(WIKITTY_PUBLICATION_SESSION_KEY + + WIKITTY_PUBLICATION_SESSION_SEP + contextData, result); + } + return result; + } + + public void login(String context, String login, String password) { + WikittyPublicationProxy proxy = getProxy(context); + proxy.login(login, password); + securityToken = proxy.getSecurityToken(); + user = proxy.getUser(); + + } + + public WikittyPublicationProxy getProxy(String context) { + if (proxy == null) { + proxy = WikittyPublicationProxy.getInstance(securityToken, context); + } + return proxy; + + } + + public WikittyUser getUser() { + return user; + } + + public void setUser(WikittyUser user) { + this.user = user; + } + + public String getContext() { + return context; + } + + public void setContext(String context) { + this.context = context; + } + +} Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEdit.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEdit.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,4 +1,4 @@ -package org.nuiton.wikitty.publication.action; +package org.nuiton.wikitty.publication.ui.action; import com.opensymphony.xwork2.ActionContext; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,4 +1,4 @@ -package org.nuiton.wikitty.publication.action; +package org.nuiton.wikitty.publication.ui.action; import com.opensymphony.xwork2.ActionContext; import org.apache.commons.logging.Log; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogin.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogin.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogin.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -22,7 +22,7 @@ * #L% */ -package org.nuiton.wikitty.publication.action; +package org.nuiton.wikitty.publication.ui.action; import org.nuiton.util.StringUtil; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogout.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogout.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogout.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -21,9 +21,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package org.nuiton.wikitty.publication.action; +package org.nuiton.wikitty.publication.ui.action; -import org.nuiton.wikitty.publication.WikittyPublicationSession; +import org.nuiton.wikitty.publication.ui.WikittyPublicationSession; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRaw.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRaw.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRaw.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,11 +1,10 @@ -package org.nuiton.wikitty.publication.action; +package org.nuiton.wikitty.publication.ui.action; - import com.opensymphony.xwork2.ActionContext; import org.apache.struts2.interceptor.ServletResponseAware; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.publication.WikittyPublicationProxy; +import org.nuiton.wikitty.publication.ui.WikittyPublicationProxy; import org.nuiton.wikitty.publication.entities.WikittyPubData; import org.nuiton.wikitty.publication.entities.WikittyPubDataHelper; import org.nuiton.wikitty.publication.entities.WikittyPubText; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRegister.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRegister.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRegister.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,4 +1,4 @@ -package org.nuiton.wikitty.publication.action; +package org.nuiton.wikitty.publication.ui.action; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.WikittyProxy; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRestoreWikitty.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRestoreWikitty.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRestoreWikitty.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,4 +1,4 @@ -package org.nuiton.wikitty.publication.action; +package org.nuiton.wikitty.publication.ui.action; import org.nuiton.wikitty.entities.Wikitty; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionView.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionView.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,10 +1,10 @@ -package org.nuiton.wikitty.publication.action; +package org.nuiton.wikitty.publication.ui.action; import com.opensymphony.xwork2.ActionContext; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyLabel; -import org.nuiton.wikitty.publication.WikittyPublicationProxy; +import org.nuiton.wikitty.publication.ui.WikittyPublicationProxy; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,13 +1,13 @@ -package org.nuiton.wikitty.publication.action; +package org.nuiton.wikitty.publication.ui.action; import com.opensymphony.xwork2.ActionContext; import org.apache.struts2.interceptor.SessionAware; import org.nuiton.web.struts2.BaseAction; import org.nuiton.wikitty.entities.WikittyLabel; -import org.nuiton.wikitty.publication.WikittyPublicationProxy; -import org.nuiton.wikitty.publication.WikittyPublicationSession; import org.nuiton.wikitty.publication.entities.WikittyPubData; import org.nuiton.wikitty.publication.entities.WikittyPubText; +import org.nuiton.wikitty.publication.ui.WikittyPublicationProxy; +import org.nuiton.wikitty.publication.ui.WikittyPublicationSession; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.Search; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationContext.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationContext.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationContext.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,4 +1,4 @@ -package org.nuiton.wikitty.publication.action; +package org.nuiton.wikitty.publication.ui.action; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/interceptor/LoginInterceptor.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/interceptor/LoginInterceptor.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/interceptor/LoginInterceptor.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -21,14 +21,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package org.nuiton.wikitty.publication.interceptor; +package org.nuiton.wikitty.publication.ui.interceptor; import java.util.Map; import javax.servlet.http.HttpServletRequest; import org.apache.struts2.ServletActionContext; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.entities.WikittyUser; -import org.nuiton.wikitty.publication.WikittyPublicationSession; +import org.nuiton.wikitty.publication.ui.WikittyPublicationSession; import com.opensymphony.xwork2.ActionContext; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/interceptor/LogoutInterceptor.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/interceptor/LogoutInterceptor.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/interceptor/LogoutInterceptor.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -21,12 +21,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package org.nuiton.wikitty.publication.interceptor; +package org.nuiton.wikitty.publication.ui.interceptor; import java.util.Map; import org.nuiton.util.StringUtil; -import org.nuiton.wikitty.publication.WikittyPublicationSession; +import org.nuiton.wikitty.publication.ui.WikittyPublicationSession; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; Modified: trunk/wikitty-publication/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.xml 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-08-12 13:13:53 UTC (rev 1132) @@ -33,7 +33,7 @@ <package name="loginArea" extends="publicArea"> <interceptors> <interceptor name="logout" - class="org.nuiton.wikitty.publication.interceptor.LogoutInterceptor" /> + class="org.nuiton.wikitty.publication.ui.interceptor.LogoutInterceptor" /> <interceptor-stack name="loginAreaStack"> <interceptor-ref name="logout" /> <interceptor-ref name="publicAreaStack" /> @@ -46,7 +46,7 @@ <package name="restrictedArea" extends="publicArea"> <interceptors> <interceptor name="login" - class="org.nuiton.wikitty.publication.interceptor.LoginInterceptor"> + class="org.nuiton.wikitty.publication.ui.interceptor.LoginInterceptor"> <param name="error">/login_input.action</param> </interceptor> <interceptor-stack name="restrictedAreaStack"> @@ -59,20 +59,20 @@ <package name="login" extends="loginArea"> <action name="*/register_*" method="{2}" - class="org.nuiton.wikitty.publication.action.PublicationActionRegister"> + class="org.nuiton.wikitty.publication.ui.action.PublicationActionRegister"> <param name="contextData">{1}</param> <result name="input">/WEB-INF/jsp/register.jsp</result> <result type="redirect">${context}/view/.action</result> </action> <action name="*/login_*" method="{2}" - class="org.nuiton.wikitty.publication.action.PublicationActionLogin"> + class="org.nuiton.wikitty.publication.ui.action.PublicationActionLogin"> <param name="contextData">{1}</param> <result name="input">/WEB-INF/jsp/login.jsp</result> <result name="success" type="redirect">${success}</result> <result name="error" type="redirect">${error}</result> </action> <action name="*/logout" - class="org.nuiton.wikitty.publication.action.PublicationActionLogout"> + class="org.nuiton.wikitty.publication.ui.action.PublicationActionLogout"> <param name="contextData">{1}</param> <result type="redirect">${success}</result> </action> @@ -82,21 +82,21 @@ <package name="publication" extends="publicArea"> <action name="*/edit/*" - class="org.nuiton.wikitty.publication.action.PublicationActionEdit"> + class="org.nuiton.wikitty.publication.ui.action.PublicationActionEdit"> <param name="contextData">{1}</param> <param name="args">{2}</param> <result>/WEB-INF/jsp/edit.jsp</result> </action> <action name="*/view/*" - class="org.nuiton.wikitty.publication.action.PublicationActionView"> + class="org.nuiton.wikitty.publication.ui.action.PublicationActionView"> <param name="contextData">{1}</param> <param name="args">{2}</param> <result>/WEB-INF/jsp/view.jsp</result> </action> <action name="*/raw/*" - class="org.nuiton.wikitty.publication.action.PublicationActionRaw"> + class="org.nuiton.wikitty.publication.ui.action.PublicationActionRaw"> <param name="contextData">{1}</param> <param name="args">{2}</param> <result type="stream"> @@ -106,7 +106,7 @@ </action> <action name="*/eval/*" - class="org.nuiton.wikitty.publication.action.PublicationActionEval"> + class="org.nuiton.wikitty.publication.ui.action.PublicationActionEval"> <param name="contextData">{1}</param> <param name="args">{2}</param> <result type="stream"> @@ -116,7 +116,7 @@ </action> <action name="*/*/view/*" - class="org.nuiton.wikitty.publication.action.PublicationActionView"> + class="org.nuiton.wikitty.publication.ui.action.PublicationActionView"> <param name="contextData">{1}</param> <param name="contextApps">{2}</param> <param name="args">{3}</param> @@ -124,7 +124,7 @@ </action> <action name="*/*/raw/*" - class="org.nuiton.wikitty.publication.action.PublicationActionRaw"> + class="org.nuiton.wikitty.publication.ui.action.PublicationActionRaw"> <param name="contextData">{1}</param> <param name="contextApps">{2}</param> <param name="args">{3}</param> @@ -135,7 +135,7 @@ </action> <action name="*/*/eval/*" - class="org.nuiton.wikitty.publication.action.PublicationActionEval"> + class="org.nuiton.wikitty.publication.ui.action.PublicationActionEval"> <param name="contextData">{1}</param> <param name="contextApps">{2}</param> <param name="args">{3}</param> @@ -150,7 +150,7 @@ <package name="fragment" namespace="/fragment" extends="publicArea"> <action name="wikittyInfo" - class="org.nuiton.wikitty.publication.action.PublicationActionRestoreWikitty"> + class="org.nuiton.wikitty.publication.ui.action.PublicationActionRestoreWikitty"> <result>/WEB-INF/jsp/wikittyInfo.jsp</result> </action> </package> Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-08-12 13:13:53 UTC (rev 1132) @@ -29,9 +29,9 @@ --%> <%@page import="org.nuiton.i18n.I18n"%> -<%@page import="org.nuiton.wikitty.publication.CodeMirrorWrapper"%> -<%@page import="org.nuiton.wikitty.publication.SelectOption"%> -<%@page import="org.nuiton.wikitty.publication.action.PublicationActionEdit"%> +<%@page import="org.nuiton.wikitty.publication.ui.CodeMirrorWrapper"%> +<%@page import="org.nuiton.wikitty.publication.ui.SelectOption"%> +<%@page import="org.nuiton.wikitty.publication.ui.action.PublicationActionEdit"%> <%@page import="org.apache.commons.lang.StringEscapeUtils"%> <%@page import="org.nuiton.wikitty.entities.FieldType"%> <%@page import="java.util.Collection"%> Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/login.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/login.jsp 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/login.jsp 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,5 +1,5 @@ <%@page - import="org.nuiton.wikitty.publication.action.PublicationActionLogin"%> + import="org.nuiton.wikitty.publication.action.ui.PublicationActionLogin"%> <%@ taglib prefix="s" uri="/struts-tags"%> Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-08-12 13:13:53 UTC (rev 1132) @@ -30,12 +30,12 @@ <%@page import="org.apache.commons.lang.StringEscapeUtils"%> <%@page - import="org.nuiton.wikitty.publication.action.PublicationActionView"%> + import="org.nuiton.wikitty.publication.ui.action.PublicationActionView"%> <%@page import="org.nuiton.util.StringUtil"%> <%@page import="org.nuiton.wikitty.search.Criteria"%> <%@page import="org.nuiton.wikitty.search.Search"%> <%@page - import="org.nuiton.wikitty.publication.WikittyPublicationSession"%> + import="org.nuiton.wikitty.publication.ui.WikittyPublicationSession"%> <%@page import="org.nuiton.wikitty.search.PagedResult"%> <%@page import="org.nuiton.wikitty.entities.Wikitty"%> <%@taglib prefix="s" uri="/struts-tags"%> Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,7 +1,7 @@ <%@page import="org.apache.commons.lang.StringEscapeUtils"%> <%@page import="org.nuiton.wikitty.entities.Wikitty"%> <%@page - import="org.nuiton.wikitty.publication.action.PublicationActionRestoreWikitty"%> + import="org.nuiton.wikitty.publication.ui.action.PublicationActionRestoreWikitty"%> <%@taglib prefix="s" uri="/struts-tags"%> <% Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/web.xml 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/web.xml 2011-08-12 13:13:53 UTC (rev 1132) @@ -24,7 +24,7 @@ <listener> <description>Init</description> - <listener-class>org.nuiton.wikitty.publication.ApplicationListener</listener-class> + <listener-class>org.nuiton.wikitty.publication.ui.ApplicationListener</listener-class> </listener>