diff --git a/.gitignore b/.gitignore index 2a8cf15bf11b009ecc113dfda42c21a8a49bc633..c5cfabe0cf3f44af5750192395228636ecb115f8 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ *.iml .idea .DS_Store +/plugins/ diff --git a/pom.xml b/pom.xml index cb4a1b7ac6e45e5316634af6eb1c9f0c8cd5bee6..fdecf9436c3f8de780e1c431a35d9f0c02ea7128 100644 --- a/pom.xml +++ b/pom.xml @@ -61,16 +61,19 @@ 1.6 3.11-beta2 1.8.7 - - 1.7.0 - 1.7.0.0-SNAPSHOT + + 1.7.1 + 1.7.0.0 true true UTF-8 ${basedir}/src/test/resources/tomcat-users.xml + + https://oss.sonatype.org/content/repositories/snapshots + http://central.maven.org/maven2 fess @@ -197,6 +200,37 @@ ${basedir}/dbflute_fess + + maven-antrun-plugin + 1.8 + + + org.apache.ant + ant + 1.9.6 + + + + + + + + + + + + + + + + + run + + @@ -362,7 +396,7 @@ org.codelibs.robot - s2robot-lasta + s2robot-es ${s2robot.version} diff --git a/src/main/java/org/codelibs/fess/api/BaseApiManager.java b/src/main/java/org/codelibs/fess/api/BaseApiManager.java index 535cc4f823a36140cdc771bc5914281f98663bf7..37fdad19ef2f5ff4809b1f7d00ab00ed2440d327 100644 --- a/src/main/java/org/codelibs/fess/api/BaseApiManager.java +++ b/src/main/java/org/codelibs/fess/api/BaseApiManager.java @@ -16,6 +16,16 @@ package org.codelibs.fess.api; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; + +import javax.servlet.http.HttpServletResponse; + +import org.codelibs.core.exception.IORuntimeException; +import org.lastaflute.web.util.LaRequestUtil; +import org.lastaflute.web.util.LaResponseUtil; + public class BaseApiManager { protected static final String FAVORITES_API = "/favoritesApi"; @@ -60,4 +70,31 @@ public class BaseApiManager { } } + public static void write(String text, String contentType, String encoding) { + if (contentType == null) { + contentType = "text/plain"; + } + if (encoding == null) { + encoding = LaRequestUtil.getRequest().getCharacterEncoding(); + if (encoding == null) { + encoding = "UTF-8"; + } + } + HttpServletResponse response = LaResponseUtil.getResponse(); + response.setContentType(contentType + "; charset=" + encoding); + try { + PrintWriter out = null; + try { + out = new PrintWriter(new OutputStreamWriter(response.getOutputStream(), encoding)); + out.print(text); + } finally { + if (out != null) { + out.close(); + } + } + } catch (IOException e) { + throw new IORuntimeException(e); + } + } + } \ No newline at end of file diff --git a/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java b/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java index ed44760ea663c9cf83d01e18129d9da5eb73875d..22ed2e742206f31a031039fb0f9915efb65dd4ec 100644 --- a/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java +++ b/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java @@ -548,7 +548,7 @@ public class JsonApiManager extends BaseApiManager implements WebApiManager { if (isJsonp) { buf.append(')'); } - LaResponseUtil.write(buf.toString(), "text/javascript+json", Constants.UTF_8); + write(buf.toString(), "text/javascript+json", Constants.UTF_8); } diff --git a/src/main/java/org/codelibs/fess/api/xml/XmlApiManager.java b/src/main/java/org/codelibs/fess/api/xml/XmlApiManager.java index fea2b0da998b774a27c5c0fbc90adb0d148889f3..472a523a7a8f13a93c4ac3ed45e1554bb53b3a18 100644 --- a/src/main/java/org/codelibs/fess/api/xml/XmlApiManager.java +++ b/src/main/java/org/codelibs/fess/api/xml/XmlApiManager.java @@ -375,7 +375,7 @@ public class XmlApiManager extends BaseApiManager implements WebApiManager { buf.append(""); } buf.append(""); - LaResponseUtil.write(buf.toString(), "text/xml", Constants.UTF_8); + write(buf.toString(), "text/xml", Constants.UTF_8); } diff --git a/src/main/java/org/codelibs/fess/app/web/RootAction.java b/src/main/java/org/codelibs/fess/app/web/RootAction.java index 61bfad72a87f2d1d4c1d24f23ca599d68c353bc5..7dd8201ab6173ea5920b91e9f9200da4e01e5297 100644 --- a/src/main/java/org/codelibs/fess/app/web/RootAction.java +++ b/src/main/java/org/codelibs/fess/app/web/RootAction.java @@ -329,14 +329,16 @@ public class RootAction { } if (doc == null) { errorMessage = - MessageResourcesUtil.getMessage(LaRequestUtil.getRequest().getLocale(), "errors.docid_not_found", indexForm.docId); + ComponentUtil.getMessageManager().getMessage(LaRequestUtil.getRequest().getLocale(), "errors.docid_not_found", + new Object[] { indexForm.docId }); return "error.jsp"; } final String content = viewHelper.createCacheContent(doc, indexForm.hq); if (content == null) { errorMessage = - MessageResourcesUtil.getMessage(LaRequestUtil.getRequest().getLocale(), "errors.docid_not_found", indexForm.docId); + ComponentUtil.getMessageManager().getMessage(LaRequestUtil.getRequest().getLocale(), "errors.docid_not_found", + new Object[] { indexForm.docId }); return "error.jsp"; } LaResponseUtil.write(content, "text/html", Constants.UTF_8); @@ -359,13 +361,15 @@ public class RootAction { } if (doc == null) { errorMessage = - MessageResourcesUtil.getMessage(LaRequestUtil.getRequest().getLocale(), "errors.docid_not_found", indexForm.docId); + ComponentUtil.getMessageManager().getMessage(LaRequestUtil.getRequest().getLocale(), "errors.docid_not_found", + new Object[] { indexForm.docId }); return "error.jsp"; } final Object urlObj = doc.get(fieldHelper.urlField); if (urlObj == null) { errorMessage = - MessageResourcesUtil.getMessage(LaRequestUtil.getRequest().getLocale(), "errors.document_not_found", indexForm.docId); + ComponentUtil.getMessageManager().getMessage(LaRequestUtil.getRequest().getLocale(), "errors.document_not_found", + new Object[] { indexForm.docId }); return "error.jsp"; } final String url = urlObj.toString(); @@ -420,7 +424,8 @@ public class RootAction { } catch (final Exception e) { logger.error("Failed to load: " + doc, e); errorMessage = - MessageResourcesUtil.getMessage(LaRequestUtil.getRequest().getLocale(), "errors.not_load_from_server", url); + ComponentUtil.getMessageManager().getMessage(LaRequestUtil.getRequest().getLocale(), + "errors.not_load_from_server", new Object[] { url }); return "error.jsp"; } } else if (Constants.TRUE.equals(crawlerProperties.getProperty(Constants.SEARCH_DESKTOP_PROPERTY, Constants.FALSE))) { @@ -428,7 +433,8 @@ public class RootAction { final File file = new File(path); if (!file.exists()) { errorMessage = - MessageResourcesUtil.getMessage(LaRequestUtil.getRequest().getLocale(), "errors.not_found_on_file_system", url); + ComponentUtil.getMessageManager().getMessage(LaRequestUtil.getRequest().getLocale(), + "errors.not_found_on_file_system", new Object[] { url }); return "error.jsp"; } final Desktop desktop = Desktop.getDesktop(); @@ -436,7 +442,8 @@ public class RootAction { desktop.open(file); } catch (final Exception e) { errorMessage = - MessageResourcesUtil.getMessage(LaRequestUtil.getRequest().getLocale(), "errors.could_not_open_on_system", url); + ComponentUtil.getMessageManager().getMessage(LaRequestUtil.getRequest().getLocale(), + "errors.could_not_open_on_system", new Object[] { url }); logger.warn("Could not open " + path, e); return "error.jsp"; } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/FileAuthenticationForm.java b/src/main/java/org/codelibs/fess/app/web/admin/FileAuthenticationForm.java index 5106f5a2d3822c63a9ba639156dfc9494678f313..69a5e13542df38422f0c762b87447d99f40ba915 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/FileAuthenticationForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/FileAuthenticationForm.java @@ -62,7 +62,7 @@ public class FileAuthenticationForm implements Serializable { public String parameters; //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") - //@LongType + //@Maxbytelength(maxbytelength = 1000) public String fileConfigId; //@Required(target = "confirmfromupdate,update,delete") diff --git a/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java b/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java index 4d3fbe164248266e2b0ce61c5c47063fe01edce4..b17027630203f542a8eb47832e0a16d1ac3a4dad 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java @@ -112,7 +112,7 @@ public class AdminDesignAction extends FessAdminAction implements Serializable { @Execute public HtmlResponse upload(DesignForm form) { - validate(form, messages -> {} , toMainHtml()); + validate(form, messages -> {}, toMainHtml()); final String uploadedFileName = form.designFile.getFileName(); String fileName = form.designFileName; if (StringUtil.isBlank(fileName)) { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java index 5467167f45c104568f72243022106df24446f9cc..9f6d61d35089e5f03d08daba9501d9d8671909b5 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java @@ -172,14 +172,14 @@ public class AdminKeymatchAction extends FessAdminAction { @Token(save = false, validate = true, keep = true) @Execute public HtmlResponse confirmfromcreate(KeyMatchEditForm form) { - validate(form, messages -> {} , toEditHtml()); + validate(form, messages -> {}, toEditHtml()); return asHtml(path_AdminKeyMatch_ConfirmJsp); } @Token(save = false, validate = true, keep = true) @Execute public HtmlResponse confirmfromupdate(KeyMatchEditForm form) { - validate(form, messages -> {} , toEditHtml()); + validate(form, messages -> {}, toEditHtml()); return asHtml(path_AdminKeyMatch_ConfirmJsp); } @@ -189,7 +189,7 @@ public class AdminKeymatchAction extends FessAdminAction { @Token(save = false, validate = true) @Execute public HtmlResponse create(KeyMatchEditForm form) { - validate(form, messages -> {} , toEditHtml()); + validate(form, messages -> {}, toEditHtml()); keyMatchService.store(createKeyMatch(form)); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); ComponentUtil.getKeyMatchHelper().update(); @@ -199,7 +199,7 @@ public class AdminKeymatchAction extends FessAdminAction { @Token(save = false, validate = true) @Execute public HtmlResponse update(KeyMatchEditForm form) { - validate(form, messages -> {} , toEditHtml()); + validate(form, messages -> {}, toEditHtml()); keyMatchService.store(createKeyMatch(form)); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); ComponentUtil.getKeyMatchHelper().update(); @@ -260,7 +260,7 @@ public class AdminKeymatchAction extends FessAdminAction { if (form.crudMode != expectedMode) { throwValidationError(messages -> { messages.addErrorsCrudInvalidMode(GLOBAL, String.valueOf(expectedMode), String.valueOf(form.crudMode)); - } , toEditHtml()); + }, toEditHtml()); } } diff --git a/src/main/java/org/codelibs/fess/client/FessEsClient.java b/src/main/java/org/codelibs/fess/client/FessEsClient.java index 68cc3dff174afce26c3234aec05758ba5b91f60f..47b5499e9b23223cf08d952e84c8237e2017000d 100644 --- a/src/main/java/org/codelibs/fess/client/FessEsClient.java +++ b/src/main/java/org/codelibs/fess/client/FessEsClient.java @@ -2,7 +2,10 @@ package org.codelibs.fess.client; import static org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner.newConfigs; +import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -18,6 +21,8 @@ import org.codelibs.core.io.FileUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner; import org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner.Configs; +import org.codelibs.elasticsearch.runner.net.Curl; +import org.codelibs.elasticsearch.runner.net.CurlResponse; import org.codelibs.fess.Constants; import org.codelibs.fess.ResultOffsetExceededException; import org.codelibs.fess.entity.FacetInfo; @@ -160,10 +165,21 @@ public class FessEsClient implements Client { protected List indexConfigList = new ArrayList<>(); + protected Map> configListMap = new HashMap<>(); + public void addIndexConfig(String path) { indexConfigList.add(path); } + public void addConfigFile(String index, String path) { + List list = configListMap.get(index); + if (list == null) { + list = new ArrayList<>(); + configListMap.put(index, list); + } + list.add(path); + } + public void setSettings(Map settings) { this.settings = settings; } @@ -215,6 +231,7 @@ public class FessEsClient implements Client { if (settings != null) { settingsBuilder.put(settings); } + settingsBuilder.put("path.plugins", System.getProperty("user.dir") + "/plugins"); }); runner.build(config); } @@ -264,6 +281,27 @@ public class FessEsClient implements Client { // ignore } if (!exists) { + if (runner != null) {// TODO replace with url + configListMap.getOrDefault(configIndex, Collections.emptyList()).forEach( + path -> { + String source = null; + final String filePath = indexConfigPath + "/" + configIndex + "/" + path; + try { + source = FileUtil.readUTF8(filePath); + try (CurlResponse response = + Curl.post(runner.node(), "_configsync/file").param("path", path).body(source).execute()) { + if (response.getHttpStatusCode() == 200) { + logger.info("Register " + path + " to " + configIndex); + } else { + logger.warn("Invalid request for " + path); + } + } + } catch (final Exception e) { + logger.warn("Failed to register " + filePath, e); + } + }); + } + try { String source = null; final String indexConfigFile = indexConfigPath + "/" + configIndex + ".json"; diff --git a/src/main/java/org/codelibs/fess/crud/util/SAStrutsUtil.java b/src/main/java/org/codelibs/fess/crud/util/SAStrutsUtil.java deleted file mode 100644 index ce095715c8c258c1a148c25759758b09da3ae4c3..0000000000000000000000000000000000000000 --- a/src/main/java/org/codelibs/fess/crud/util/SAStrutsUtil.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright 2009-2015 the CodeLibs Project and the Others. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific language - * governing permissions and limitations under the License. - */ - -package org.codelibs.fess.crud.util; - -import javax.servlet.http.HttpServletRequest; - -import org.codelibs.fess.util.ActionMessagesUtil; -import org.lastaflute.web.ruts.message.ActionMessage; -import org.lastaflute.web.ruts.message.ActionMessages; -import org.lastaflute.web.util.LaRequestUtil; - -public class SAStrutsUtil { - protected SAStrutsUtil() { - // nothing - } - - public static void addMessage(final String key) { - addMessage(LaRequestUtil.getRequest(), key); - } - - public static void addMessage(final HttpServletRequest request, final String key) { - final ActionMessages msgs = new ActionMessages(); - msgs.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(key)); - ActionMessagesUtil.saveMessages(request, msgs); - } - - public static void addMessage(final String key, final Object... values) { - addMessage(LaRequestUtil.getRequest(), key, values); - } - - public static void addMessage(final HttpServletRequest request, final String key, final Object... values) { - final ActionMessages msgs = new ActionMessages(); - msgs.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(key, values)); - ActionMessagesUtil.saveMessages(request, msgs); - } - - public static void addSessionMessage(final String key) { - addSessionMessage(LaRequestUtil.getRequest(), key); - } - - public static void addSessionMessage(final HttpServletRequest request, final String key) { - final ActionMessages msgs = new ActionMessages(); - msgs.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(key)); - ActionMessagesUtil.saveMessages(request.getSession(), msgs); - } - - public static void addSessionMessage(final String key, final Object... values) { - addSessionMessage(LaRequestUtil.getRequest(), key, values); - } - - public static void addSessionMessage(final HttpServletRequest request, final String key, final Object... values) { - final ActionMessages msgs = new ActionMessages(); - msgs.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(key, values)); - ActionMessagesUtil.saveMessages(request.getSession(), msgs); - } -} diff --git a/src/main/java/org/codelibs/fess/dict/DictionaryExpiredException.java b/src/main/java/org/codelibs/fess/dict/DictionaryExpiredException.java index 94da719e3c83b264b3a48a07592e4be729ab33de..8b62703647abde39629c30a760fd7a186d1341aa 100644 --- a/src/main/java/org/codelibs/fess/dict/DictionaryExpiredException.java +++ b/src/main/java/org/codelibs/fess/dict/DictionaryExpiredException.java @@ -16,11 +16,11 @@ package org.codelibs.fess.dict; -public class DictionaryExpiredException extends ActionMessagesException { +public class DictionaryExpiredException extends RuntimeException { private static final long serialVersionUID = 1L; - public DictionaryExpiredException() { - super("errors.expired_dict_id"); - } + // public DictionaryExpiredException() { + // super("errors.expired_dict_id"); + // } } diff --git a/src/main/java/org/codelibs/fess/ds/impl/AbstractDataStoreImpl.java b/src/main/java/org/codelibs/fess/ds/impl/AbstractDataStoreImpl.java index 872c3d4df25ccfe93b7dc47e178a721482c170cb..5567038aec8519316aee1548e9c90f5dfdf96f65 100644 --- a/src/main/java/org/codelibs/fess/ds/impl/AbstractDataStoreImpl.java +++ b/src/main/java/org/codelibs/fess/ds/impl/AbstractDataStoreImpl.java @@ -33,6 +33,9 @@ import org.codelibs.fess.util.ComponentUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import groovy.lang.Binding; +import groovy.lang.GroovyShell; + public abstract class AbstractDataStoreImpl implements DataStore { private static final Logger logger = LoggerFactory.getLogger(AbstractDataStoreImpl.class); @@ -111,8 +114,7 @@ public abstract class AbstractDataStoreImpl implements DataStore { } try { - final Object exp = OgnlUtil.parseExpression(template); - final Object value = OgnlUtil.getValue(exp, paramMap); + final Object value = new GroovyShell(new Binding(paramMap)).evaluate(template); if (value == null) { return null; } diff --git a/src/main/java/org/codelibs/fess/es/exentity/CrawlingSessionInfo.java b/src/main/java/org/codelibs/fess/es/exentity/CrawlingSessionInfo.java index 97c5e817d855f8d73e6cb3f8e49196c496c88cb5..29d049325d55bb9ea506ef86d694ded54310cac4 100644 --- a/src/main/java/org/codelibs/fess/es/exentity/CrawlingSessionInfo.java +++ b/src/main/java/org/codelibs/fess/es/exentity/CrawlingSessionInfo.java @@ -47,7 +47,7 @@ public class CrawlingSessionInfo extends BsCrawlingSessionInfo { public String getKeyMsg() { final Locale locale = LaRequestUtil.getRequest().getLocale(); - final String message = MessageResourcesUtil.getMessage(locale, "labels.crawling_session_" + getKey()); + final String message = ComponentUtil.getMessageManager().getMessage(locale, "labels.crawling_session_" + getKey()); if (message == null || message.startsWith("???")) { return getKey(); } diff --git a/src/main/java/org/codelibs/fess/es/exentity/FileAuthentication.java b/src/main/java/org/codelibs/fess/es/exentity/FileAuthentication.java index c339197dca3553a7497590238b9737fe7bcd4a27..7729deab084202567b8fae4f491c8e0e16ac0ce3 100644 --- a/src/main/java/org/codelibs/fess/es/exentity/FileAuthentication.java +++ b/src/main/java/org/codelibs/fess/es/exentity/FileAuthentication.java @@ -1,6 +1,8 @@ package org.codelibs.fess.es.exentity; import org.codelibs.fess.es.bsentity.BsFileAuthentication; +import org.codelibs.fess.service.FileConfigService; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen @@ -8,6 +10,7 @@ import org.codelibs.fess.es.bsentity.BsFileAuthentication; public class FileAuthentication extends BsFileAuthentication { private static final long serialVersionUID = 1L; + private FileConfig fileConfig; @Override public String getId() { @@ -26,4 +29,12 @@ public class FileAuthentication extends BsFileAuthentication { public void setVersionNo(Long version) { asDocMeta().version(version); } + + public FileConfig getFileConfig() { + if (fileConfig == null) { + final FileConfigService fileConfigService = ComponentUtil.getComponent(FileConfigService.class); + fileConfig = fileConfigService.getFileConfig(getFileConfigId()); + } + return fileConfig; + } } diff --git a/src/main/java/org/codelibs/fess/es/exentity/RequestHeader.java b/src/main/java/org/codelibs/fess/es/exentity/RequestHeader.java index 00c33bd5b241750dd3654953c4c94b3d04c9381d..d6dd504927c666ef7c9bcc8b5ee65ee4bea967d1 100644 --- a/src/main/java/org/codelibs/fess/es/exentity/RequestHeader.java +++ b/src/main/java/org/codelibs/fess/es/exentity/RequestHeader.java @@ -1,6 +1,8 @@ package org.codelibs.fess.es.exentity; import org.codelibs.fess.es.bsentity.BsRequestHeader; +import org.codelibs.fess.service.WebConfigService; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen @@ -8,6 +10,7 @@ import org.codelibs.fess.es.bsentity.BsRequestHeader; public class RequestHeader extends BsRequestHeader { private static final long serialVersionUID = 1L; + private WebConfig webConfig; @Override public String getId() { @@ -30,4 +33,12 @@ public class RequestHeader extends BsRequestHeader { public org.codelibs.robot.client.http.RequestHeader getS2RobotRequestHeader() { return new org.codelibs.robot.client.http.RequestHeader(getName(), getValue()); } + + public WebConfig getWebConfig() { + if (webConfig == null) { + final WebConfigService webConfigService = ComponentUtil.getComponent(WebConfigService.class); + webConfig = webConfigService.getWebConfig(getWebConfigId()); + } + return webConfig; + } } diff --git a/src/main/java/org/codelibs/fess/exception/SSCActionMessagesException.java b/src/main/java/org/codelibs/fess/exception/SSCActionMessagesException.java deleted file mode 100644 index 8d2e481ba4b1f8e2283d8c9463172a7a83895838..0000000000000000000000000000000000000000 --- a/src/main/java/org/codelibs/fess/exception/SSCActionMessagesException.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2004-2010 the Seasar Foundation and the Others. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific language - * governing permissions and limitations under the License. - */ -package org.codelibs.fess.exception; - -/** - * SSCActionMessagesException allows you to pass a root cause. - * - * @author shinsuke - * - */ -public class SSCActionMessagesException extends ActionMessagesException { - - /** - * A default serial version uid. - */ - private static final long serialVersionUID = 1L; - - public SSCActionMessagesException(final String key, final boolean resource) { - super(key, resource); - } - - public SSCActionMessagesException(final String key, final Object... values) { - super(key, values); - } - - public SSCActionMessagesException(final Throwable cause, final String key, final boolean resource) { - super(key, resource); - initCause(cause); - } - - public SSCActionMessagesException(final Throwable cause, final String key, final Object... values) { - super(key, values); - initCause(cause); - } - -} diff --git a/src/main/java/org/codelibs/fess/filter/FessEncodingFilter.java b/src/main/java/org/codelibs/fess/filter/FessEncodingFilter.java index a9108b0a66878d1c18642ccac52c9d6d8161afe7..d0c3ca5bfe1333ef7fabeae922ed55d69f1a1b49 100644 --- a/src/main/java/org/codelibs/fess/filter/FessEncodingFilter.java +++ b/src/main/java/org/codelibs/fess/filter/FessEncodingFilter.java @@ -36,8 +36,10 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.net.URLCodec; import org.codelibs.core.lang.StringUtil; +import org.lastaflute.web.LastaFilter; -public class FessEncodingFilter extends EncodingFilter { +// TODO parent filter +public class FessEncodingFilter extends LastaFilter { public static String ENCODING_MAP = "encodingRules"; protected Map encodingMap = new ConcurrentHashMap<>(); @@ -53,7 +55,7 @@ public class FessEncodingFilter extends EncodingFilter { super.init(config); servletContext = config.getServletContext(); - encoding = config.getInitParameter(ENCODING); + encoding = config.getInitParameter(ENCODING_KEY); if (encoding == null) { encoding = DEFAULT_ENCODING; } diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java index d7cb74adb587afe06756e91f0c90e9370aaa84fb..7116133c062306f4acd47a751b66273492d3e896 100644 --- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java @@ -36,10 +36,12 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.annotation.PostConstruct; import org.apache.commons.lang3.LocaleUtils; +import org.apache.commons.lang3.StringUtils; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.es.exentity.RoleType; import org.codelibs.fess.service.RoleTypeService; +import org.codelibs.fess.util.ComponentUtil; import org.codelibs.robot.util.CharUtil; import org.lastaflute.di.core.SingletonLaContainer; import org.lastaflute.web.util.LaRequestUtil; @@ -99,7 +101,7 @@ public class SystemHelper implements Serializable { final ULocale uLocale = new ULocale(key); final Locale displayLocale = uLocale.toLocale(); final List> langItems = new ArrayList<>(supportedLanguages.length); - final String msg = MessageResourcesUtil.getMessage(displayLocale, "labels.allLanguages"); + final String msg = ComponentUtil.getMessageManager().getMessage(displayLocale, "labels.allLanguages"); final Map defaultMap = new HashMap<>(2); defaultMap.put(Constants.ITEM_LABEL, msg); defaultMap.put(Constants.ITEM_VALUE, "all"); @@ -349,7 +351,7 @@ public class SystemHelper implements Serializable { return langItemsCache.get(localeStr); } catch (final ExecutionException e) { final List> langItems = new ArrayList<>(supportedLanguages.length); - final String msg = MessageResourcesUtil.getMessage(locale, "labels.allLanguages"); + final String msg = ComponentUtil.getMessageManager().getMessage(locale, "labels.allLanguages"); final Map defaultMap = new HashMap<>(2); defaultMap.put(Constants.ITEM_LABEL, msg); defaultMap.put(Constants.ITEM_VALUE, "all"); diff --git a/src/main/java/org/codelibs/fess/helper/ViewHelper.java b/src/main/java/org/codelibs/fess/helper/ViewHelper.java index 3c1346a06db8f9085717891c24de0922a24a0df6..d7990ef9b2af0723a5398b396c4994b4527fccef 100644 --- a/src/main/java/org/codelibs/fess/helper/ViewHelper.java +++ b/src/main/java/org/codelibs/fess/helper/ViewHelper.java @@ -380,16 +380,16 @@ public class ViewHelper implements Serializable { } String url = (String) doc.get("urlLink"); if (url == null) { - url = MessageResourcesUtil.getMessage(locale, "labels.search_unknown"); + url = ComponentUtil.getMessageManager().getMessage(locale, "labels.search_unknown"); } Object created = doc.get(fieldHelper.createdField); if (created instanceof Date) { final SimpleDateFormat sdf = new SimpleDateFormat(CoreLibConstants.DATE_FORMAT_ISO_8601_EXTEND); created = sdf.format((Date) created); } else { - created = MessageResourcesUtil.getMessage(locale, "labels.search_unknown"); + created = ComponentUtil.getMessageManager().getMessage(locale, "labels.search_unknown"); } - doc.put("cacheMsg", MessageResourcesUtil.getMessage(locale, "labels.search_cache_msg", url, created)); + doc.put("cacheMsg", ComponentUtil.getMessageManager().getMessage(locale, "labels.search_cache_msg", new Object[] { url, created })); doc.put("queries", queries); diff --git a/src/main/java/org/codelibs/fess/helper/impl/SearchLogHelperImpl.java b/src/main/java/org/codelibs/fess/helper/impl/SearchLogHelperImpl.java index 3e94931dd30314327e362e26a85c45a8c74fef20..bcd9727b6f3d2608e4328c1839029776f33e77d9 100644 --- a/src/main/java/org/codelibs/fess/helper/impl/SearchLogHelperImpl.java +++ b/src/main/java/org/codelibs/fess/helper/impl/SearchLogHelperImpl.java @@ -25,7 +25,6 @@ import java.util.Queue; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; -import org.codelibs.fess.beans.FessBeans; import org.codelibs.fess.client.FessEsClient; import org.codelibs.fess.es.exbhv.ClickLogBhv; import org.codelibs.fess.es.exbhv.SearchLogBhv; diff --git a/src/main/java/org/codelibs/fess/interceptor/FessActionMessagesThrowsInterceptor.java b/src/main/java/org/codelibs/fess/interceptor/FessActionMessagesThrowsInterceptor.java deleted file mode 100644 index 85458c8cbe737f3090cfbebd9be70ea08cd50953..0000000000000000000000000000000000000000 --- a/src/main/java/org/codelibs/fess/interceptor/FessActionMessagesThrowsInterceptor.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2009-2015 the CodeLibs Project and the Others. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific language - * governing permissions and limitations under the License. - */ - -package org.codelibs.fess.interceptor; - -import org.codelibs.fess.UnsupportedSearchException; -import org.lastaflute.di.core.aop.frame.MethodInvocation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class FessActionMessagesThrowsInterceptor extends ActionMessagesThrowsInterceptor { - private static final long serialVersionUID = 1L; - - private static final String SYSTEM_ERROR_JSP = "/error/system.jsp"; - - private static final Logger logger = LoggerFactory.getLogger(FessActionMessagesThrowsInterceptor.class); - - @Override - public Object invoke(final MethodInvocation invocation) throws Throwable { - try { - return super.invoke(invocation); - } catch (final Throwable t) { // NOPMD - printLog(t); - return SYSTEM_ERROR_JSP; - } - } - - private void printLog(final Throwable t) { - if (t.getClass().getName().endsWith("ClientAbortException")) { - // ignore - if (logger.isDebugEnabled()) { - logger.debug(t.getMessage()); - } - } else if (t instanceof UnsupportedSearchException) { - logger.warn(t.getMessage()); - } else { - logger.error("System error occured.", t); - } - } -} diff --git a/src/main/java/org/codelibs/fess/interceptor/TokenInterceptor.java b/src/main/java/org/codelibs/fess/interceptor/TokenInterceptor.java index e0e7da35bfe0b70aaad2ac42f11dc2532503eb65..56439851e4e5eda15b99687b7d327288f75f0ae9 100644 --- a/src/main/java/org/codelibs/fess/interceptor/TokenInterceptor.java +++ b/src/main/java/org/codelibs/fess/interceptor/TokenInterceptor.java @@ -42,17 +42,18 @@ public class TokenInterceptor extends AbstractInterceptor { */ @Override public Object invoke(final MethodInvocation invocation) throws Throwable { - final Token token = invocation.getMethod().getAnnotation(Token.class); - if (token != null) { - final TokenProcessor processor = TokenProcessor.getInstance(); - final HttpServletRequest request = LaRequestUtil.getRequest(); - if (token.save()) { - processor.saveToken(request); - } else if (token.validate() && !processor.isTokenValid(request, !token.keep())) { - processor.resetToken(request); - throw new ActionMessagesException("errors.token", new Object[0]); - } - } + // TODO replace with lastaflute? + // final Token token = invocation.getMethod().getAnnotation(Token.class); + // if (token != null) { + // final TokenProcessor processor = TokenProcessor.getInstance(); + // final HttpServletRequest request = LaRequestUtil.getRequest(); + // if (token.save()) { + // processor.saveToken(request); + // } else if (token.validate() && !processor.isTokenValid(request, !token.keep())) { + // processor.resetToken(request); + // throw new ActionMessagesException("errors.token", new Object[0]); + // } + // } return invocation.proceed(); } diff --git a/src/main/java/org/codelibs/fess/interceptor/UserInfoInterceptor.java b/src/main/java/org/codelibs/fess/interceptor/UserInfoInterceptor.java index f9d670e36a7189b7c835e87cff64f3841277a02a..3f471a04c1dba88d353d257bdcfe23dd610165df 100644 --- a/src/main/java/org/codelibs/fess/interceptor/UserInfoInterceptor.java +++ b/src/main/java/org/codelibs/fess/interceptor/UserInfoInterceptor.java @@ -33,6 +33,7 @@ import org.lastaflute.web.util.LaRequestUtil; * @author shinsuke * */ +// TODO update? public class UserInfoInterceptor extends AbstractInterceptor { private static final long serialVersionUID = 1L; @@ -46,6 +47,7 @@ public class UserInfoInterceptor extends AbstractInterceptor { */ @Override public Object invoke(final MethodInvocation invocation) throws Throwable { + /* final HttpServletRequest request = LaRequestUtil.getRequest(); final HttpSession session = request.getSession(false); if (session == null) { @@ -73,6 +75,7 @@ public class UserInfoInterceptor extends AbstractInterceptor { break; } } + */ return invocation.proceed(); } diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java index 078b47e017e59b3cce573864aaf4885d0db066e4..2e5b7f37ef66db1199ae40a0d9695dc25884b58e 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java @@ -2490,7 +2490,8 @@ public class FessLabels extends ActionMessages { public static final String LABELS_system_info_bug_report_title = "{labels.system_info_bug_report_title}"; /** The key of the message: crawler.properties does not exist. Default values are applied. */ - public static final String LABELS_system_info_crawler_properties_does_not_exist = "{labels.system_info_crawler_properties_does_not_exist}"; + public static final String LABELS_system_info_crawler_properties_does_not_exist = + "{labels.system_info_crawler_properties_does_not_exist}"; /** The key of the message: File Authentication */ public static final String LABELS_file_authentication_configuration = "{labels.file_authentication_configuration}"; @@ -2529,7 +2530,8 @@ public class FessLabels extends ActionMessages { public static final String LABELS_file_authentication_list_hostname = "{labels.file_authentication_list_hostname}"; /** The key of the message: Config Name */ - public static final String LABELS_file_authentication_list_file_crawling_config = "{labels.file_authentication_list_file_crawling_config}"; + public static final String LABELS_file_authentication_list_file_crawling_config = + "{labels.file_authentication_list_file_crawling_config}"; /** The key of the message: Any */ public static final String LABELS_file_authentication_any = "{labels.file_authentication_any}"; diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java b/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java index 743908a59410896c7e5e30e9b0118b9013d5b900..0d31fce99e341312c75fac719dcbd046078bf97a 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java @@ -124,7 +124,8 @@ public class FessMessages extends FessLabels { public static final String ERRORS_failed_to_delete_solr_index = "{errors.failed_to_delete_solr_index}"; /** The key of the message: Failed to start a process because of running solr process. */ - public static final String ERRORS_failed_to_start_solr_process_because_of_running = "{errors.failed_to_start_solr_process_because_of_running}"; + public static final String ERRORS_failed_to_start_solr_process_because_of_running = + "{errors.failed_to_start_solr_process_because_of_running}"; /** The key of the message: Failed to restore data. */ public static final String ERRORS_failed_to_import_data = "{errors.failed_to_import_data}"; diff --git a/src/main/java/org/codelibs/fess/solr/BoostDocumentRule.java b/src/main/java/org/codelibs/fess/solr/BoostDocumentRule.java index 68bd83c4e9ab1e952db5a8cb182f28e5d12a6249..db86febb38e9ff565a5a2df2c781e0e60e4c11a2 100644 --- a/src/main/java/org/codelibs/fess/solr/BoostDocumentRule.java +++ b/src/main/java/org/codelibs/fess/solr/BoostDocumentRule.java @@ -21,6 +21,9 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import groovy.lang.Binding; +import groovy.lang.GroovyShell; + public class BoostDocumentRule { private static final Logger logger = LoggerFactory.getLogger(BoostDocumentRule.class); @@ -44,8 +47,7 @@ public class BoostDocumentRule { } try { - final Object exp = OgnlUtil.parseExpression(matchExpression); - final Object value = OgnlUtil.getValue(exp, map); + final Object value = new GroovyShell(new Binding(map)).evaluate(matchExpression); if (value instanceof Boolean) { return ((Boolean) value).booleanValue(); @@ -63,8 +65,7 @@ public class BoostDocumentRule { } try { - final Object exp = OgnlUtil.parseExpression(boostExpression); - final Object value = OgnlUtil.getValue(exp, map); + final Object value = new GroovyShell(new Binding(map)).evaluate(boostExpression); if (value instanceof Integer) { return ((Integer) value).floatValue(); diff --git a/src/main/java/org/codelibs/fess/solr/IndexUpdater.java b/src/main/java/org/codelibs/fess/solr/IndexUpdater.java index 341bdb98dd422c800df8cee5594826d0ed029d84..dbdb1290bfd864bf949a9590c038af7e969e9a87 100644 --- a/src/main/java/org/codelibs/fess/solr/IndexUpdater.java +++ b/src/main/java/org/codelibs/fess/solr/IndexUpdater.java @@ -537,13 +537,11 @@ public class IndexUpdater extends Thread { return documentSize; } - @Binding(bindingType = BindingType.MAY) @Override public void setUncaughtExceptionHandler(final UncaughtExceptionHandler eh) { super.setUncaughtExceptionHandler(eh); } - @Binding(bindingType = BindingType.MAY) public static void setDefaultUncaughtExceptionHandler(final UncaughtExceptionHandler eh) { Thread.setDefaultUncaughtExceptionHandler(eh); } diff --git a/src/main/java/org/codelibs/fess/struts/action/FessRequestProcessor.java b/src/main/java/org/codelibs/fess/struts/action/FessRequestProcessor.java deleted file mode 100644 index b3cf1b4eb0322fed623b30f9f6b31202f52a1f4f..0000000000000000000000000000000000000000 --- a/src/main/java/org/codelibs/fess/struts/action/FessRequestProcessor.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2009-2015 the CodeLibs Project and the Others. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific language - * governing permissions and limitations under the License. - */ - -package org.codelibs.fess.struts.action; - -import java.util.Map; - -import org.codelibs.fess.util.SearchParamMap; - -public class FessRequestProcessor extends S2RequestProcessor/*ActionRequestProcessor*/{ - @Override - @SuppressWarnings("unchecked") - protected void setMapProperty(final Map map, final String name, final Object value) { - if (value instanceof String[]) { - if (map.get(SearchParamMap.CLASS_NAME) != null) { - map.put(name, value); - } else { - final String[] values = (String[]) value; - map.put(name, values.length > 0 ? values[0] : null); - } - } else { - map.put(name, value); - } - } - -} diff --git a/src/main/java/org/codelibs/fess/struts/action/SSCRequestProcessor.java b/src/main/java/org/codelibs/fess/struts/action/SSCRequestProcessor.java deleted file mode 100644 index 1fecba7c3e984ee9a17c670129ae3219a813ce27..0000000000000000000000000000000000000000 --- a/src/main/java/org/codelibs/fess/struts/action/SSCRequestProcessor.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright 2004-2010 the Seasar Foundation and the Others. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific language - * governing permissions and limitations under the License. - */ -package org.codelibs.fess.struts.action; - -import javax.servlet.ServletException; - -import org.lastaflute.web.ruts.config.ModuleConfig; -import org.lastaflute.web.ruts.process.ActionFormMapper.IndexParsedResult; - -/** - * @author shinsuke - * - */ -public class SSCRequestProcessor extends S2RequestProcessor { - protected static final char NESTED_DELIM = '.'; - - protected static final char INDEXED_DELIM = '['; - - protected static final char INDEXED_DELIM2 = ']'; - - protected int maxReqParamSize = 100; - - @Override - public void init(ActionServlet servlet, ModuleConfig moduleConfig) throws ServletException { - super.init(servlet, moduleConfig); - final Object value = servlet.getServletContext().getAttribute("sastruts.MAX_REQUEST_PARAMETER_SIZE"); - if (value != null) { - maxReqParamSize = Integer.parseInt(value.toString()); - } - } - - @Override - protected IndexParsedResult parseIndex(String name) { - final IndexParsedResult result = new SSCIndexParsedResult(); - while (true) { - final int index = name.indexOf(INDEXED_DELIM2); - if (index < 0) { - throw new IllegalArgumentException(INDEXED_DELIM2 + " is not found in " + name); - } - final int size = Integer.valueOf(name.substring(0, index)).intValue(); - if (size > maxReqParamSize) { - throw new IllegalArgumentException("The array size exceeds " + maxReqParamSize); - } - result.indexes = ArrayUtil.add(result.indexes, size); - name = name.substring(index + 1); - if (name.length() == 0) { - break; - } else if (name.charAt(0) == INDEXED_DELIM) { - name = name.substring(1); - } else if (name.charAt(0) == NESTED_DELIM) { - name = name.substring(1); - break; - } else { - throw new IllegalArgumentException(name); - } - } - result.name = name; - return result; - } - - /** - * - */ - protected static class SSCIndexParsedResult extends IndexParsedResult { - } - -} diff --git a/src/main/java/org/codelibs/fess/struts/servlet/SSCActionServlet.java b/src/main/java/org/codelibs/fess/struts/servlet/SSCActionServlet.java deleted file mode 100644 index ddfc8e6eb5c36e6b170cab17e6f978b9edce3aec..0000000000000000000000000000000000000000 --- a/src/main/java/org/codelibs/fess/struts/servlet/SSCActionServlet.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2012 the CodeLibs Project and the Others. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific language - * governing permissions and limitations under the License. - */ -package org.codelibs.fess.struts.servlet; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * PUT and DELETE supported ActionServlet. - * - * @author shinsuke - * - */ -// TODO Lastafluteでは不要 -public class SSCActionServlet extends ActionServlet { - - private static final long serialVersionUID = 1L; - - @Override - protected void doDelete(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException { - process(request, response); - } - - @Override - protected void doPut(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException { - process(request, response); - } - -} diff --git a/src/main/java/org/codelibs/fess/struts/upload/SSCMultipartRequestHandler.java b/src/main/java/org/codelibs/fess/struts/upload/SSCMultipartRequestHandler.java deleted file mode 100644 index a38d4b4ed9e63ad6757b11de0e935477ba69ab96..0000000000000000000000000000000000000000 --- a/src/main/java/org/codelibs/fess/struts/upload/SSCMultipartRequestHandler.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright 2012 the CodeLibs Project and the Others. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific language - * governing permissions and limitations under the License. - */ -package org.codelibs.fess.struts.upload; - -import java.io.File; -import java.io.InputStream; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileUploadBase.SizeLimitExceededException; -import org.apache.commons.fileupload.FileUploadException; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.apache.commons.fileupload.servlet.FileCleanerCleanup; -import org.apache.commons.fileupload.servlet.ServletFileUpload; -import org.apache.commons.io.FileCleaningTracker; -import org.lastaflute.web.ruts.config.ModuleConfig; -import org.lastaflute.web.ruts.multipart.MultipartRequestHandler; - -/** - * This class supports a multipart request handler to support commons-fileupload - * 1.2.2. - * - * @author shinsuke - * - */ -public class SSCMultipartRequestHandler extends S2MultipartRequestHandler { - - @SuppressWarnings("rawtypes") - @Override - public void handleRequest(final HttpServletRequest request) throws ServletException { - final ModuleConfig ac = (ModuleConfig) request.getAttribute(Globals.MODULE_KEY); - final FileCleaningTracker fileCleaningTracker = FileCleanerCleanup.getFileCleaningTracker(ServletContextUtil.getServletContext()); - final DiskFileItemFactory fileItemFactory = new DiskFileItemFactory((int) getSizeThreshold(ac), new File(getRepositoryPath(ac))); - request.setAttribute("fileItemFactory", fileItemFactory); - fileItemFactory.setFileCleaningTracker(fileCleaningTracker); - final ServletFileUpload upload = new ServletFileUpload(fileItemFactory); - upload.setHeaderEncoding(request.getCharacterEncoding()); - upload.setSizeMax(getSizeMax(ac)); - elementsText = new Hashtable(); - elementsFile = new Hashtable(); - elementsAll = new Hashtable(); - List items = null; - try { - items = upload.parseRequest(request); - } catch (final SizeLimitExceededException e) { - request.setAttribute(MultipartRequestHandler.ATTRIBUTE_MAX_LENGTH_EXCEEDED, Boolean.TRUE); - request.setAttribute(SIZE_EXCEPTION_KEY, e); - try { - final InputStream is = request.getInputStream(); - try { - final byte[] buf = new byte[1024]; - while ((is.read(buf)) != -1) { // NOPMD - } - } catch (final Exception ignore) {} finally { - try { - is.close(); - } catch (final Exception ignore) {} - } - } catch (final Exception ignore) {} - return; - } catch (final FileUploadException e) { - log.error("Failed to parse multipart request", e); - throw new ServletException(e); - } - - // Partition the items into form fields and files. - final Iterator iter = items.iterator(); - while (iter.hasNext()) { - final FileItem item = (FileItem) iter.next(); - - if (item.isFormField()) { - addTextParameter(request, item); - } else { - addFileParameter(item); - } - } - } -} diff --git a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java index 32c66d4b6e7e3e1041b023f36e37da2fa16cd341..aa7a9cc11e9132d79290ad44398a9a75a61b2396 100644 --- a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java +++ b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java @@ -30,6 +30,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringEscapeUtils; +import org.codelibs.core.lang.StringUtil; import org.codelibs.core.misc.DynamicProperties; import org.codelibs.fess.Constants; import org.codelibs.fess.entity.FacetQueryView; @@ -37,6 +38,7 @@ import org.codelibs.fess.helper.HotSearchWordHelper; import org.codelibs.fess.helper.HotSearchWordHelper.Range; import org.codelibs.fess.helper.ViewHelper; import org.codelibs.fess.util.ComponentUtil; +import org.lastaflute.di.util.LdiURLUtil; import org.lastaflute.web.util.LaRequestUtil; public class FessFunctions { @@ -188,9 +190,9 @@ public class FessFunctions { if (values != null) { for (final String value : values) { buf.append('&'); - buf.append(URLEncoderUtil.encode(name)); + buf.append(LdiURLUtil.encode(name, Constants.UTF_8)); buf.append('='); - buf.append(URLEncoderUtil.encode(value)); + buf.append(LdiURLUtil.encode(value, Constants.UTF_8)); } } } diff --git a/src/main/java/org/codelibs/fess/transformer/AbstractFessXpathTransformer.java b/src/main/java/org/codelibs/fess/transformer/AbstractFessXpathTransformer.java index c38a6d02243748bedf9b0658bce54cefca22dee3..05c2590be2136884f103d833c212dcb646555920 100644 --- a/src/main/java/org/codelibs/fess/transformer/AbstractFessXpathTransformer.java +++ b/src/main/java/org/codelibs/fess/transformer/AbstractFessXpathTransformer.java @@ -29,6 +29,9 @@ import org.codelibs.robot.transformer.impl.XpathTransformer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import groovy.lang.Binding; +import groovy.lang.GroovyShell; + public abstract class AbstractFessXpathTransformer extends XpathTransformer { private static final Logger logger = LoggerFactory.getLogger(AbstractFessXpathTransformer.class); @@ -177,8 +180,7 @@ public abstract class AbstractFessXpathTransformer extends XpathTransformer { } try { - final Object exp = OgnlUtil.parseExpression(template); - final Object value = OgnlUtil.getValue(exp, paramMap); + final Object value = new GroovyShell(new Binding(paramMap)).evaluate(template); if (value == null) { return null; } diff --git a/src/main/java/org/codelibs/fess/util/ActionMessagesUtil.java b/src/main/java/org/codelibs/fess/util/ActionMessagesUtil.java deleted file mode 100644 index 30ed76bd9e96cad8de3e143a64ce2cf279ef4230..0000000000000000000000000000000000000000 --- a/src/main/java/org/codelibs/fess/util/ActionMessagesUtil.java +++ /dev/null @@ -1,296 +0,0 @@ -/* - * Copyright 2012 the CodeLibs Project and the Others. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific language - * governing permissions and limitations under the License. - */ -package org.codelibs.fess.util; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import org.lastaflute.web.ruts.message.ActionMessage; -import org.lastaflute.web.ruts.message.ActionMessages; - -/** - * ActionMessages Utility. - * - * @author shinsuke - * - */ -public final class ActionMessagesUtil { - - private ActionMessagesUtil() { - } - - /** - * Add a message by a message key to a request. - * - * @param request - * @param key - */ - public static void addMessage(final HttpServletRequest request, final String key) { - addMessage(request, key, new Object[0]); - } - - /** - * Add a message by a message key to a request. - * - * @param request - * @param key - * @param values - */ - public static void addMessage(final HttpServletRequest request, final String key, final Object... values) { - final ActionMessages msgs = new ActionMessages(); - msgs.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(key, values)); - addMessages(request, msgs); - } - - /** - * Add a message by a message key to a session. - * - * @param session - * @param key - */ - public static void addMessage(final HttpSession session, final String key) { - addMessage(session, key, new Object[0]); - } - - /** - * Add a message by a message key to a session. - * - * @param session - * @param key - * @param values - */ - public static void addMessage(final HttpSession session, final String key, final Object... values) { - final ActionMessages msgs = new ActionMessages(); - msgs.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(key, values)); - addMessages(session, msgs); - } - - /** - * Add an error message by a message key to a request. - * - * @param request - * @param key - */ - public static void addError(final HttpServletRequest request, final String key) { - addError(request, key, new Object[0]); - } - - /** - * Add an error message by a message key to a request. - * - * @param request - * @param key - * @param values - */ - public static void addError(final HttpServletRequest request, final String key, final Object... values) { - final ActionMessages msgs = new ActionMessages(); - msgs.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(key, values)); - addErrors(request, msgs); - } - - /** - * Add an error message by a message key to a session. - * - * @param session - * @param key - */ - public static void addError(final HttpSession session, final String key) { - addError(session, key, new Object[0]); - } - - /** - * Add an error message by a message key to a session. - * - * @param session - * @param key - * @param values - */ - public static void addError(final HttpSession session, final String key, final Object... values) { - final ActionMessages msgs = new ActionMessages(); - msgs.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(key, values)); - addErrors(session, msgs); - } - - // From SAStruts - - /** - * エラーメッセージをリクエストに保存します。 - * - * @param request - * リクエスト - * @param errors - * エラーメッセージ - * - */ - public static void saveErrors(final HttpServletRequest request, final ActionMessages errors) { - if (errors == null || errors.isEmpty()) { - request.removeAttribute(Globals.ERROR_KEY); - return; - } - request.setAttribute(Globals.ERROR_KEY, errors); - } - - /** - * エラーメッセージをセッションに保存します。 - * - * @param session - * セッション - * @param errors - * エラーメッセージ - * - */ - public static void saveErrors(final HttpSession session, final ActionMessages errors) { - if (errors == null || errors.isEmpty()) { - session.removeAttribute(Globals.ERROR_KEY); - return; - } - session.setAttribute(Globals.ERROR_KEY, errors); - } - - /** - * メッセージをリクエストに保存します。 - * - * @param request - * リクエスト - * @param messages - * メッセージ - * - */ - public static void saveMessages(final HttpServletRequest request, final ActionMessages messages) { - if (messages == null || messages.isEmpty()) { - request.removeAttribute(Globals.MESSAGE_KEY); - return; - } - request.setAttribute(Globals.MESSAGE_KEY, messages); - } - - /** - * メッセージをセッションに保存します。 - * - * @param session - * セッション - * @param messages - * メッセージ - * - */ - public static void saveMessages(final HttpSession session, final ActionMessages messages) { - if (messages == null || messages.isEmpty()) { - session.removeAttribute(Globals.MESSAGE_KEY); - return; - } - session.setAttribute(Globals.MESSAGE_KEY, messages); - } - - /** - * エラーメッセージをリクエストに追加します。 - * - * @param request - * リクエスト - * @param errors - * エラーメッセージ - * - */ - public static void addErrors(final HttpServletRequest request, final ActionMessages errors) { - if (errors == null) { - return; - } - ActionMessages requestErrors = (ActionMessages) request.getAttribute(Globals.ERROR_KEY); - if (requestErrors == null) { - requestErrors = new ActionMessages(); - } - requestErrors.add(errors); - saveErrors(request, requestErrors); - } - - /** - * エラーメッセージをセッションに追加します。 - * - * @param session - * セッション - * @param errors - * エラーメッセージ - * - */ - public static void addErrors(final HttpSession session, final ActionMessages errors) { - if (errors == null) { - return; - } - ActionMessages sessionErrors = (ActionMessages) session.getAttribute(Globals.ERROR_KEY); - if (sessionErrors == null) { - sessionErrors = new ActionMessages(); - } - sessionErrors.add(errors); - saveErrors(session, sessionErrors); - } - - /** - * エラーメッセージがあるかどうかを返します。 - * - * @param request - * リクエスト - * @return エラーメッセージがあるかどうか - * @since 1.0.4 - */ - public static boolean hasErrors(final HttpServletRequest request) { - final ActionMessages errors = (ActionMessages) request.getAttribute(Globals.ERROR_KEY); - if (errors != null && !errors.isEmpty()) { - return true; - } - return false; - } - - /** - * メッセージをリクエストに追加します。 - * - * @param request - * リクエスト - * @param messages - * メッセージ - * - */ - public static void addMessages(final HttpServletRequest request, final ActionMessages messages) { - if (messages == null) { - return; - } - ActionMessages requestMessages = (ActionMessages) request.getAttribute(Globals.MESSAGE_KEY); - if (requestMessages == null) { - requestMessages = new ActionMessages(); - } - requestMessages.add(messages); - saveMessages(request, requestMessages); - } - - /** - * メッセージをセッションに追加します。 - * - * @param session - * セッション - * @param messages - * メッセージ - * - */ - public static void addMessages(final HttpSession session, final ActionMessages messages) { - if (messages == null) { - return; - } - ActionMessages sessionMessages = (ActionMessages) session.getAttribute(Globals.MESSAGE_KEY); - if (sessionMessages == null) { - sessionMessages = new ActionMessages(); - } - sessionMessages.add(messages); - saveMessages(session, sessionMessages); - } -} diff --git a/src/main/java/org/codelibs/fess/util/ComponentUtil.java b/src/main/java/org/codelibs/fess/util/ComponentUtil.java index 7e8aa6663c35fceb6168277db333596131920a5d..172851f577bd0c6e3a4849f742e263807e77c6df 100644 --- a/src/main/java/org/codelibs/fess/util/ComponentUtil.java +++ b/src/main/java/org/codelibs/fess/util/ComponentUtil.java @@ -44,15 +44,16 @@ import org.codelibs.fess.helper.ViewHelper; import org.codelibs.fess.job.JobExecutor; import org.codelibs.fess.solr.IndexUpdater; import org.codelibs.robot.extractor.ExtractorFactory; +import org.lastaflute.core.message.MessageManager; import org.lastaflute.di.core.SingletonLaContainer; public final class ComponentUtil { + private static final String MESSAGE_MANAGER = "messageManager"; + private static final String USER_AGENT_NAME = "userAgentName"; private static final String INDEX_UPDATER = "indexUpdater"; - private static final String DATABASE_HELPER = "databaseHelper"; - private static final String MAIL_HELPER = "mailHelper"; private static final String FILE_TYPE_HELPER = "fileTypeHelper"; @@ -236,6 +237,10 @@ public final class ComponentUtil { return SingletonLaContainer.getComponent(ELASTICSEARCH_CLIENT); } + public static MessageManager getMessageManager() { + return SingletonLaContainer.getComponent(MESSAGE_MANAGER); + } + public static T getComponent(Class clazz) { return SingletonLaContainer.getComponent(clazz); } diff --git a/src/main/java/org/codelibs/fess/validator/CronExpressionChecks.java b/src/main/java/org/codelibs/fess/validator/CronExpressionChecks.java index 46cd7d78607c90c7d70e52e6279db867da7bdbb7..90b2d5c4278cb7f85c1367199241f9fdfe24b1c7 100644 --- a/src/main/java/org/codelibs/fess/validator/CronExpressionChecks.java +++ b/src/main/java/org/codelibs/fess/validator/CronExpressionChecks.java @@ -22,18 +22,19 @@ import org.codelibs.core.lang.StringUtil; import org.lastaflute.web.ruts.message.ActionMessages; import org.quartz.CronExpression; -public class CronExpressionChecks extends S2FieldChecks { +//TODO replace with hibernate validator +public class CronExpressionChecks /*extends S2FieldChecks*/{ private static final long serialVersionUID = 1L; - - public static boolean validateCronExpression(final Object bean, final ValidatorAction validatorAction, final Field field, - final ActionMessages errors, final Validator validator, final HttpServletRequest request) { - final String value = getValueAsString(bean, field); - if (StringUtil.isNotBlank(value) && !CronExpression.isValidExpression(value)) { - addError(errors, field, validator, validatorAction, request); - return false; + /* + public static boolean validateCronExpression(final Object bean, final ValidatorAction validatorAction, final Field field, + final ActionMessages errors, final Validator validator, final HttpServletRequest request) { + final String value = getValueAsString(bean, field); + if (StringUtil.isNotBlank(value) && !CronExpression.isValidExpression(value)) { + addError(errors, field, validator, validatorAction, request); + return false; + } + return true; } - return true; - } - + */ } diff --git a/src/main/java/org/codelibs/fess/validator/UriTypeChecks.java b/src/main/java/org/codelibs/fess/validator/UriTypeChecks.java index fe1b68d2dfff2e8c15866fab695d0fcd4155f489..237876ad5be712d96d1d54c67df53d49038115a9 100644 --- a/src/main/java/org/codelibs/fess/validator/UriTypeChecks.java +++ b/src/main/java/org/codelibs/fess/validator/UriTypeChecks.java @@ -16,32 +16,30 @@ package org.codelibs.fess.validator; -import javax.servlet.http.HttpServletRequest; - import org.codelibs.core.lang.StringUtil; -import org.codelibs.fess.FessSystemException; -import org.lastaflute.web.ruts.message.ActionMessages; -public class UriTypeChecks extends S2FieldChecks { +// TODO replace with hibernate validator +public class UriTypeChecks /*extends S2FieldChecks*/{ private static final long serialVersionUID = 1L; - public static boolean validateUriType(final Object bean, final ValidatorAction validatorAction, final Field field, - final ActionMessages errors, final Validator validator, final HttpServletRequest request) { - final String value = getValueAsString(bean, field); - if (StringUtil.isNotBlank(value)) { - final String protocols = field.getVarValue("protocols"); - if (StringUtil.isEmpty(protocols)) { - throw new FessSystemException("protocols is empty."); - } - if (!check(protocols, value)) { - addError(errors, field, validator, validatorAction, request); - return false; + /* + public static boolean validateUriType(final Object bean, final ValidatorAction validatorAction, final Field field, + final ActionMessages errors, final Validator validator, final HttpServletRequest request) { + final String value = getValueAsString(bean, field); + if (StringUtil.isNotBlank(value)) { + final String protocols = field.getVarValue("protocols"); + if (StringUtil.isEmpty(protocols)) { + throw new FessSystemException("protocols is empty."); + } + if (!check(protocols, value)) { + addError(errors, field, validator, validatorAction, request); + return false; + } } + return true; } - return true; - } - + */ protected static boolean check(final String protocols, final String values) { final String[] prtcls = protocols.split(","); final String[] paths = values.split("[\r\n]"); diff --git a/src/main/resources/esclient.xml b/src/main/resources/esclient.xml index 12640d8a2679ccbb010cea53236180a211b0336d..559651c225446c2f924825e40128136dc2285ac9 100644 --- a/src/main/resources/esclient.xml +++ b/src/main/resources/esclient.xml @@ -9,6 +9,18 @@ "fess/doc" + + "fess" + "ja/mapping.txt" + + + "fess" + "ja/synonym.txt" + + + "fess" + "ja/kuromoji.txt" + ".fess_config/boost_document_rule" diff --git a/src/main/resources/fess_indices/fess/ja/kuromoji.txt b/src/main/resources/fess_indices/fess/ja/kuromoji.txt new file mode 100644 index 0000000000000000000000000000000000000000..0584019a9ea2e89635e060fd2a51e503dc5b2074 --- /dev/null +++ b/src/main/resources/fess_indices/fess/ja/kuromoji.txt @@ -0,0 +1,3 @@ +日本経済新聞,日本 経済 新聞,ニホン ケイザイ シンブン,カスタム名詞 +関西国際空港,関西 国際 空港,カンサイ コクサイ クウコウ,テスト名詞 +朝青龍,朝青龍,アサショウリュウ,カスタム名詞 diff --git a/src/main/resources/fess_indices/fess/ja/mapping.txt b/src/main/resources/fess_indices/fess/ja/mapping.txt new file mode 100644 index 0000000000000000000000000000000000000000..9276761bf3f53ccb79ab3f9f39c3b667b4c3080e --- /dev/null +++ b/src/main/resources/fess_indices/fess/ja/mapping.txt @@ -0,0 +1,189 @@ +# Half-width Katakana ＝＞ Full-width Katakana +"ｱ" => "ア" +"ｲ" => "イ" +"ｳ" => "ウ" +"ｴ" => "エ" +"ｵ" => "オ" +"ｶ" => "カ" +"ｷ" => "キ" +"ｸ" => "ク" +"ｹ" => "ケ" +"ｺ" => "コ" +"ｻ" => "サ" +"ｼ" => "シ" +"ｽ" => "ス" +"ｾ" => "セ" +"ｿ" => "ソ" +"ﾀ" => "タ" +"ﾁ" => "チ" +"ﾂ" => "ツ" +"ﾃ" => "テ" +"ﾄ" => "ト" +"ﾅ" => "ナ" +"ﾆ" => "ニ" +"ﾇ" => "ヌ" +"ﾈ" => "ネ" +"ﾉ" => "ノ" +"ﾊ" => "ハ" +"ﾋ" => "ヒ" +"ﾌ" => "フ" +"ﾍ" => "ヘ" +"ﾎ" => "ホ" +"ﾏ" => "マ" +"ﾐ" => "ミ" +"ﾑ" => "ム" +"ﾒ" => "メ" +"ﾓ" => "モ" +"ﾔ" => "ヤ" +"ﾕ" => "ユ" +"ﾖ" => "ヨ" +"ﾗ" => "ラ" +"ﾘ" => "リ" +"ﾙ" => "ル" +"ﾚ" => "レ" +"ﾛ" => "ロ" +"ﾜ" => "ワ" +"ｦ" => "ヲ" +"ﾝ" => "ン" +"ｯ" => "ッ" +"ｧ" => "ァ" +"ｨ" => "ィ" +"ｩ" => "ゥ" +"ｪ" => "ェ" +"ｫ" => "ォ" +"ｬ" => "ャ" +"ｭ" => "ュ" +"ｮ" => "ョ" +"ｶﾞ" => "ガ" +"ｷﾞ" => "ギ" +"ｸﾞ" => "グ" +"ｹﾞ" => "ゲ" +"ｺﾞ" => "ゴ" +"ｻﾞ" => "ザ" +"ｼﾞ" => "ジ" +"ｽﾞ" => "ズ" +"ｾﾞ" => "ゼ" +"ｿﾞ" => "ゾ" +"ﾀﾞ" => "ダ" +"ﾁﾞ" => "ヂ" +"ﾂﾞ" => "ヅ" +"ﾃﾞ" => "デ" +"ﾄﾞ" => "ド" +"ﾊﾞ" => "バ" +"ﾋﾞ" => "ビ" +"ﾌﾞ" => "ブ" +"ﾍﾞ" => "ベ" +"ﾎﾞ" => "ボ" +"ﾊﾟ" => "パ" +"ﾋﾟ" => "ピ" +"ﾌﾟ" => "プ" +"ﾍﾟ" => "ペ" +"ﾎﾟ" => "ポ" + +# Full-width alpha-numeric ＝＞ Half-width alpha-numeric +"０" => "0" +"１" => "1" +"２" => "2" +"３" => "3" +"４" => "4" +"５" => "5" +"６" => "6" +"７" => "7" +"８" => "8" +"９" => "9" + +"Ａ" => "A" +"Ｂ" => "B" +"Ｃ" => "C" +"Ｄ" => "D" +"Ｅ" => "E" +"Ｆ" => "F" +"Ｇ" => "G" +"Ｈ" => "H" +"Ｉ" => "I" +"Ｊ" => "J" +"Ｋ" => "K" +"Ｌ" => "L" +"Ｍ" => "M" +"Ｎ" => "N" +"Ｏ" => "O" +"Ｐ" => "P" +"Ｑ" => "Q" +"Ｒ" => "R" +"Ｓ" => "S" +"Ｔ" => "T" +"Ｕ" => "U" +"Ｖ" => "V" +"Ｗ" => "W" +"Ｘ" => "X" +"Ｙ" => "Y" +"Ｚ" => "Z" + +"ａ" => "a" +"ｂ" => "b" +"ｃ" => "c" +"ｄ" => "d" +"ｅ" => "e" +"ｆ" => "f" +"ｇ" => "g" +"ｈ" => "h" +"ｉ" => "i" +"ｊ" => "j" +"ｋ" => "k" +"ｌ" => "l" +"ｍ" => "m" +"ｎ" => "n" +"ｏ" => "o" +"ｐ" => "p" +"ｑ" => "q" +"ｒ" => "r" +"ｓ" => "s" +"ｔ" => "t" +"ｕ" => "u" +"ｖ" => "v" +"ｗ" => "w" +"ｘ" => "x" +"ｙ" => "y" +"ｚ" => "z" + +# !"#$%&'()=|-^\@[`{;:]+*}/_<>? +"！" => "!" +"”" => "\"" +"＃" => "#" +"＄" => "$" +"％" => "%" +"＆" => "&" +"’" => "'" +"（" => "(" +"）" => ")" +"＝" => "=" +"｜" => "|" +"－" => "-" +"＾" => "^" +"￥" => "\\" +"＠" => "@" +"［" => "[" +"｀" => "`" +"｛" => "{" +"；" => ";" +"：" => ":" +"］" => "]" +"＋" => "+" +"＊" => "*" +"｝" => "}" +"／" => "/" +"＿" => "_" +"＜" => "<" +"＞" => ">" +"？" => "?" +"‘" => "`" + +"①" => "1" +"②" => "2" +"③" => "3" +"④" => "4" +"⑤" => "5" +"⑥" => "6" +"⑦" => "7" +"⑧" => "8" +"⑨" => "9" diff --git a/src/main/resources/fess_indices/fess/ja/synonym.txt b/src/main/resources/fess_indices/fess/ja/synonym.txt new file mode 100644 index 0000000000000000000000000000000000000000..e432e75cab82b5beecda9f98bdb284f3565af104 --- /dev/null +++ b/src/main/resources/fess_indices/fess/ja/synonym.txt @@ -0,0 +1 @@ +fess,フェス diff --git a/src/main/webapp/WEB-INF/view/admin/crawl/index.jsp b/src/main/webapp/WEB-INF/view/admin/crawl/index.jsp index 61bda462a42d89d18b4065d9ff56ff8e95227c32..8125d58e46eae4f13f3e35266b716a013931c90d 100644 --- a/src/main/webapp/WEB-INF/view/admin/crawl/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/crawl/index.jsp @@ -1,240 +1,223 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.crawler_configuration" /> + + + +
+ + + + + - <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> +
- -
-

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - - - ${f:h(item.label)} - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - - - - ${f:h(d)} - - - -
- - - -
- - - -
- - - -
- - - -
- "/> -
-
- + <%-- Content Header --%> +
+

+ +

+
+ +
+ + <%-- Form --%> + +
+
+
+ <%-- Box Header --%> + <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
+ <%-- Form Fields --%> +
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ + +
+
+ +
+ + + ${f:h(item.label)} + + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ + +
+
+ + +
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ + + + ${f:h(d)} + + + +
+
+
+ + +
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ +
+
- - +
+ <%-- Box Footer --%> +
+ " + /> +
+
+
+
+ + +
+
+ + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/dataConfig/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/dataConfig/confirm.jsp index 784adeb9a2695243c8088a3926900f333fe25748..4ee2c2f633f8650eef0a9638d072ac6b95346602 100644 --- a/src/main/webapp/WEB-INF/view/admin/dataConfig/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dataConfig/confirm.jsp @@ -1,164 +1,211 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.data_crawling_configuration" /> + + + +
+ + + + + -
+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - -<%-- Confirm Form: BEGIN --%> - - -
- - - - - - - -

-
-
    + <%-- Content Header --%> +
    +

    + +

    +
      2. -
      3. +
      4. -
      5. +
      6. -
      7. +
      8. -
      9. +
      10. -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - -
${f:h(id)}
${f:h(name)}
- - -${f:h(hn.label)}
- - - -
${f:br(f:h(handlerParameter))}
${f:br(f:h(handlerScript))}
${f:h(boost)}
- - - -${f:h(rt.name)}
- - - - - - ${f:h(rt.name)} - - -
- - - -${f:h(l.name)}
- - - - - - ${f:h(l.name)} - - -
- - -
- - "/> - "/> - - - "/> - "/> - - - "/> - "/> - - - "/> - "/> - "/> - -
-
- -<%-- Confirm Form: BEGIN --%> +
-
+ <%-- Form --%> + + + + + + + + + +
+
+
+ <%-- Box Header --%> +
+

+ + + + + + + + + + + + +

+
+ + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
+ <%-- Form Fields --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${f:h(id)}
${f:h(name)}
+ + + ${f:h(hn.label)}
+ + + +
${f:br(f:h(handlerParameter))}
${f:br(f:h(handlerScript))}
${f:h(boost)}
+ + + + ${f:h(rt.name)}
+ + + + + + ${f:h(rt.name)} + + +
+ + + + ${f:h(l.name)}
+ + + + + + ${f:h(l.name)} + + +
+ + +
+
+ + <%-- Box Footer --%> +
+ + " /> + " + /> + + + " /> + " + /> + + + " /> + " + /> + + + " /> + " + /> + " + /> + +
+
+
+
+ + + +
- - + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/dataConfig/edit.jsp b/src/main/webapp/WEB-INF/view/admin/dataConfig/edit.jsp index 0870e6765f05139495a5ee104c191abffc286df2..3a9395a562d690ff8f63fbef572f93f253fcf4c5 100644 --- a/src/main/webapp/WEB-INF/view/admin/dataConfig/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dataConfig/edit.jsp @@ -1,147 +1,165 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.data_crawling_configuration" /> + + + +
+ + + + + -
+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - - <%-- Edit Form: BEGIN --%> - - -
- - - - - - - -

+ <%-- Content Header --%> +
+

-

-
-
    +

+
    2. -
    3. +
    4. -
    5. +
    6. -
    7. +
    8. -
    9. +
    10. - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +
+ + <%-- Form --%> + + + + + + + + + +
+
+
+ <%-- Box Header --%> +
+

+ + + + + + +

+
+ + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
+ <%-- Form Fields --%> +
+ + +
+
+ + + + ${f:h(hn.label)} + + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + + ${f:h(rt.name)} + + +
+
+ + + + ${f:h(l.name)} + + +
+
+ + + + + + + + + +
+
-
- - - - - -
- - ${f:h(hn.label)} - -
- - ${f:h(rt.name)} - -
- - ${f:h(l.name)} - -
- - - - - - -
- " /> - " /> - - " /> - " /> -
-
- - <%-- Edit Form: BEGIN --%> + <%-- Box Footer --%> +
+ + " /> + " + /> + + + " /> + " + /> + +
+
+
+ + + - - + + + + + diff --git a/src/main/webapp/WEB-INF/view/admin/dataConfig/error.jsp b/src/main/webapp/WEB-INF/view/admin/dataConfig/error.jsp index 33c2bd3bd1d4cb9470a750b80d110b7e30743dd7..56af0732d02b7c4bb1788da1f6cb04dcceb6f344 100644 --- a/src/main/webapp/WEB-INF/view/admin/dataConfig/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dataConfig/error.jsp @@ -1,19 +1,50 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.data_crawling_configuration" /> + + + +
+ + + + + -
- - -
- +
+
+

+ +

+
    +
  1. + +
    2. +
+
-
+
- - \ No newline at end of file +
+

Error

+

+ +

+

+ + + +

+
+ +
+
+ + + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/dataConfig/index.jsp b/src/main/webapp/WEB-INF/view/admin/dataConfig/index.jsp index f128fed76d1e4d0d9237c890ce3cf76486fe51aa..fdf882dd385f2eb1fb878508f12fe289e5cb8258 100644 --- a/src/main/webapp/WEB-INF/view/admin/dataConfig/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dataConfig/index.jsp @@ -1,126 +1,134 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.data_crawling_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> + <%-- Content Header --%> +
+

+ +

+
    +
  1. + +
    2. +
+
- <%-- List: BEGIN --%> +
-
-
-
    -
    • -
  • - -
    • -
-
+
+
+
+ <%-- Box Header --%> +
+

+ +

+
+ + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
- -

- -

- - - - - - - - - - - - - + <%-- List --%> + +

+ +

+ + +
 
+ + + + + + + + + + + + + + +
${f:h(data.name)} + + + + + +
+ - ${f:h(data.name)} - - - - - +
+ <%-- Box Footer --%> +
+ <%-- Paging Info --%> + - - - - - - - - - - - - <%-- Page Navigation: BEGIN --%> -
- -
- + <%-- Paging Navigation --%> +
    + + + + + + + +
  • class="active">${p} +
    • +     + + + + + + +
+ +
+
- <%-- Page Navigation: END --%> - + +
- <%-- List: END --%> - - + +
+ + + + diff --git a/src/main/webapp/WEB-INF/view/admin/fileAuthentication/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/fileAuthentication/confirm.jsp index 10eee1f0a6e3afff31d5a347cf8130894720723c..b99b269a34db0bc6d4dcfdce3aff1a024aaafa51 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileAuthentication/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileAuthentication/confirm.jsp @@ -1,134 +1,172 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.file_authentication_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - -
-
    + <%-- Content Header --%> +
    +

    + +

    +
      2. -
      3. +
      4. -
      5. +
      6. -
      7. +
      8. -
      9. +
      10. -
-
+ + - <%-- Confirm Form: BEGIN --%> - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
${f:h(hostname)}
${f:h(port)}
- ${f:h(item.label)} -
${f:h(username)}
******
${f:br(f:h(parameters))}
- ${f:h(item.label)} -
- " /> - " /> - - " /> - " /> - - " /> - " /> - - " /> - " /> - " /> -
-
- - <%-- Confirm Form: BEGIN --%> +
+ + <%-- Form --%> + + + + + + + + +
+
+
+ <%-- Box Header --%> +
+

+ + + + + + + + + + + + +

+
+ + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
+ <%-- Form Fields --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${f:h(hostname)}
${f:h(port)}
+ ${f:h(item.label)} +
${f:h(username)}
****** +
${f:br(f:h(parameters))}
+ ${f:h(item.label)} +
+ +
+ <%-- Box Footer --%> +
+ + " /> + " + /> + + + " /> + " + /> + + + " /> + " + /> + + + " /> + " + /> + " + /> + +
+
+
+
+ + +
+
- - + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/fileAuthentication/edit.jsp b/src/main/webapp/WEB-INF/view/admin/fileAuthentication/edit.jsp index 93f1fcf56d57bb60187700037d41021bbdd83009..dc1dd5d008929fb36ce9ed88c9a1e77ae1ef9a96 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileAuthentication/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileAuthentication/edit.jsp @@ -1,125 +1,151 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.file_authentication_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - -
-
    + <%-- Content Header --%> +
    +

    + +

    +
      2. -
      3. +
      4. -
      5. +
      6. -
      7. +
      8. -
      9. +
      10. +       +
    +
    + +
    + + <%-- Form --%> + + + + + -
-
+ + + +
+
+
+ <%-- Box Header --%> +
+

+ + + + + + +

+
+ + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
- <%-- Edit Form: BEGIN --%> - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - ${f:h(item.label)} - -
- - ${f:h(item.label)} - -
- " /> - " /> - - " /> - " /> -
-
- - <%-- Edit Form: BEGIN --%> + <%-- Form Fields --%> +
+ + +
+
+ + +
+
+ + + + ${f:h(item.label)} + + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + + ${f:h(item.label)} + + +
+
+ <%-- Box Footer --%> +
+ + " /> + " + /> + + + " /> + " + /> + +
+
+
+
+ + + +
- - + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/fileAuthentication/error.jsp b/src/main/webapp/WEB-INF/view/admin/fileAuthentication/error.jsp index 33d18237327d993e605206fa150a7f8ff9ca4522..58cf19f69f4dae1f491ca0ebf50a20981b4cd345 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileAuthentication/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileAuthentication/error.jsp @@ -1,17 +1,50 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.file_authentication_configuration" /> + + + +
+ + + + + -
- -
- -
+
+
+

+ +

+
    +
  1. + +
    2. +
+
- - +
+ +
+

Error

+

+ +

+

+ + + +

+
+ +
+
+ + + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/fileAuthentication/index.jsp b/src/main/webapp/WEB-INF/view/admin/fileAuthentication/index.jsp index 1397f04b7739d565a3877f1251a56e1ff186b38b..bb03f3b1464f732bcf8d97dd0c6b1faba93bcbb5 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileAuthentication/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileAuthentication/index.jsp @@ -1,130 +1,143 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.file_authentication_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - - <%-- List: BEGIN --%> -
-
- -
    -
    • -
  • - + <%-- Content Header --%> +
    +

    + +

    +
      +
    1. +
      2. -
- - - - - - -
- -

- -

- - - - - - - - - - - - - - - - - - - -
 
- - ${f:h(data.hostname)}: - - ${f:h(data.port)}${f:h(data.fileConfig.name)} - - - - - -
- <%-- Page Navigation: BEGIN --%> -
- + + + +
+ +
+
+ + + + + + +
+ <%-- Box Header --%> +
+

+ +

+
+ + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
-
- + <%-- List --%> + +

+ +

+ + + + + + + + + + + + + + + + + +
+ + + ${f:h(data.hostname)}: + + + + ${f:h(data.port)} + + ${f:h(data.fileConfig.name)}
+ + +
+ <%-- Box Footer --%> +
+ <%-- Paging Info --%> + + + <%-- Paging Navigation --%> +
    + + + + + + + +
  • class="active">${p} +
    • +     + + + + + + +
+ +
+
+
- <%-- Page Navigation: END --%> - -
- <%-- List: END --%> +
+
- - + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/fileConfig/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/fileConfig/confirm.jsp index ebbc7b9e6d8395d2a3ed2a471d02652a63706ac2..726ee4d33ac2a45177949b419aff1cecc7612a05 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileConfig/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileConfig/confirm.jsp @@ -50,6 +50,7 @@ +
@@ -230,4 +231,3 @@ - diff --git a/src/main/webapp/WEB-INF/view/admin/fileConfig/edit.jsp b/src/main/webapp/WEB-INF/view/admin/fileConfig/edit.jsp index f6664f76a912ee82c9c4465e191b8e21ebacd326..6366777bfa4707ca794ccc7b20bf3db5135f7a33 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileConfig/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileConfig/edit.jsp @@ -50,6 +50,7 @@ +
@@ -82,7 +83,7 @@
<%-- Form Fields --%> - + <%-- Form Fields --%>
@@ -192,4 +193,3 @@ - diff --git a/src/main/webapp/WEB-INF/view/admin/labelType/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/labelType/confirm.jsp index 10a2e6a89dadb4de41a15066cca416bf0ebc73c5..0ede9e1c2878a70b44b5deff2a3a3a537715599f 100644 --- a/src/main/webapp/WEB-INF/view/admin/labelType/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/labelType/confirm.jsp @@ -1,137 +1,176 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.labeltype_configuration" /> + + + +
+ + + + + -

- -

- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> +
-
-
    + <%-- Content Header --%> +
    +

    + +

    +
      2. -
      3. +
      4. -
      5. +
      6. -
      7. +
      8. -
      9. +
      10. -
-
+ + + +
- <%-- Confirm Form: BEGIN --%> - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + +
+ + + +
+ + <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
+ <%-- Form Fields --%> +
${f:h(name)}
${f:h(value)}
${f:br(f:h(includedPaths))}
${f:br(f:h(excludedPaths))}
- - ${f:h(rt.name)}
+ <%-- Form --%> + + + + + + + + +
+
+
+ <%-- Box Header --%> +
+

+ + + + + - - - - ${f:h(rt.name)} - -

${f:h(sortOrder)}
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
${f:h(name)}
${f:h(value)}
${f:br(f:h(includedPaths))}
${f:br(f:h(excludedPaths))}
+ + + + ${f:h(rt.name)}
+ + + + + + ${f:h(rt.name)} + + +
${f:h(sortOrder)}
+
- - - - - " /> - " /> - - " /> - " /> - - " /> - " /> - - " /> - " /> - " /> - - - - -
- - <%-- Confirm Form: BEGIN --%> + <%-- Box Footer --%> +
+ + " /> + " + /> + + + " /> + " + /> + + + " /> + " + /> + + + " /> + " + /> + " + /> + +
+
+
+
+ + + +
- - + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/labelType/edit.jsp b/src/main/webapp/WEB-INF/view/admin/labelType/edit.jsp index 1784edd43a19311e9e80d592a82a88fdac79616e..264d5d2370aee82bab25b42308be0cd898941561 100644 --- a/src/main/webapp/WEB-INF/view/admin/labelType/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/labelType/edit.jsp @@ -1,120 +1,142 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.labeltype_configuration" /> + + + +
+ + + + + -

- -

- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> +
-
-
    + <%-- Content Header --%> +
    +

    + +

    +
      2. -
      3. +
      4. -
      5. +
      6. -
      7. +
      8. -
      9. +
      10. -
-
+ + + +
- <%-- Edit Form: BEGIN --%> - - -
- - - - - - - - + <%-- Form --%> + + + + + + + + +
+
+
+ <%-- Box Header --%> +
+

+ + + + + + +

+
+ + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
-
- - - - - - - - - - - - - - - - - - - - - - - + <%-- Form Fields --%> +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + + ${f:h(rt.name)} + + +
+
+ + +
+ + <%-- Box Footer --%> +
+ + " /> + " + /> + + + " /> + " + /> + +
+ + + + + + - - - - - - -
- - ${f:h(rt.name)} - -
- " /> - " /> - - " /> - " /> -
-
- - <%-- Edit Form: BEGIN --%> - - + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/labelType/error.jsp b/src/main/webapp/WEB-INF/view/admin/labelType/error.jsp index bcc7d14a15459eb229754e88aefadc21abef0f26..0749a1d8e4ae96969db8a76321c3f8d9ccff814b 100644 --- a/src/main/webapp/WEB-INF/view/admin/labelType/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/labelType/error.jsp @@ -1,20 +1,50 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.labeltype_configuration" /> + + + +
+ + + + + -
- - -
- +
+
+

+ +

+
    +
  1. + +
    2. +
+
-
+
- - +
+

Error

+

+ +

+

+ + + +

+
+
+
+ + + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/labelType/index.jsp b/src/main/webapp/WEB-INF/view/admin/labelType/index.jsp index cf18e91adfa47474f222655d6df6849e486dff7c..d4ee1321e2abab90541d3811351db5a9f3fb1046 100644 --- a/src/main/webapp/WEB-INF/view/admin/labelType/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/labelType/index.jsp @@ -1,116 +1,125 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.labeltype_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - - <%-- List: BEGIN --%> -
-
-
    -
    • -
  • - + <%-- Content Header --%> +
    +

    + +

    +
      +
    1. +
      2. -
-
+ + - -

- -

- - - - - - +
-
- - - - - - - - - - -
 
${f:h(data.name)} - - - - - -
- <%-- Page Navigation: BEGIN --%> -
- -
- +
+
+
+ <%-- Box Header --%> +
+

+ +

+
+ + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
+ + <%-- List --%> + +

+ +

+ + + + + + + + + + + + + + + +
${f:h(data.name)}
+ + +
+ <%-- Box Footer --%> +
+ <%-- Paging Info --%> + + + <%-- Paging Navigation --%> +
    + + + + + + + +
  • class="active">${p} +
    • +     + + + + + + +
+ +
+
- <%-- Page Navigation: END --%> - -
- <%-- List: END --%> + +
- - + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/overlappingHost/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/overlappingHost/confirm.jsp index a6f3daa9bfd81e6699e69ed3db18dd78cc81c49c..844fa080e446ae6fe986027a834f29ce6262e22e 100644 --- a/src/main/webapp/WEB-INF/view/admin/overlappingHost/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/overlappingHost/confirm.jsp @@ -1,110 +1,148 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.overlapping_host_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - -
-
    + <%-- Content Header --%> +
    +

    + +

    +
      2. -
      3. +
      4. -
      5. +
      6. -
      7. +
      8. -
      9. +
      10. -
-
+ + - <%-- Confirm Form: BEGIN --%> - - -
- - - - - - - - - +
-
- - - - - - - + <%-- Form --%> + + + + + + + + + +
+
+
+ <%-- Box Header --%> +
+

+ + + + + + + + + + + + +

+
+ + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
+ <%-- Form Fields --%> +
${f:h(regularName)}
${f:h(overlappingName)}
+ + + + + + + + + + +
${f:h(regularName)}
${f:h(overlappingName)}
+
- - - - - " /> - " /> - - " /> - " /> - - " /> - " /> - - " /> - " /> - " /> - - - - -
- - <%-- Confirm Form: BEGIN --%> + <%-- Box Footer --%> +
+ + " /> + " + /> + + + " /> + " + /> + + + " /> + " + /> + + + " /> + " + /> + " + /> + +
+
+
+
+ + + +
- - + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/overlappingHost/edit.jsp b/src/main/webapp/WEB-INF/view/admin/overlappingHost/edit.jsp index bf08b1805a38a7f3dd08788ebff58498292c30a6..bfae56ad6cd7060e985a5cb1de66277e172b1983 100644 --- a/src/main/webapp/WEB-INF/view/admin/overlappingHost/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/overlappingHost/edit.jsp @@ -1,97 +1,122 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.overlapping_host_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - -
-
    + <%-- Content Header --%> +
    +

    + +

    +
      2. -
      3. +
      4. -
      5. +
      6. -
      7. +
      8. -
      9. +
      10. -
-
+ + - <%-- Edit Form: BEGIN --%> - - -
- - - - - - - - - +
-
- - - - - - - + <%-- Form --%> + + + + + + + + + +
+
+
+ <%-- Box Header --%> +
+

+ + + + + + +

+
+ + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
+ <%-- Form Fields --%> +
+ + +
+
+ + +
-
- - - - - -
- " /> - " /> - - " /> - " /> -
-
- - <%-- Edit Form: BEGIN --%> + <%-- Box Footer --%> +
+ + " /> + " + /> + + + " /> + " + /> + +
+
+
+
+ + + +
- - + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/overlappingHost/error.jsp b/src/main/webapp/WEB-INF/view/admin/overlappingHost/error.jsp index ea83633e10ccf3672d07432fc74bf3e796d2c4ee..82494e00e6b6ee75365bdf8675e737911e30e57f 100644 --- a/src/main/webapp/WEB-INF/view/admin/overlappingHost/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/overlappingHost/error.jsp @@ -1,20 +1,50 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.overlapping_host_configuration" /> + + + +
+ + + + + -
- - -
- +
+
+

+ +

+
    +
  1. + +
    2. +
+
-
+
- - +
+

Error

+

+ +

+

+ + + +

+
+
+
+ + + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/overlappingHost/index.jsp b/src/main/webapp/WEB-INF/view/admin/overlappingHost/index.jsp index 020fe298353f63d45570eaba8fc34319fd39c2a3..962c12ffba612908eaa7f21ad4cd17aceb210f60 100644 --- a/src/main/webapp/WEB-INF/view/admin/overlappingHost/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/overlappingHost/index.jsp @@ -1,119 +1,127 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.overlapping_host_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - - <%-- List: BEGIN --%> -
-
-
    -
    • -
  • - + <%-- Content Header --%> +
    +

    + +

    +
      +
    1. +
      2. -
-
+ + - -

- -

- - - - - - - - - - - - - - - - - - - -
 
${f:h(data.regularName)}${f:h(data.overlappingName)} - - - - - -
- <%-- Page Navigation: BEGIN --%> -
- +
+ +
+
+
+ <%-- Box Header --%> +
+

+ +

+
+ + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
-
- + <%-- List --%> + +

+ +

+ + + + + + + + + + + + + + + + + +
${f:h(data.regularName)}${f:h(data.overlappingName)}
+ + +
+ <%-- Box Footer --%> +
+ <%-- Paging Info --%> + + + <%-- Paging Navigation --%> +
    + + + + + + + +
  • class="active">${p} +
    • +     + + + + + + +
+ +
+
- <%-- Page Navigation: END --%> - + +
- <%-- List: END --%> - - + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/requestHeader/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/requestHeader/confirm.jsp index 23c97f59d58b380bb4252b07c7e13c492bad2235..d11b3c6d4e627c7df8a998dbc1be198c1e7d0d24 100644 --- a/src/main/webapp/WEB-INF/view/admin/requestHeader/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/requestHeader/confirm.jsp @@ -1,112 +1,153 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.request_header_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - -
-
    + <%-- Content Header --%> +
    +

    + +

    +
      2. -
      3. +
      4. -
      5. +
      6. -
      7. +
      8. -
      9. +
      10. +       +
    +
    + +
    + + <%-- Form --%> + + + + + -
-
+ + +
+
+
+ <%-- Box Header --%> +
+

+ + + + + + + + + + + + +

+
+ + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
+ + <%-- Form Fields --%> + + + + + + + + + + + + + + + +
${f:h(name)}
${f:h(value)}
+ ${f:h(item.label)} +
- <%-- Confirm Form: BEGIN --%> - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
${f:h(name)}
${f:h(value)}
- ${f:h(item.label)} -
- " /> - " /> - - " /> - " /> - - " /> - " /> - - " /> - " /> - " /> -
-
- - <%-- Confirm Form: BEGIN --%> +
+ <%-- Box Footer --%> +
+ + " /> + " + /> + + + " /> + " + /> + + + " /> + " + /> + + + " /> + " + /> + " + /> + +
+
+
+
+ + + +
- - + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/requestHeader/edit.jsp b/src/main/webapp/WEB-INF/view/admin/requestHeader/edit.jsp index be7d96eff41a406458ae439f5045cfa710c3a1df..b09e901741412fa8719680eccdd1517ff91eda08 100644 --- a/src/main/webapp/WEB-INF/view/admin/requestHeader/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/requestHeader/edit.jsp @@ -1,102 +1,131 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.request_header_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - -
-
    + <%-- Content Header --%> +
    +

    + +

    +
      2. -
      3. +
      4. -
      5. +
      6. -
      7. +
      8. -
      9. +
      10. +       +
    +
    + +
    + + <%-- Form --%> + + + + + -
-
+ + - <%-- Edit Form: BEGIN --%> - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - ${f:h(item.label)} - -
- " /> - " /> - - " /> - " /> -
-
- - <%-- Edit Form: BEGIN --%> +
+
+
+ <%-- Box Header --%> +
+

+ + + + + + +

+
+ + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
+ + <%-- Form Fields --%> +
+ + +
+
+ + +
+
+ + + + ${f:h(item.label)} + + +
+
+ + <%-- Box Footer --%> +
+ + " /> + " + /> + + + " /> + " + /> + +
+
+
+
+ + + +
- - + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/requestHeader/error.jsp b/src/main/webapp/WEB-INF/view/admin/requestHeader/error.jsp index 6ef26ff8ac6e10cddff433532bce2b3662911774..26d64f7bb5faab06b13cd7d5b7b956c7fb60e25c 100644 --- a/src/main/webapp/WEB-INF/view/admin/requestHeader/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/requestHeader/error.jsp @@ -1,17 +1,50 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.request_header_configuration" /> + + + +
+ + + + + -
- -
- -
+
+
+

+ +

+
    +
  1. + +
    2. +
+
- - +
+ +
+

Error

+

+ +

+

+ + + +

+
+ +
+
+ + + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/requestHeader/index.jsp b/src/main/webapp/WEB-INF/view/admin/requestHeader/index.jsp index 1f3523840cb86e6fb496ca6da2937ffbd55dbeb9..03a1d28388db668aa8ebf9b0a213caa567825836 100644 --- a/src/main/webapp/WEB-INF/view/admin/requestHeader/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/requestHeader/index.jsp @@ -1,124 +1,134 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.request_header_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - - <%-- List: BEGIN --%> -
-
- -
    -
    • -
  • - + <%-- Content Header --%> +
    +

    + +

    +
      +
    1. +
      2. -
- - - - - - -
- -

- -

- - - - - - - - - - - - - - - - - - - -
 
${f:h(data.name)}${f:h(data.webConfig.name)} - - - - - -
- <%-- Page Navigation: BEGIN --%> -
- + + + +
+ +
+
+ + + + + + +
+ <%-- Box Header --%> +
+

+ +

+
+ + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
-
- + <%-- List --%> + +

+ +

+ + + + + + + + + + + + + + + + + +
${f:h(data.name)}${f:h(data.webConfig.name)}
+ + +
+ <%-- Box Footer --%> +
+ <%-- Paging Info --%> + + + <%-- Paging Navigation --%> +
    + + + + + + + +
  • class="active">${p} +
    • +     + + + + + + +
+ +
+
+
- <%-- Page Navigation: END --%> - + +
- <%-- List: END --%> - - + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/roleType/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/roleType/confirm.jsp index c6372934ab0c9592c32e9c4085d97f17ab7a6909..6c27cd6bef4afa07eefca5dc7370f5079c9c6307 100644 --- a/src/main/webapp/WEB-INF/view/admin/roleType/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/roleType/confirm.jsp @@ -1,109 +1,148 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.roletype_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - -
-
    + <%-- Content Header --%> +
    +

    + +

    +
      2. -
      3. +
      4. -
      5. +
      6. -
      7. +
      8. -
      9. +
      10. -
-
+ + - <%-- Confirm Form: BEGIN --%> - - -
- - - - - - - - - +
-
- - - - - - - + <%-- Form --%> + + + + + + + + + +
+
+
+ <%-- Box Header --%> +
+

+ + + + + + + + + + + + +

+
+ + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
+ <%-- Form Fields --%> +
${f:h(name)}
${f:h(value)}
+ + + + + + + + + + +
${f:h(name)}
${f:h(value)}
+
- - - - - " /> - " /> - - " /> - " /> - - " /> - " /> - - " /> - " /> - " /> - - - - -
- - <%-- Confirm Form: BEGIN --%> + <%-- Box Footer --%> +
+ + " /> + " + /> + + + " /> + " + /> + + + " /> + " + /> + + + " /> + " + /> + " + /> + +
+
+
+
+ + + +
- - + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/roleType/edit.jsp b/src/main/webapp/WEB-INF/view/admin/roleType/edit.jsp index 7474976664bd679593a6421ae46350aeb70a559e..8b9702b497baa31ae6e6d8bbaabc4396f02c27f2 100644 --- a/src/main/webapp/WEB-INF/view/admin/roleType/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/roleType/edit.jsp @@ -1,96 +1,122 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.roletype_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - -
-
    + <%-- Content Header --%> +
    +

    + +

    +
      2. -
      3. +
      4. -
      5. +
      6. -
      7. +
      8. -
      9. +
      10. +       +
    +
    + +
    + + <%-- Form --%> + + + + + -
-
+ + + +
+
+
+ <%-- Box Header --%> +
+

+ + + + + + +

+
+ + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
- <%-- Edit Form: BEGIN --%> - - -
- - - - - - - - - + <%-- Form Fields --%> +
+ + +
+
+ + +
- - - - - - - - + <%-- Box Footer --%> +
+ + " /> + " + /> + + + " /> + " + /> + +
+ + + + - - - - - - -
- " /> - " /> - - " /> - " /> -
-
- - <%-- Edit Form: BEGIN --%> + +
- - + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/roleType/error.jsp b/src/main/webapp/WEB-INF/view/admin/roleType/error.jsp index 4a5a9397d6bd98bd5ef63cb5ca5af8536a377e01..dfc96d77e9e0db79b0c1953f1d9b591731d3a80f 100644 --- a/src/main/webapp/WEB-INF/view/admin/roleType/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/roleType/error.jsp @@ -1,20 +1,50 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.roletype_configuration" /> + + + +
+ + + + + -
- - -
- +
+
+

+ +

+
    +
  1. + +
    2. +
+
-
+
- - +
+

Error

+

+ +

+

+ + + +

+
+
+
+ + + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/roleType/index.jsp b/src/main/webapp/WEB-INF/view/admin/roleType/index.jsp index bf17c454e79b936c9ee52d75a4f3574d74777402..c9d05da1226d152fbfb58ed3adc81ffd83469ce1 100644 --- a/src/main/webapp/WEB-INF/view/admin/roleType/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/roleType/index.jsp @@ -1,117 +1,125 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.roletype_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - - <%-- List: BEGIN --%> -
-
-
    -
    • -
  • - + <%-- Content Header --%> +
    +

    + +

    +
      +
    1. +
      2. -
-
+ + - -

- -

- - - - - - +
-
- - - - - - - - - - -
 
${f:h(data.name)} - - - - - -
- <%-- Page Navigation: BEGIN --%> -
- +
+
+
+ <%-- Box Header --%> +
+

+ +

+
+ + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
+ + <%-- List --%> + +

+ +

+ + + + + + + + + + + + + + + +
${f:h(data.name)}
+ -
- +
+ <%-- Box Footer --%> +
+ <%-- Paging Info --%> + + + <%-- Paging Navigation --%> +
    + + + + + + + +
  • class="active">${p} +
    • +     + + + + + + +
+ +
+
- <%-- Page Navigation: END --%> - -
- <%-- List: END --%> + +
- - + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/suggestBadWord/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/suggestBadWord/confirm.jsp index 284731fa7e92ed23448c48be6c5241ca5b14f343..90ec842a1e93c55d23e294f656b724a24dbd7e29 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestBadWord/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestBadWord/confirm.jsp @@ -1,107 +1,144 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.suggest_bad_word_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - -
-
    + <%-- Content Header --%> +
    +

    + +

    +
      2. -
      3. +
      4. -
      5. +
      6. -
      7. +
      8. -
      9. +
      10. -
    10. - -
      11. -
    11. - -
      12. -
-
+ + + +
+ + <%-- Form --%> + + + + + + + + +
+
+
+ <%-- Box Header --%> +
+

+ + + + + + + + + + + + +

+
+ + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
+ + <%-- Form Fields --%> + + + + + + + +
${f:h(suggestWord)}
+ +
+ <%-- Box Footer --%> +
+ + " /> + " + /> + + + " /> + " + /> + + + " /> + " + /> + + + " /> + " + /> + " + /> + +
+
+
+
+ + +
+
- <%-- Confirm Form: BEGIN --%> - - -
- - - - - - - - - - - - - - - - - - -
${f:h(suggestWord)}
- " /> - " /> - - " /> - " /> - - " /> - " /> - - " /> - " /> - " /> -
-
- - <%-- Confirm Form: BEGIN --%> + +
+ + + - - diff --git a/src/main/webapp/WEB-INF/view/admin/suggestBadWord/download.jsp b/src/main/webapp/WEB-INF/view/admin/suggestBadWord/download.jsp index d36061325acd16c9d45523dccc99e0f8c16297e1..1d52af71f6c5a8b1fd9540bb7bd2ae7398aadb49 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestBadWord/download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestBadWord/download.jsp @@ -1,63 +1,86 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - - -

- -

- - <%-- Message: BEGIN --%> -
- -
- - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.suggest_bad_word_configuration" /> + + + +
+ + + + + + +
+ + <%-- Content Header --%> +
+

+ +

+
    +
  1. + +
    2. +
    3. +
+
+ +
+ +
+
+
+ <%-- Box Header --%> +
+

+ +

+
+ + + + + + + + + + + + +
+
+ <%-- Box Body --%> +
+ + + + + + + + +
" type="submit" />
+ + +
+ <%-- Box Footer --%> +
+ +
+
+
+
+ +
- <%-- Message: END --%> - -
-
    -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
-
- - <%-- Edit Form: BEGIN --%> - -
- - - - - - - -
" /> -
-
- - <%-- Edit Form: BEGIN --%> - - - + + +
+ + + + diff --git a/src/main/webapp/WEB-INF/view/admin/suggestBadWord/edit.jsp b/src/main/webapp/WEB-INF/view/admin/suggestBadWord/edit.jsp index fb89b37affd2cc4dce16589458346b000e5e40a0..2df9240f772c82a6fc742bb17fb17dff867cfd45 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestBadWord/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestBadWord/edit.jsp @@ -1,95 +1,127 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.suggest_bad_word_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - -
-
    + <%-- Content Header --%> +
    +

    + +

    +
      2. -
      3. +
      4. -
      5. +
      6. -
      7. +
      8. -
      9. +
      10. -
    10. - -
      11. -
    11. - -
      12. -
-
+ + + +
+ + <%-- Form --%> + + + + + + + + +
+
+
+ <%-- Box Header --%> +
+

+ + + + + + +

+
+ + + + + + + + + + + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
+ + <%-- Form Fields --%> +
+ + +
+
+ <%-- Box Footer --%> +
+ + " /> + " + /> + + + " /> + " + /> + +
+
+
+
+ + +
+
- <%-- Edit Form: BEGIN --%> - - -
- - - - - - - - - - - - - - - - - - -
- " /> - " /> - - " /> - " /> -
-
- - <%-- Edit Form: BEGIN --%> + +
+ + + - - diff --git a/src/main/webapp/WEB-INF/view/admin/suggestBadWord/error.jsp b/src/main/webapp/WEB-INF/view/admin/suggestBadWord/error.jsp index 2fdb2c34484398ea40fd0472bdfaf6dee033b422..2994dafcb4db57d52122d339e32ad7860f293a32 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestBadWord/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestBadWord/error.jsp @@ -1,17 +1,50 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.suggest_bad_word_configuration" /> + + + +
+ + + + + -
- -
- -
+
+
+

+ +

+
    +
  1. + +
    2. +
+
- - +
+ +
+

Error

+

+ +

+

+ + + +

+
+ +
+
+ + + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/suggestBadWord/index.jsp b/src/main/webapp/WEB-INF/view/admin/suggestBadWord/index.jsp index d68e633d934056d465d211db4c7d02d3e36de907..92c2e936f3b0c31a32933e6f0683794c3b2ed198 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestBadWord/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestBadWord/index.jsp @@ -1,120 +1,135 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.suggest_bad_word_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - - <%-- List: BEGIN --%> -
-
-
    -
    • -
  • - -
    • -
  • - + <%-- Content Header --%> +
    +

    + +

    +
      +
    1. +
      2. -
    2. - -
      3. -
-
- -

- -

- - - - - - - - - - - - - - - - - -
 
${f:h(data.suggestWord)} - - - - - -
- <%-- Page Navigation: BEGIN --%> -
- + + + +
-
- +
+
+
+ <%-- Box Header --%> +
+

+ +

+
+ + + + + + + + + + + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
+ + <%-- List --%> + +

+ +

+ + + + + + + + + + + + + + + +
${f:h(data.suggestWord)}
+ + +
+ <%-- Box Footer --%> +
+ <%-- Paging Info --%> + + + <%-- Paging Navigation --%> +
    + + + + + + + +
  • class="active">${p} +
    • +     + + + + + + +
+ +
+
- <%-- Page Navigation: END --%> - + +
- <%-- List: END --%> - - + +
+ + + + diff --git a/src/main/webapp/WEB-INF/view/admin/suggestBadWord/upload.jsp b/src/main/webapp/WEB-INF/view/admin/suggestBadWord/upload.jsp index d444e539aaaa192695acd4bfebf9f43ababa217e..486f32d1f915e061e9594e9ca37bea60b5f0cae1 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestBadWord/upload.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestBadWord/upload.jsp @@ -1,69 +1,93 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.suggest_bad_word_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> + <%-- Content Header --%> +
+

+ +

+
    +
  1. + +
    2. +
    3. +
+
+ +
+ +
+
+
+ <%-- Box Header --%> +
+

+ +

+
+ + + + + + + + + + + + +
+
+ <%-- Box Body --%> +
+ + + + + + + + + + + + + +
+ " /> +
+ -
-
    -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
-
+
+ <%-- Box Footer --%> +
+ +
+
+
+
+ +
+
- <%-- Edit Form: BEGIN --%> - -
- - - - - - - - - - - - -
- " /> -
-
- - <%-- Edit Form: BEGIN --%> + +
+ + + - - diff --git a/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/confirm.jsp index 7afca50654c7655f37614f67ff8e377f76576c14..b2b7df643494d81ee4d4a1fbd819c83a0d2c44f6 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/confirm.jsp @@ -1,123 +1,160 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.suggest_elevate_word_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - -
-
    + <%-- Content Header --%> +
    +

    + +

    +
      2. -
      3. +
      4. -
      5. +
      6. -
      7. +
      8. -
      9. +
      10. -
    10. - -
      11. -
    11. - -
      12. -
-
+ + + +
+ + <%-- Form --%> + + + + + + + + +
+
+
+ <%-- Box Header --%> +
+

+ + + + + + + + + + + + +

+
+ + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
+ + <%-- Form Fields --%> + + + + + + + + + + + + + + + + + + + + + + + +
${f:h(suggestWord)}
${f:h(reading)}
${f:h(targetRole)}
${f:h(targetLabel)}
${f:h(boost)}
+ +
+ <%-- Box Footer --%> +
+ + " /> + " + /> + + + " /> + " + /> + + + " /> + " + /> + + + " /> + " + /> + " + /> + +
+
+
+
+ + +
+
- <%-- Confirm Form: BEGIN --%> - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
${f:h(suggestWord)}
${f:h(reading)}
${f:h(targetRole)}
${f:h(targetLabel)}
${f:h(boost)}
- " /> - " /> - - " /> - " /> - - " /> - " /> - - " /> - " /> - " /> -
-
- - <%-- Confirm Form: BEGIN --%> + +
+ + + - - diff --git a/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/download.jsp b/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/download.jsp index 3658d6149895b78b1ea5a462956feb486bd3a4ca..e52567662de29e6e91edd35c5337b4ae4b5ca8eb 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/download.jsp @@ -1,62 +1,86 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - - -

- -

- - <%-- Message: BEGIN --%> -
- -
- - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.suggest_elevate_word_configuration" /> + + + +
+ + + + + + +
+ + <%-- Content Header --%> +
+

+ +

+
    +
  1. + +
    2. +
    3. +
+
+ +
+ +
+
+
+ <%-- Box Header --%> +
+

+ +

+
+ + + + + + + + + + + + +
+
+ <%-- Box Body --%> +
+ + + + + + + + +
" type="submit" />
+ + +
+ <%-- Box Footer --%> +
+ +
+
+
+
+ +
- <%-- Message: END --%> - -
-
    -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
-
- - <%-- Edit Form: BEGIN --%> - -
- - - - - - - -
" /> -
-
- - <%-- Edit Form: BEGIN --%> - - + + +
+ + + + diff --git a/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/edit.jsp b/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/edit.jsp index 05006ede007b3688827cd232b3e91b1a9af8c8a4..e6a834de79bc2fe950fe32a80f90f2b9b5924121 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/edit.jsp @@ -1,111 +1,143 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.suggest_elevate_word_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - -
-
    + <%-- Content Header --%> +
    +

    + +

    +
      2. -
      3. +
      4. -
      5. +
      6. -
      7. +
      8. -
      9. +
      10. -
    10. - -
      11. -
    11. - -
      12. -
-
+ + + +
+ + <%-- Form --%> + + + + + + + + +
+
+
+ <%-- Box Header --%> +
+

+ + + + + + +

+
+ + + + + + + + + + + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
+ + <%-- Form Fields --%> +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ <%-- Box Footer --%> +
+ + " /> + " + /> + + + " /> + " + /> + +
+
+
+
+ + +
+
- <%-- Edit Form: BEGIN --%> - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- " /> - " /> - - " /> - " /> -
-
- - <%-- Edit Form: BEGIN --%> + +
+ + + - - diff --git a/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/error.jsp b/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/error.jsp index 2949384b2b920a110c001c5a80f7c963c7968046..b523b8badb134175e411d82d81b8a821d4468225 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/error.jsp @@ -1,17 +1,50 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.suggest_elevate_word_configuration" /> + + + +
+ + + + + -
- -
- -
+
+
+

+ +

+
    +
  1. + +
    2. +
+
- - +
+ +
+

Error

+

+ +

+

+ + + +

+
+ +
+
+ + + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/index.jsp b/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/index.jsp index ef660bab7f6dba320f88dda60a4d8872e478ba94..afab804b359a39c1205abedea6201567e254f63c 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/index.jsp @@ -1,120 +1,135 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.suggest_elevate_word_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - - <%-- List: BEGIN --%> -
-
-
    -
    • -
  • - -
    • -
  • - + <%-- Content Header --%> +
    +

    + +

    +
      +
    1. +
      2. -
    2. - -
      3. -
-
- -

- -

- - - - - - - - - - - - - - - - - -
 
${f:h(data.suggestWord)} - - - - - -
- <%-- Page Navigation: BEGIN --%> -
- + + + +
-
- +
+
+
+ <%-- Box Header --%> +
+

+ +

+
+ + + + + + + + + + + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
+ + <%-- List --%> + +

+ +

+ + + + + + + + + + + + + + + +
${f:h(data.suggestWord)}
+ + +
+ <%-- Box Footer --%> +
+ <%-- Paging Info --%> + + + <%-- Paging Navigation --%> +
    + + + + + + + +
  • class="active">${p} +
    • +     + + + + + + +
+ +
+
- <%-- Page Navigation: END --%> - + +
- <%-- List: END --%> - - + +
+ + + + diff --git a/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/upload.jsp b/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/upload.jsp index 1dcf8f7ad4c2568da9b57f3e310563b62273eba5..22279473c7f10b7479bbbcea2a6afffc5e8d79e9 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/upload.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestElevateWord/upload.jsp @@ -1,68 +1,93 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.suggest_elevate_word_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - + <%-- Content Header --%> +
+

+ +

+
    +
  1. + +
    2. +
    3. +
+
+ +
+ +
+
+
+ <%-- Box Header --%> +
+

+ +

+
+ + + + + + + + + + + + +
+
+ <%-- Box Body --%> +
+ + + + + + + + + + + + + +
+ " /> +
+ + +
+ <%-- Box Footer --%> +
+ +
+
+
+
+ +
- <%-- Message: END --%> -
-
    -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
-
+ +
+ + + - <%-- Edit Form: BEGIN --%> - -
- - - - - - - - - - - - -
- " /> -
-
- - <%-- Edit Form: BEGIN --%> - - diff --git a/src/main/webapp/WEB-INF/view/admin/system/index.jsp b/src/main/webapp/WEB-INF/view/admin/system/index.jsp index 1de50b7179195e6a0a1079c4a75f6b44e311b8d0..e44d19a88aa0a761cd4843f8b01f41db9468f30c 100644 --- a/src/main/webapp/WEB-INF/view/admin/system/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/system/index.jsp @@ -1,100 +1,119 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + + Fess | <bean:message key="labels.system_title_configuration" /> + + + +
+ + + + + -
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> +
+ <%-- Content Header --%> + <%-- Message --%> +
+ +
+ +
+ + +
-
-

- -

- - - - - - - -
- ${f:h(clusterName)} ( - - - - ) -
-
+
+
+
- -
-

- -

- - - - - - - - - - - -
- - - - - - - -
- - " /> - - - - - - - - - " /> - -
-
- +
+ <%-- Box Header --%> +
+

+ +

+
+ <%-- Box Body --%> +
+ + + + + + + +
+ ${f:h(clusterName)} + ( + + + + ) +
+
+
-
- - - - - + +
+ <%-- Box Header --%> +
+

+ +

+
+ <%-- Box Body --%> +
+ <%-- Message --%> + + + + + + + + + + + +
+ + + + + + +
+ + + + " /> + + +
+ + + + + + + " /> +
+ +
+
+
+ +
+
+ +
+ +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/systemInfo/index.jsp b/src/main/webapp/WEB-INF/view/admin/systemInfo/index.jsp index 51b89bfb5d3d172132b014b44626882232ff0e97..47f0dac7de2dc62b15d82850f95b5f0ffdf9fe76 100644 --- a/src/main/webapp/WEB-INF/view/admin/systemInfo/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/systemInfo/index.jsp @@ -1,103 +1,103 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.system_info_configuration" /> + + + +
+ + + + + -
+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - -
-

- -

- - - - - - -
-
+ <%-- Content Header --%> +
+

+ +

+
-
-

- -

- - - - - - -
-
+
-
-

- -

- - - - - - - - - - - -
-
- -
-

- -

- - - - - - -
-
+
+
+
+ <%-- Box Header --%> +
+

+ +

+
+ <%-- Box Body --%> +
+ +
+
+
+ <%-- Box Header --%> +
+

+ +

+
+ <%-- Box Body --%> +
+ +
+
+
+ <%-- Box Header --%> +
+

+ +

+
+ <%-- Box Body --%> +
+ + + + + + +
+
+
+ <%-- Box Header --%> +
+

+ +

+
+ <%-- Box Body --%> +
+ +
+
+
+
+
- - + +
+ + + + diff --git a/src/main/webapp/WEB-INF/view/admin/webAuthentication/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/webAuthentication/confirm.jsp index 11e5823dc8cda7a8f5a1a1b3c3e2d355c0887211..f31401fb6f29a1f5c42af855e69359d3746475dd 100644 --- a/src/main/webapp/WEB-INF/view/admin/webAuthentication/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webAuthentication/confirm.jsp @@ -1,136 +1,176 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.web_authentication_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - -
-
    + <%-- Content Header --%> +
    +

    + +

    +
      2. -
      3. +
      4. -
      5. +
      6. -
      7. +
      8. -
      9. +
      10. +       +
    +
    + +
    + + <%-- Form --%> + + + + + -
-
+ + +
+
+
+ <%-- Box Header --%> +
+

+ + + + + + + + + + + + +

+
+ + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
+ + <%-- Form Fields --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${f:h(hostname)}
${f:h(port)}
${f:h(authRealm)}
+ ${f:h(item.label)} +
${f:h(username)}
****** +
${f:br(f:h(parameters))}
+ ${f:h(item.label)} +
- <%-- Confirm Form: BEGIN --%> - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
${f:h(hostname)}
${f:h(port)}
${f:h(authRealm)}
- ${f:h(item.label)} -
${f:h(username)}
******
${f:br(f:h(parameters))}
- ${f:h(item.label)} -
- " /> - " /> - - " /> - " /> - - " /> - " /> - - " /> - " /> - " /> -
-
- - <%-- Confirm Form: BEGIN --%> +
+ <%-- Box Footer --%> +
+ + " /> + " + /> + + + " /> + " + /> + + + " /> + " + /> + + + " /> + " + /> + " + /> + +
+
+
+
+ + + +
- - + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/webAuthentication/edit.jsp b/src/main/webapp/WEB-INF/view/admin/webAuthentication/edit.jsp index b7aa6aeb2aae6f7c6c047caf65bc6f234c2771e0..23722f25b7fd3db912bf3a91fd97f8063ffe38e9 100644 --- a/src/main/webapp/WEB-INF/view/admin/webAuthentication/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webAuthentication/edit.jsp @@ -1,127 +1,155 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.web_authentication_configuration" /> + + + +
+ + + + + -

- -

+
- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> - -
-
    + <%-- Content Header --%> +
    +

    + +

    +
      2. -
      3. +
      4. -
      5. +
      6. -
      7. +
      8. -
      9. +
      10. +       +
    +
    + +
    + + <%-- Form --%> + + + + + -
-
+ + - <%-- Edit Form: BEGIN --%> - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - ${f:h(item.label)} - -
- - ${f:h(item.label)} - -
- " /> - " /> - - " /> - " /> -
-
- - <%-- Edit Form: BEGIN --%> +
+
+
+ <%-- Box Header --%> +
+

+ + + + + + +

+
+ + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
+ + <%-- Form Fields --%> +
+ + +
+
+ + +
+
+ + +
+
+ + + + ${f:h(item.label)} + + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + + ${f:h(item.label)} + + +
+
+ + <%-- Box Footer --%> +
+ + " /> + " + /> + + + " /> + " + /> + +
+
+
+
+ + + +
- - + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/webAuthentication/error.jsp b/src/main/webapp/WEB-INF/view/admin/webAuthentication/error.jsp index e08600966ea74e8940d7d443e534031785481377..8a78573171a017c7a116ef76c766b285f553cde8 100644 --- a/src/main/webapp/WEB-INF/view/admin/webAuthentication/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webAuthentication/error.jsp @@ -1,17 +1,50 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.web_authentication_configuration" /> + + + +
+ + + + + -
- -
- -
+
+
+

+ +

+
    +
  1. + +
    2. +
+
- - +
+ +
+

Error

+

+ +

+

+ + + +

+
+ +
+
+ + + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/webAuthentication/index.jsp b/src/main/webapp/WEB-INF/view/admin/webAuthentication/index.jsp index 7328cba2f3fbfdad5ef8b1c51f01a7e1e166617e..68cf7aa7d8b1f16b26b5b05aa9750fea25fc359c 100644 --- a/src/main/webapp/WEB-INF/view/admin/webAuthentication/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webAuthentication/index.jsp @@ -1,129 +1,143 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.web_authentication_configuration" /> + + + +
+ + + + + -

- -

- <%-- Message: BEGIN --%> -
- -
- - -
- <%-- Message: END --%> +
- <%-- List: BEGIN --%> -
-
- -
    -
    • -
  • - + <%-- Content Header --%> +
    +

    + +

    +
      +
    1. +
      2. -
- - - - - - -
- -

- -

- - - - - - - - - - - - - - - - - - - -
 
- - ${f:h(data.hostname)}: - - ${f:h(data.port)}${f:h(data.webConfig.name)} - - - - - -
- <%-- Page Navigation: BEGIN --%> -
- + + + +
+ +
+
+ + + + + + +
+ <%-- Box Header --%> +
+

+ +

+
+ + + +
+
+ <%-- Box Body --%> +
+ <%-- Message --%> +
+ +
+ +
+ + +
+ + <%-- List --%> + +

+ +

+ + + + + + + + + + + + + + + + + +
+ + + ${f:h(data.hostname)}: + + + + ${f:h(data.port)} + + ${f:h(data.webConfig.name)}
+ -
- +
+ <%-- Box Footer --%> +
+ <%-- Paging Info --%> + + + <%-- Paging Navigation --%> +
    + + + + + + + +
  • class="active">${p} +
    • +     + + + + + + +
+ +
+
+
- <%-- Page Navigation: END --%> - -
- <%-- List: END --%> +
+
- - + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/webConfig/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/webConfig/confirm.jsp index acd3e96ae893b530350664e473a92544a0727d20..3bd0143e8a9227c35044eb4495937c6da74ad62d 100644 --- a/src/main/webapp/WEB-INF/view/admin/webConfig/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webConfig/confirm.jsp @@ -50,6 +50,7 @@ +
@@ -234,4 +235,3 @@ - diff --git a/src/main/webapp/WEB-INF/view/admin/webConfig/edit.jsp b/src/main/webapp/WEB-INF/view/admin/webConfig/edit.jsp index 0eecdf70474a14420ec8566026f9093d64025387..ee11720fcce8b3effb47a5cad14f243e41a5abc0 100644 --- a/src/main/webapp/WEB-INF/view/admin/webConfig/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webConfig/edit.jsp @@ -10,7 +10,7 @@ - +
@@ -50,6 +50,7 @@ +
@@ -194,4 +195,3 @@ - diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index d619f7b823cae642b94f054aa5df7e09ee1c0d4b..cb0b7305b21310cc807c1dc3d0903da3b092db30 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -58,11 +58,6 @@ org.codelibs.fess.filter.WebApiFilter - - lastaFilter - org.lastaflute.web.LastaFilter - -