Author: sletellier Date: 2011-05-16 15:21:52 +0200 (Mon, 16 May 2011) New Revision: 285 Url: http://chorem.org/repositories/revision/bow/285 Log: - Allow to use directly BowConfig.getXXX with default config - Move inner BowConfigOption to external class Added: trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java Removed: trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigHelper.java Modified: trunk/bow-ui/src/main/java/org/chorem/bow/AliasServlet.java trunk/bow-ui/src/main/java/org/chorem/bow/BowConfig.java trunk/bow-ui/src/main/java/org/chorem/bow/BowInit.java trunk/bow-ui/src/main/java/org/chorem/bow/BowMail.java trunk/bow-ui/src/main/java/org/chorem/bow/BowSession.java trunk/bow-ui/src/main/java/org/chorem/bow/action/LoginAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/PreferencesAction.java trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp trunk/bow-ui/src/main/webapp/jsp/permanentXml.jsp trunk/bow-ui/src/main/webapp/jsp/preferences.jsp trunk/bow-ui/src/main/webapp/jsp/temporaryXml.jsp Modified: trunk/bow-ui/src/main/java/org/chorem/bow/AliasServlet.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/AliasServlet.java 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/java/org/chorem/bow/AliasServlet.java 2011-05-16 13:21:52 UTC (rev 285) @@ -24,7 +24,6 @@ package org.chorem.bow; import org.apache.commons.lang.StringUtils; -import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyProxy; import javax.servlet.ServletException; @@ -46,8 +45,7 @@ protected String bowServletUrl = ""; public AliasServlet() { - ApplicationConfig config = BowConfig.getConfig(); - bowServletUrl = BowConfigHelper.getBowUrl(config) + BowConfigHelper.getServletBow(config); + bowServletUrl = BowConfig.getBowUrl() + BowConfig.getServletBow(); } @Override Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BowConfig.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/BowConfig.java 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BowConfig.java 2011-05-16 13:21:52 UTC (rev 285) @@ -50,135 +50,263 @@ private BowConfig() { } - public static synchronized ApplicationConfig getConfig(String... args) { + public static ApplicationConfig getConfig(String... args) { if (config == null) { - try { - config = new ApplicationConfig(BowOption.CONFIG_FILE.getDefaultValue()); + synchronized (BowConfig.class) { + if (config == null) { + try { + config = new ApplicationConfig(BowConfigOption.CONFIG_FILE.getDefaultValue()); - // Load wikitty options - config.loadDefaultOptions(WikittyConfigOption.class); + // Load wikitty options + config.loadDefaultOptions(WikittyConfigOption.class); - // Load bow options - config.loadDefaultOptions(BowOption.class); + // Load bow options + config.loadDefaultOptions(BowConfigOption.class); - // Parse args - config.parse(args); - } catch (Exception e) { - throw new UnhandledException(e); + // Parse args + config.parse(args); + } catch (Exception e) { + throw new UnhandledException(e); + } + } } } return config; } /** - * Bow option definition. + * Get version as string. + * Default bow applicationConfig will be used + * + * @return version */ - public enum BowOption implements ApplicationConfig.OptionDef { + public static String getVersion() { + return getVersion(getConfig()); + } - CONFIG_FILE( - ApplicationConfig.CONFIG_FILE_NAME, - _("bow.config.configFileName.description"), - "bow.properties", String.class, false, false), - APPLICATION_VERSION( - "application.version", - _("bow.config.application.version.description"), - null, String.class, true, true), - BOW_URL( - "bow.url", - _("bow.config.bow.url.description"), - null, String.class, false, false), - // FIXME sletellier 20110512 : A quoi ça sert ? La valeur est utilise en dur ("alias/") dans struts.xml - ALIAS_URL( - "alias.url", - _("bow.config.alias.url.description"), - null, String.class, false, false), - SERVLET_BOW( - "servlet.bow", - _("bow.config.servlet.bow.description"), - null, String.class, false, false), + /** + * Get version as string. + * + * @param config bow configuration + * @return version + */ + public static String getVersion(ApplicationConfig config) { + return config.getOption(BowConfigOption.APPLICATION_VERSION.key); + } - // FIXME sletellier 20110512 : A quoi ça sert ? La valeur est utilise en dur ("alias/") dans struts.xml - SERVLET_ALIAS( - "servlet.alias", - _("bow.config.servlet.bow.description"), - null, String.class, false, false), - SEARCH_ENGINE( - "search.engine", - _("bow.config.search.engine.description"), - null, String.class, false, false), - BOW_SMTPSERVER( - "bow.smtpServer", - _("bow.config.bow.smtpServer.description"), - null, String.class, false, false), - BOW_ADDRESSFROM( - "bow.addressFrom", - _("bow.config.bow.addressFrom.description"), - null, String.class, false, false), - BOW_ADMINS( - "bow.admins", - _("bow.config.bow.admins.description"), - null, String.class, false, false); + /** + * Get bow url as string. + * Default bow applicationConfig will be used + * + * @return url + */ + public static String getBowUrl() { + return getBowUrl(getConfig()); + } - public String key; - public String description; - public String defaultValue; - public Class<?> type; - public boolean isTransient; - public boolean isFinal; - - BowOption(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; + /** + * Get bow url as string. + * + * @param config bow configuration + * @return url + */ + public static String getBowUrl(ApplicationConfig config) { + String result = config.getOption(BowConfigOption.BOW_URL.key); + if (result != null && result.charAt(result.length() - 1) != '/') { + result += '/'; } + return result; + } - @Override - public boolean isFinal() { - return isFinal; - } + /** + * Get alias url as string. + * Default bow applicationConfig will be used + * + * @return url + */ + public static String getAliasUrl() { + return getAliasUrl(getConfig()); + } - @Override - public boolean isTransient() { - return isTransient; + /** + * Get alias url as string. + * + * @param config bow configuration + * @return url + */ + public static String getAliasUrl(ApplicationConfig config) { + String result = config.getOption(BowConfigOption.ALIAS_URL.key); + if (result != null && result.charAt(result.length() - 1) != '/') { + result += '/'; } + return result; + } - @Override - public String getDefaultValue() { - return defaultValue; - } + /** + * Get bow servlet as string. + * Default bow applicationConfig will be used + * + * @return servlet name + */ + public static String getServletBow() { + return getServletBow(getConfig()); + } - @Override - public String getDescription() { - return description; - } + /** + * Get bow servlet as string. + * + * @param config bow configuration + * @return servlet name + */ + public static String getServletBow(ApplicationConfig config) { + return config.getOption(BowConfigOption.SERVLET_BOW.key); + } - @Override - public String getKey() { - return key; - } + /** + * Get alias servlet as string. + * Default bow applicationConfig will be used + * + * @return servlet name + */ + public static String getServletAlias() { + return getServletAlias(getConfig()); + } - @Override - public Class<?> getType() { - return type; - } + /** + * Get alias servlet as string. + * + * @param config bow configuration + * @return servlet name + */ + public static String getServletAlias(ApplicationConfig config) { + return config.getOption(BowConfigOption.SERVLET_ALIAS.key); + } - @Override - public void setDefaultValue(String defaultValue) { - this.defaultValue = defaultValue; - } + /** + * Get alias servlet url as string. + * Default bow applicationConfig will be used + * + * @return servlet name + */ + public static String getServletAliasUrl() { + return getServletAliasUrl(getConfig()); + } - @Override - public void setTransient(boolean isTransient) { - this.isTransient = isTransient; + /** + * Get alias servlet url as string. + * + * @param config bow configuration + * @return servlet name + */ + public static String getServletAliasUrl(ApplicationConfig config) { + String result = getAliasUrl(config) + getServletAlias(config); + if (result != null && result.charAt(result.length() - 1) != '/') { + result += '/'; } + return result; + } - @Override - public void setFinal(boolean isFinal) { - this.isFinal = isFinal; - } + /** + * Get bow smtp server as string. + * Default bow applicationConfig will be used + * + * @return smtpServer + */ + public static String getSmtpServer() { + return getSmtpServer(getConfig()); } + + /** + * Get bow smtp server as string. + * + * @param config bow configuration + * @return smtpServer + */ + public static String getSmtpServer(ApplicationConfig config) { + return config.getOption(BowConfigOption.BOW_SMTPSERVER.key); + } + + /** + * Get default search engine + * Default bow applicationConfig will be used + * + * @return search engine url + */ + public static String getSearchEngine() { + return getSearchEngine(getConfig()); + } + + /** + * Get default search engine + * + * @param config bow configuration + * @return search engine url + */ + public static String getSearchEngine(ApplicationConfig config) { + return config.getOption(BowConfigOption.SEARCH_ENGINE.key); + } + + /** + * Get bow address from as string. + * Default bow applicationConfig will be used + * + * @return addressFrom + */ + public static String getAddressFrom() { + return getAddressFrom(getConfig()); + } + + /** + * Get bow address from as string. + * + * @param config bow configuration + * @return addressFrom + */ + public static String getAddressFrom(ApplicationConfig config) { + return config.getOption(BowConfigOption.BOW_ADDRESSFROM.key); + } + + /** + * Get admins accounts + * Default bow applicationConfig will be used + * + * @return admins + */ + public static String[] getAdmins() { + return getAdmins(getConfig()); + } + + /** + * Get admins accounts + * + * @param config bow configuration + * @return admins + */ + public static String[] getAdmins(ApplicationConfig config) { + String str = config.getOption(BowConfigOption.BOW_ADMINS.key); + return StringUtil.split(str, ","); + } + + /** + * Return password for specified admin email + * Default bow applicationConfig will be used + * + * @param admin emails account + * @return null or password if available + */ + public static String getAdminPassword(String admin) { + return getAdminPassword(getConfig(), admin); + } + + /** + * Return password for specified admin email + * + * @param config bow configuration + * @param admin emails account + * @return null or password if available + */ + public static String getAdminPassword(ApplicationConfig config, String admin) { + return config.getOption(BowConfigOption.BOW_ADMINS.key + ".password." + admin); + } + } Deleted: trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigHelper.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigHelper.java 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigHelper.java 2011-05-16 13:21:52 UTC (rev 285) @@ -1,128 +0,0 @@ -package org.chorem.bow; - -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.StringUtil; - -/** - * @author sletellier - */ -public class BowConfigHelper { - /** - * Get version as string. - * - * @param config bow configuration - * @return version - */ - public static String getVersion(ApplicationConfig config) { - return config.getOption(BowConfig.BowOption.APPLICATION_VERSION.key); - } - - /** - * Get bow url as string. - * - * @param config bow configuration - * @return url - */ - public static String getBowUrl(ApplicationConfig config) { - String result = config.getOption(BowConfig.BowOption.BOW_URL.key); - if (result != null && result.charAt(result.length() - 1) != '/') { - result += '/'; - } - return result; - } - - /** - * Get alias url as string. - * - * @param config bow configuration - * @return url - */ - public static String getAliasUrl(ApplicationConfig config) { - String result = config.getOption(BowConfig.BowOption.ALIAS_URL.key); - if (result != null && result.charAt(result.length() - 1) != '/') { - result += '/'; - } - return result; - } - - /** - * Get bow servlet as string. - * - * @param config bow configuration - * @return servlet name - */ - public static String getServletBow(ApplicationConfig config) { - return config.getOption(BowConfig.BowOption.SERVLET_BOW.key); - } - - /** - * Get alias servlet as string. - * - * @param config bow configuration - * @return servlet name - */ - public static String getServletAlias(ApplicationConfig config) { - return config.getOption(BowConfig.BowOption.SERVLET_ALIAS.key); - } - - /** - * Get alias servlet url as string. - * - * @param config bow configuration - * @return servlet name - */ - public static String getServletAliasUrl(ApplicationConfig config) { - String result = getAliasUrl(config) + getServletAlias(config); - if (result != null && result.charAt(result.length() - 1) != '/') { - result += '/'; - } - return result; - } - - /** - * Get bow smtp server as string. - * - * @param config bow configuration - * @return smtpServer - */ - public static String getSmtpServer(ApplicationConfig config) { - return config.getOption(BowConfig.BowOption.BOW_SMTPSERVER.key); - } - - /** - * Get default search engine - * - * @param config bow configuration - * @return search engine url - */ - public static String getSearchEngine(ApplicationConfig config) { - return config.getOption(BowConfig.BowOption.SEARCH_ENGINE.key); - } - - /** - * Get bow address from as string. - * - * @param config bow configuration - * @return addressFrom - */ - public static String getAddressFrom(ApplicationConfig config) { - return config.getOption(BowConfig.BowOption.BOW_ADDRESSFROM.key); - } - - public static String[] getAdmins(ApplicationConfig config) { - String str = config.getOption(BowConfig.BowOption.BOW_ADMINS.key); - return StringUtil.split(str, ","); - } - - /** - * Return password for specified admin email - * - * @param config bow configuration - * @param admin - * @return null or password if available - */ - public static String getAdminPassword(ApplicationConfig config, String admin) { - String str = config.getOption(BowConfig.BowOption.BOW_ADMINS.key + ".password." + admin); - return str; - } -} Added: trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java (rev 0) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java 2011-05-16 13:21:52 UTC (rev 285) @@ -0,0 +1,116 @@ +package org.chorem.bow; + +import org.nuiton.util.ApplicationConfig; + +import static org.nuiton.i18n.I18n._; + +/** + * Bow option definition. + */ +public enum BowConfigOption implements ApplicationConfig.OptionDef { + + CONFIG_FILE( + ApplicationConfig.CONFIG_FILE_NAME, + _("bow.config.configFileName.description"), + "bow.properties", String.class, false, false), + APPLICATION_VERSION( + "application.version", + _("bow.config.application.version.description"), + null, String.class, true, true), + BOW_URL( + "bow.url", + _("bow.config.bow.url.description"), + null, String.class, false, false), + // For apache url rewriting + ALIAS_URL( + "alias.url", + _("bow.config.alias.url.description"), + "alias/", String.class, false, false), + SERVLET_BOW( + "servlet.bow", + _("bow.config.servlet.bow.description"), + null, String.class, false, false), + // For apache url rewriting + SERVLET_ALIAS( + "servlet.alias", + _("bow.config.servlet.bow.description"), + null, String.class, false, false), + SEARCH_ENGINE( + "search.engine", + _("bow.config.search.engine.description"), + null, String.class, false, false), + BOW_SMTPSERVER( + "bow.smtpServer", + _("bow.config.bow.smtpServer.description"), + null, String.class, false, false), + BOW_ADDRESSFROM( + "bow.addressFrom", + _("bow.config.bow.addressFrom.description"), + null, String.class, false, false), + BOW_ADMINS( + "bow.admins", + _("bow.config.bow.admins.description"), + null, String.class, false, false); + + public String key; + public String description; + public String defaultValue; + public Class<?> type; + public boolean isTransient; + public boolean isFinal; + + BowConfigOption(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; + } + + @Override + public boolean isFinal() { + return isFinal; + } + + @Override + public boolean isTransient() { + return isTransient; + } + + @Override + public String getDefaultValue() { + return defaultValue; + } + + @Override + public String getDescription() { + return description; + } + + @Override + public String getKey() { + return key; + } + + @Override + public Class<?> getType() { + return type; + } + + @Override + public void setDefaultValue(String defaultValue) { + this.defaultValue = defaultValue; + } + + @Override + public void setTransient(boolean isTransient) { + this.isTransient = isTransient; + } + + @Override + public void setFinal(boolean isFinal) { + this.isFinal = isFinal; + } +} \ No newline at end of file Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BowInit.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/BowInit.java 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BowInit.java 2011-05-16 13:21:52 UTC (rev 285) @@ -130,6 +130,6 @@ } request.setAttribute("bookmarkActions", bookmarkActions); } - request.setAttribute(ALIAS_SERVLET_URL, BowConfigHelper.getServletAliasUrl(BowConfig.getConfig())); + request.setAttribute(ALIAS_SERVLET_URL, BowConfig.getServletAliasUrl()); } } Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BowMail.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/BowMail.java 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BowMail.java 2011-05-16 13:21:52 UTC (rev 285) @@ -38,8 +38,7 @@ public class BowMail { static public void sendMail(String sendToEmail, String mailSubject, String mailContent) throws AddressException, MessagingException { - ApplicationConfig config = BowConfig.getConfig(); - String smtpServer = BowConfigHelper.getSmtpServer(config); + String smtpServer = BowConfig.getSmtpServer(); Properties properties = new Properties(); properties.put("mail.smtp.host", smtpServer); @@ -49,7 +48,7 @@ Message msg = new MimeMessage(session); msg.addRecipient(Message.RecipientType.TO, new InternetAddress(sendToEmail)); - msg.setFrom(new InternetAddress(BowConfigHelper.getAddressFrom(config))); + msg.setFrom(new InternetAddress(BowConfig.getAddressFrom())); msg.setSubject(mailSubject); msg.setContent(mailContent, "text/plain"); Transport.send(msg); Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BowSession.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/BowSession.java 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BowSession.java 2011-05-16 13:21:52 UTC (rev 285) @@ -104,7 +104,7 @@ // check if this user is admin String login = preference.getLogin(); - String[] admins = BowConfigHelper.getAdmins(BowConfig.getConfig()); + String[] admins = BowConfig.getAdmins(); boolean isAdmin = false; if (admins != null) { for (String admin : admins) { @@ -159,7 +159,7 @@ preference.setColors(""); } if (preference.getSearchEngineUrlResults() == null) { - preference.setSearchEngineUrlResults(BowConfigHelper.getSearchEngine(BowConfig.getConfig())); + preference.setSearchEngineUrlResults(BowConfig.getSearchEngine()); } if (preference.getSearchEngineUrlSuggestions() == null) { preference.setSearchEngineUrlSuggestions(""); // TODO add default value in config Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/LoginAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/LoginAction.java 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/LoginAction.java 2011-05-16 13:21:52 UTC (rev 285) @@ -28,7 +28,6 @@ import org.apache.struts2.interceptor.ServletRequestAware; import org.chorem.bow.BowConfig; -import org.chorem.bow.BowConfigHelper; import org.chorem.bow.BowUser; import org.chorem.bow.BowInit; import org.chorem.bow.BowPreference; @@ -90,7 +89,7 @@ if (result == null) { // failback: try to authenticate admin with config info - String configPassword = BowConfigHelper.getAdminPassword(BowConfig.getConfig(), email); + String configPassword = BowConfig.getAdminPassword(email); log.info("failback password: " + password + " configPassword: " + configPassword); if (password.equals(configPassword)) { // admin authenticate with config, this is possible when Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java 2011-05-16 13:21:52 UTC (rev 285) @@ -33,10 +33,8 @@ import org.chorem.bow.BookmarkActions; import org.chorem.bow.BookmarkUtils; import org.chorem.bow.BowConfig; -import org.chorem.bow.BowConfigHelper; import org.chorem.bow.BowUtils; import org.chorem.bow.BowPreference; -import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.WikittyProxy; @@ -105,7 +103,6 @@ public String execute() { BowPreference user = getBowSession().getPreference(); - ApplicationConfig config = BowConfig.getConfig(); if (searchLine != null && searchLine.matches("^http://[^ ]*")) { redirectTo = BowUtils.redirectTo(searchLine, null); } else if (searchLine != null @@ -152,12 +149,12 @@ // si on retrouve l'alias prive on l'utilise, // sinon on espere qu'il existe un alias public portant ce nom if (bookmarkId != null) { - redirectTo = BowConfigHelper.getAliasUrl(config) + bookmarkId + ".action"; + redirectTo = BowConfig.getAliasUrl() + bookmarkId + ".action"; if (log.isDebugEnabled()) { log.debug("Private alias found, redirect to: " + redirectTo); } } else { - redirectTo = BowConfigHelper.getAliasUrl(config) + privateAlias + ".action"; + redirectTo = BowConfig.getAliasUrl() + privateAlias + ".action"; if (log.isDebugEnabled()) { log.debug("Private alias not found, redirect to: " + redirectTo); } @@ -168,7 +165,7 @@ String searchEngineURL = pref.getSearchEngineUrlResults(); if (StringUtils.isEmpty(searchEngineURL)) { - searchEngineURL = BowConfigHelper.getSearchEngine(config); + searchEngineURL = BowConfig.getSearchEngine(); } searchEngineURL = searchEngineURL.replace("{searchTerms}", searchLine); searchEngineURL = response.encodeRedirectURL(searchEngineURL); Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/PreferencesAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/PreferencesAction.java 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/PreferencesAction.java 2011-05-16 13:21:52 UTC (rev 285) @@ -63,8 +63,10 @@ private static final long serialVersionUID = -58341106356599721L; static public PreferencesAction getAction() { - return (PreferencesAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); + Object action = ActionContext.getContext().get(CONTEXT_ACTION_KEY); + return (PreferencesAction) action; } + protected String colors; protected String tagsNb; protected String bookmarksHomePage; Modified: trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-05-16 13:21:52 UTC (rev 285) @@ -24,9 +24,8 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@taglib prefix="s" uri="/struts-tags" %> <%@page import="org.chorem.bow.BowConfig" %> -<%@ page import="org.chorem.bow.BowConfigHelper" %> <% -String bowUrl = BowConfigHelper.getBowUrl(BowConfig.getConfig()); +String bowUrl = BowConfig.getBowUrl(); if (request.getAttribute("formAction") == null) { request.setAttribute("formAction", "addUrl"); Modified: trunk/bow-ui/src/main/webapp/jsp/permanentXml.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/permanentXml.jsp 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/webapp/jsp/permanentXml.jsp 2011-05-16 13:21:52 UTC (rev 285) @@ -24,10 +24,9 @@ <%@page contentType="text/xml" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags" %> <%@page import="org.chorem.bow.BowConfig" %> -<%@ page import="org.chorem.bow.BowConfigHelper" %> <% -String url = BowConfigHelper.getBowUrl(BowConfig.getConfig()); +String url = BowConfig.getBowUrl(); %> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/" Modified: trunk/bow-ui/src/main/webapp/jsp/preferences.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-05-16 13:21:52 UTC (rev 285) @@ -1,7 +1,3 @@ -<%@page import="org.chorem.bow.BowConfig"%> -<%@page import="org.nuiton.wikitty.search.FacetTopic"%> -<%@page import="org.chorem.bow.action.PreferencesAction"%> -<%@ page import="org.chorem.bow.BowConfigHelper" %> <!-- #%L bow @@ -26,11 +22,14 @@ #L% --> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@page import="org.chorem.bow.BowConfig"%> +<%@page import="org.nuiton.wikitty.search.FacetTopic"%> +<%@page import="org.chorem.bow.action.PreferencesAction"%> <%@taglib prefix="s" uri="/struts-tags" %> <% PreferencesAction action = PreferencesAction.getAction(); -String bowUrl = BowConfigHelper.getBowUrl(BowConfig.getConfig()); +String bowUrl = BowConfig.getBowUrl(); %> <html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" @@ -128,7 +127,7 @@ <div class="formFrame fond"> <h3><s:text name="bow.preferences.labels"/></h3> - <s:form action="adminlabels" method="post"> + <s:form id="labelsForm" action="adminlabels" method="post"> <ul> <% for (FacetTopic topic : action.getLabels()) { %> <div> Modified: trunk/bow-ui/src/main/webapp/jsp/temporaryXml.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/temporaryXml.jsp 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/webapp/jsp/temporaryXml.jsp 2011-05-16 13:21:52 UTC (rev 285) @@ -24,10 +24,9 @@ <%@page contentType="text/xml" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags" %> <%@page import="org.chorem.bow.BowConfig" %> -<%@ page import="org.chorem.bow.BowConfigHelper" %> <% -String url = BowConfigHelper.getBowUrl(BowConfig.getConfig()); +String url = BowConfig.getBowUrl(); %> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/"