Browse Source

sync up with the latest lastaflute

Shinsuke Sugaya 10 years ago
parent
commit
08ce3185a8
80 changed files with 1205 additions and 708 deletions
  1. 1 1
      pom.xml
  2. 21 15
      src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java
  3. 0 3
      src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java
  4. 0 31
      src/main/java/org/codelibs/fess/filter/DIFilter.java
  5. 3 3
      src/main/java/org/codelibs/fess/filter/EncodingFilter.java
  6. 0 45
      src/main/java/org/codelibs/fess/filter/RoutingFilter.java
  7. 4 4
      src/main/java/org/codelibs/fess/helper/QueryHelper.java
  8. 1 1
      src/main/java/org/codelibs/fess/helper/ViewHelper.java
  9. 1 1
      src/main/java/org/codelibs/fess/helper/impl/RoleQueryHelperImpl.java
  10. 8 8
      src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java
  11. 602 0
      src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java
  12. 0 30
      src/main/java/org/codelibs/fess/mylasta/tentative/Required.java
  13. 0 2
      src/main/resources/esclient.xml
  14. 10 10
      src/main/webapp/WEB-INF/view/admin/boostDocumentRule/confirm.jsp
  15. 10 10
      src/main/webapp/WEB-INF/view/admin/boostDocumentRule/edit.jsp
  16. 13 13
      src/main/webapp/WEB-INF/view/admin/crawl/index.jsp
  17. 8 8
      src/main/webapp/WEB-INF/view/admin/crawlingSession/confirm.jsp
  18. 4 4
      src/main/webapp/WEB-INF/view/admin/crawlingSession/index.jsp
  19. 4 4
      src/main/webapp/WEB-INF/view/admin/data/index.jsp
  20. 14 14
      src/main/webapp/WEB-INF/view/admin/dataConfig/confirm.jsp
  21. 12 12
      src/main/webapp/WEB-INF/view/admin/dataConfig/edit.jsp
  22. 7 7
      src/main/webapp/WEB-INF/view/admin/design/admin_design.jsp
  23. 5 5
      src/main/webapp/WEB-INF/view/admin/design/admin_design_edit.jsp
  24. 7 7
      src/main/webapp/WEB-INF/view/admin/dict/synonym/confirm.jsp
  25. 3 3
      src/main/webapp/WEB-INF/view/admin/dict/synonym/download.jsp
  26. 7 7
      src/main/webapp/WEB-INF/view/admin/dict/synonym/edit.jsp
  27. 3 3
      src/main/webapp/WEB-INF/view/admin/dict/synonym/upload.jsp
  28. 9 9
      src/main/webapp/WEB-INF/view/admin/dict/userDict/confirm.jsp
  29. 3 3
      src/main/webapp/WEB-INF/view/admin/dict/userDict/download.jsp
  30. 9 9
      src/main/webapp/WEB-INF/view/admin/dict/userDict/edit.jsp
  31. 3 3
      src/main/webapp/WEB-INF/view/admin/dict/userDict/upload.jsp
  32. 14 14
      src/main/webapp/WEB-INF/view/admin/document/index.jsp
  33. 14 14
      src/main/webapp/WEB-INF/view/admin/failureUrl/confirm.jsp
  34. 7 7
      src/main/webapp/WEB-INF/view/admin/failureUrl/index.jsp
  35. 14 14
      src/main/webapp/WEB-INF/view/admin/fileAuthentication/confirm.jsp
  36. 11 11
      src/main/webapp/WEB-INF/view/admin/fileAuthentication/edit.jsp
  37. 21 21
      src/main/webapp/WEB-INF/view/admin/fileConfig/confirm.jsp
  38. 20 20
      src/main/webapp/WEB-INF/view/admin/fileConfig/edit.jsp
  39. 15 15
      src/main/webapp/WEB-INF/view/admin/jobLog/confirm.jsp
  40. 11 11
      src/main/webapp/WEB-INF/view/admin/keymatch/confirm.jsp
  41. 11 11
      src/main/webapp/WEB-INF/view/admin/keymatch/edit.jsp
  42. 0 0
      src/main/webapp/WEB-INF/view/admin/keymatch/error.jsp
  43. 0 0
      src/main/webapp/WEB-INF/view/admin/keymatch/index.jsp
  44. 12 12
      src/main/webapp/WEB-INF/view/admin/labelType/confirm.jsp
  45. 12 12
      src/main/webapp/WEB-INF/view/admin/labelType/edit.jsp
  46. 10 10
      src/main/webapp/WEB-INF/view/admin/overlappingHost/confirm.jsp
  47. 10 10
      src/main/webapp/WEB-INF/view/admin/overlappingHost/edit.jsp
  48. 11 11
      src/main/webapp/WEB-INF/view/admin/pathMapping/confirm.jsp
  49. 10 10
      src/main/webapp/WEB-INF/view/admin/pathMapping/edit.jsp
  50. 10 10
      src/main/webapp/WEB-INF/view/admin/requestHeader/confirm.jsp
  51. 9 9
      src/main/webapp/WEB-INF/view/admin/requestHeader/edit.jsp
  52. 10 10
      src/main/webapp/WEB-INF/view/admin/roleType/confirm.jsp
  53. 10 10
      src/main/webapp/WEB-INF/view/admin/roleType/edit.jsp
  54. 16 16
      src/main/webapp/WEB-INF/view/admin/scheduledJob/confirm.jsp
  55. 13 13
      src/main/webapp/WEB-INF/view/admin/scheduledJob/edit.jsp
  56. 6 6
      src/main/webapp/WEB-INF/view/admin/searchList/confirmDelete.jsp
  57. 3 3
      src/main/webapp/WEB-INF/view/admin/searchList/index.jsp
  58. 8 8
      src/main/webapp/WEB-INF/view/admin/suggestBadWord/confirm.jsp
  59. 2 2
      src/main/webapp/WEB-INF/view/admin/suggestBadWord/download.jsp
  60. 8 8
      src/main/webapp/WEB-INF/view/admin/suggestBadWord/edit.jsp
  61. 2 2
      src/main/webapp/WEB-INF/view/admin/suggestBadWord/upload.jsp
  62. 12 12
      src/main/webapp/WEB-INF/view/admin/suggestElevateWord/confirm.jsp
  63. 2 2
      src/main/webapp/WEB-INF/view/admin/suggestElevateWord/download.jsp
  64. 12 12
      src/main/webapp/WEB-INF/view/admin/suggestElevateWord/edit.jsp
  65. 2 2
      src/main/webapp/WEB-INF/view/admin/suggestElevateWord/upload.jsp
  66. 2 2
      src/main/webapp/WEB-INF/view/admin/system/index.jsp
  67. 15 15
      src/main/webapp/WEB-INF/view/admin/webAuthentication/confirm.jsp
  68. 12 12
      src/main/webapp/WEB-INF/view/admin/webAuthentication/edit.jsp
  69. 22 22
      src/main/webapp/WEB-INF/view/admin/webConfig/confirm.jsp
  70. 21 21
      src/main/webapp/WEB-INF/view/admin/webConfig/edit.jsp
  71. 6 6
      src/main/webapp/WEB-INF/view/admin/wizard/crawlingConfig.jsp
  72. 2 2
      src/main/webapp/WEB-INF/view/admin/wizard/index.jsp
  73. 2 2
      src/main/webapp/WEB-INF/view/admin/wizard/startCrawling.jsp
  74. 3 3
      src/main/webapp/WEB-INF/view/common/admin/header.jsp
  75. 3 3
      src/main/webapp/WEB-INF/view/common/admin2/sidebar.jsp
  76. 3 3
      src/main/webapp/WEB-INF/view/error/header.jsp
  77. 3 3
      src/main/webapp/WEB-INF/view/header.jsp
  78. 3 3
      src/main/webapp/WEB-INF/view/index.jsp
  79. 2 2
      src/main/webapp/WEB-INF/view/login/logout.jsp
  80. 6 6
      src/main/webapp/WEB-INF/web.xml

+ 1 - 1
pom.xml

@@ -39,7 +39,7 @@
 
 
 		<!-- Main Framework -->
 		<!-- Main Framework -->
 		<dbflute.version>1.1.0-sp7</dbflute.version>
 		<dbflute.version>1.1.0-sp7</dbflute.version>
-		<lastaflute.version>0.6.1-RC3</lastaflute.version>
+		<lastaflute.version>0.6.3-H-SNAPSHOT</lastaflute.version>
 		<lasta.taglib.version>0.6.0</lasta.taglib.version>
 		<lasta.taglib.version>0.6.0</lasta.taglib.version>
 		<servlet.version>3.1.0</servlet.version>
 		<servlet.version>3.1.0</servlet.version>
 		<jsp.version>2.3.1</jsp.version>
 		<jsp.version>2.3.1</jsp.version>

+ 21 - 15
src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java

@@ -65,7 +65,7 @@ public class AdminKeymatchAction extends FessAdminAction {
     //                                                                      ==============
     //                                                                      ==============
     @Execute
     @Execute
     public HtmlResponse index(KeyMatchSearchForm form) {
     public HtmlResponse index(KeyMatchSearchForm form) {
-        return asHtml(path_AdminKeyMatch_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminKeymatch_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
             searchPaging(data, form);
         });
         });
     }
     }
@@ -73,7 +73,7 @@ public class AdminKeymatchAction extends FessAdminAction {
     @Execute
     @Execute
     public HtmlResponse list(Integer pageNumber, KeyMatchSearchForm form) {
     public HtmlResponse list(Integer pageNumber, KeyMatchSearchForm form) {
         keyMatchPager.setCurrentPageNumber(pageNumber);
         keyMatchPager.setCurrentPageNumber(pageNumber);
-        return asHtml(path_AdminKeyMatch_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminKeymatch_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
             searchPaging(data, form);
         });
         });
     }
     }
@@ -81,7 +81,7 @@ public class AdminKeymatchAction extends FessAdminAction {
     @Execute
     @Execute
     public HtmlResponse search(KeyMatchSearchForm form) {
     public HtmlResponse search(KeyMatchSearchForm form) {
         copyBeanToBean(form.searchParams, keyMatchPager, op -> op.exclude(CommonConstants.PAGER_CONVERSION_RULE));
         copyBeanToBean(form.searchParams, keyMatchPager, op -> op.exclude(CommonConstants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminKeyMatch_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminKeymatch_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
             searchPaging(data, form);
         });
         });
     }
     }
@@ -89,14 +89,14 @@ public class AdminKeymatchAction extends FessAdminAction {
     @Execute
     @Execute
     public HtmlResponse reset(KeyMatchSearchForm form) {
     public HtmlResponse reset(KeyMatchSearchForm form) {
         keyMatchPager.clear();
         keyMatchPager.clear();
-        return asHtml(path_AdminKeyMatch_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminKeymatch_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
             searchPaging(data, form);
         });
         });
     }
     }
 
 
     @Execute
     @Execute
     public HtmlResponse back(KeyMatchSearchForm form) {
     public HtmlResponse back(KeyMatchSearchForm form) {
-        return asHtml(path_AdminKeyMatch_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminKeymatch_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
             searchPaging(data, form);
         });
         });
     }
     }
@@ -118,21 +118,23 @@ public class AdminKeymatchAction extends FessAdminAction {
     @Execute
     @Execute
     public HtmlResponse createpage(KeyMatchEditForm form) {
     public HtmlResponse createpage(KeyMatchEditForm form) {
         form.crudMode = CommonConstants.CREATE_MODE;
         form.crudMode = CommonConstants.CREATE_MODE;
-        return asHtml(path_AdminKeyMatch_EditJsp);
+        return asHtml(path_AdminKeymatch_EditJsp);
     }
     }
 
 
     @Token(save = true, validate = false)
     @Token(save = true, validate = false)
     @Execute
     @Execute
     public HtmlResponse editpage(int crudMode, String id, KeyMatchEditForm form) {
     public HtmlResponse editpage(int crudMode, String id, KeyMatchEditForm form) {
+        form.crudMode = crudMode;
+        form.id = id;
         verifyCrudMode(form, CommonConstants.EDIT_MODE);
         verifyCrudMode(form, CommonConstants.EDIT_MODE);
         loadKeyMatch(form);
         loadKeyMatch(form);
-        return asHtml(path_AdminKeyMatch_EditJsp);
+        return asHtml(path_AdminKeymatch_EditJsp);
     }
     }
 
 
     @Token(save = true, validate = false)
     @Token(save = true, validate = false)
     @Execute
     @Execute
     public HtmlResponse editagain(KeyMatchEditForm form) {
     public HtmlResponse editagain(KeyMatchEditForm form) {
-        return asHtml(path_AdminKeyMatch_EditJsp);
+        return asHtml(path_AdminKeymatch_EditJsp);
     }
     }
 
 
     @Token(save = true, validate = false)
     @Token(save = true, validate = false)
@@ -140,15 +142,17 @@ public class AdminKeymatchAction extends FessAdminAction {
     public HtmlResponse editfromconfirm(KeyMatchEditForm form) {
     public HtmlResponse editfromconfirm(KeyMatchEditForm form) {
         form.crudMode = CommonConstants.EDIT_MODE;
         form.crudMode = CommonConstants.EDIT_MODE;
         loadKeyMatch(form);
         loadKeyMatch(form);
-        return asHtml(path_AdminKeyMatch_EditJsp);
+        return asHtml(path_AdminKeymatch_EditJsp);
     }
     }
 
 
     @Token(save = true, validate = false)
     @Token(save = true, validate = false)
     @Execute
     @Execute
     public HtmlResponse deletepage(int crudMode, String id, KeyMatchEditForm form) {
     public HtmlResponse deletepage(int crudMode, String id, KeyMatchEditForm form) {
+        form.crudMode = crudMode;
+        form.id = id;
         verifyCrudMode(form, CommonConstants.DELETE_MODE);
         verifyCrudMode(form, CommonConstants.DELETE_MODE);
         loadKeyMatch(form);
         loadKeyMatch(form);
-        return asHtml(path_AdminKeyMatch_ConfirmJsp);
+        return asHtml(path_AdminKeymatch_ConfirmJsp);
     }
     }
 
 
     @Token(save = true, validate = false)
     @Token(save = true, validate = false)
@@ -156,7 +160,7 @@ public class AdminKeymatchAction extends FessAdminAction {
     public HtmlResponse deletefromconfirm(KeyMatchEditForm form) {
     public HtmlResponse deletefromconfirm(KeyMatchEditForm form) {
         form.crudMode = CommonConstants.DELETE_MODE;
         form.crudMode = CommonConstants.DELETE_MODE;
         loadKeyMatch(form);
         loadKeyMatch(form);
-        return asHtml(path_AdminKeyMatch_ConfirmJsp);
+        return asHtml(path_AdminKeymatch_ConfirmJsp);
     }
     }
 
 
     // -----------------------------------------------------
     // -----------------------------------------------------
@@ -164,23 +168,25 @@ public class AdminKeymatchAction extends FessAdminAction {
     //                                               -------
     //                                               -------
     @Execute
     @Execute
     public HtmlResponse confirmpage(int crudMode, String id, KeyMatchEditForm form) {
     public HtmlResponse confirmpage(int crudMode, String id, KeyMatchEditForm form) {
+        form.crudMode = crudMode;
+        form.id = id;
         verifyCrudMode(form, CommonConstants.CONFIRM_MODE);
         verifyCrudMode(form, CommonConstants.CONFIRM_MODE);
         loadKeyMatch(form);
         loadKeyMatch(form);
-        return asHtml(path_AdminKeyMatch_ConfirmJsp);
+        return asHtml(path_AdminKeymatch_ConfirmJsp);
     }
     }
 
 
     @Token(save = false, validate = true, keep = true)
     @Token(save = false, validate = true, keep = true)
     @Execute
     @Execute
     public HtmlResponse confirmfromcreate(KeyMatchEditForm form) {
     public HtmlResponse confirmfromcreate(KeyMatchEditForm form) {
         validate(form, messages -> {}, toEditHtml());
         validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminKeyMatch_ConfirmJsp);
+        return asHtml(path_AdminKeymatch_ConfirmJsp);
     }
     }
 
 
     @Token(save = false, validate = true, keep = true)
     @Token(save = false, validate = true, keep = true)
     @Execute
     @Execute
     public HtmlResponse confirmfromupdate(KeyMatchEditForm form) {
     public HtmlResponse confirmfromupdate(KeyMatchEditForm form) {
         validate(form, messages -> {}, toEditHtml());
         validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminKeyMatch_ConfirmJsp);
+        return asHtml(path_AdminKeymatch_ConfirmJsp);
     }
     }
 
 
     // -----------------------------------------------------
     // -----------------------------------------------------
@@ -266,7 +272,7 @@ public class AdminKeymatchAction extends FessAdminAction {
 
 
     protected VaErrorHook toEditHtml() {
     protected VaErrorHook toEditHtml() {
         return () -> {
         return () -> {
-            return asHtml(path_AdminKeyMatch_EditJsp);
+            return asHtml(path_AdminKeymatch_EditJsp);
         };
         };
     }
     }
 }
 }

+ 0 - 3
src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java

@@ -92,9 +92,6 @@ public abstract class FessBaseAction extends TypicalAction // has several interf
         }
         }
     }
     }
 
 
-    protected void setupHtmlData(ActionRuntime runtime) {
-    }
-
     // ===================================================================================
     // ===================================================================================
     //                                                                      Access Context
     //                                                                      Access Context
     //                                                                      ==============
     //                                                                      ==============

+ 0 - 31
src/main/java/org/codelibs/fess/filter/DIFilter.java

@@ -1,31 +0,0 @@
-package org.codelibs.fess.filter;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.Deque;
-
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.lastaflute.web.LastaFilter;
-import org.lastaflute.web.servlet.filter.listener.FilterHook;
-
-public class DIFilter extends LastaFilter {
-
-    @Override
-    protected void resolveCharacterEncoding(HttpServletRequest request) throws UnsupportedEncodingException {
-        // nothing
-    }
-
-    @Override
-    protected void viaInsideHookDeque(HttpServletRequest request, HttpServletResponse response, FilterChain chain, Deque<FilterHook> deque)
-            throws IOException, ServletException {
-        if (deque != null && !deque.isEmpty()) {
-            super.viaInsideHookDeque(request, response, chain, deque);
-        } else {
-            routingFilter.doFilter(request, response, prepareFinalChain(chain)); /* #to_action */
-        }
-    }
-}

+ 3 - 3
src/main/java/org/codelibs/fess/filter/EncodingFilter.java

@@ -37,7 +37,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.codec.DecoderException;
 import org.apache.commons.codec.DecoderException;
 import org.apache.commons.codec.net.URLCodec;
 import org.apache.commons.codec.net.URLCodec;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.lang.StringUtil;
-import org.lastaflute.web.LastaFilter;
+import org.lastaflute.web.servlet.filter.LastaPrepareFilter;
 
 
 public class EncodingFilter implements Filter {
 public class EncodingFilter implements Filter {
     public static String ENCODING_MAP = "encodingRules";
     public static String ENCODING_MAP = "encodingRules";
@@ -54,9 +54,9 @@ public class EncodingFilter implements Filter {
     public void init(final FilterConfig config) throws ServletException {
     public void init(final FilterConfig config) throws ServletException {
         servletContext = config.getServletContext();
         servletContext = config.getServletContext();
 
 
-        encoding = config.getInitParameter(LastaFilter.ENCODING_KEY);
+        encoding = config.getInitParameter(LastaPrepareFilter.ENCODING_KEY);
         if (encoding == null) {
         if (encoding == null) {
-            encoding = LastaFilter.DEFAULT_ENCODING;
+            encoding = LastaPrepareFilter.DEFAULT_ENCODING;
         }
         }
 
 
         // ex. sjis:Shift_JIS,eucjp:EUC-JP
         // ex. sjis:Shift_JIS,eucjp:EUC-JP

+ 0 - 45
src/main/java/org/codelibs/fess/filter/RoutingFilter.java

@@ -1,45 +0,0 @@
-package org.codelibs.fess.filter;
-
-import java.io.IOException;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-import org.lastaflute.web.LastaFilter;
-import org.lastaflute.web.servlet.filter.RequestRoutingFilter;
-
-public class RoutingFilter implements Filter {
-
-    protected RequestRoutingFilter routingFilter;
-
-    @Override
-    public void doFilter(ServletRequest servReq, ServletResponse servRes, FilterChain chain) throws IOException, ServletException {
-        routingFilter.doFilter(servReq, servRes, prepareFinalChain(chain)); /* #to_action */
-    }
-
-    protected FilterChain prepareFinalChain(FilterChain chain) {
-        return chain;
-    }
-
-    @Override
-    public void init(FilterConfig filterConfig) throws ServletException {
-        routingFilter = createRequestRoutingFilter();
-        routingFilter.init(filterConfig);
-    }
-
-    protected RequestRoutingFilter createRequestRoutingFilter() {
-        return new RequestRoutingFilter();
-    }
-
-    @Override
-    public void destroy() {
-        if (routingFilter != null) { // just in case
-            routingFilter.destroy();
-        }
-    }
-
-}

+ 4 - 4
src/main/java/org/codelibs/fess/helper/QueryHelper.java

@@ -308,7 +308,7 @@ public class QueryHelper implements Serializable {
             searchQuery.addSortField(entry.getKey(), entry.getValue());
             searchQuery.addSortField(entry.getKey(), entry.getValue());
         }
         }
         // set queries to request for HighLight
         // set queries to request for HighLight
-        final HttpServletRequest request = LaRequestUtil.getRequest();
+        final HttpServletRequest request = LaRequestUtil.getOptionalRequest().orElse(null);
         if (request != null) {
         if (request != null) {
             request.setAttribute(Constants.HIGHLIGHT_QUERIES, highLightQueryList.toArray(new String[highLightQueryList.size()]));
             request.setAttribute(Constants.HIGHLIGHT_QUERIES, highLightQueryList.toArray(new String[highLightQueryList.size()]));
             request.setAttribute(Constants.FIELD_LOGS, fieldLogMap);
             request.setAttribute(Constants.FIELD_LOGS, fieldLogMap);
@@ -931,7 +931,7 @@ public class QueryHelper implements Serializable {
         if (defaultQueryLanguage != null) {
         if (defaultQueryLanguage != null) {
             return defaultQueryLanguage;
             return defaultQueryLanguage;
         }
         }
-        final HttpServletRequest request = LaRequestUtil.getRequest();
+        final HttpServletRequest request = LaRequestUtil.getOptionalRequest().orElse(null);
         if (request == null) {
         if (request == null) {
             return null;
             return null;
         }
         }
@@ -1392,7 +1392,7 @@ public class QueryHelper implements Serializable {
             return additionalQueryParamMap;
             return additionalQueryParamMap;
         }
         }
 
 
-        final HttpServletRequest request = LaRequestUtil.getRequest();
+        final HttpServletRequest request = LaRequestUtil.getOptionalRequest().orElse(null);
         final Map<String, String[]> queryParamMap = new HashMap<String, String[]>();
         final Map<String, String[]> queryParamMap = new HashMap<String, String[]>();
         for (final Map.Entry<String, String[]> entry : additionalQueryParamMap.entrySet()) {
         for (final Map.Entry<String, String[]> entry : additionalQueryParamMap.entrySet()) {
             final String[] values = entry.getValue();
             final String[] values = entry.getValue();
@@ -1430,7 +1430,7 @@ public class QueryHelper implements Serializable {
     }
     }
 
 
     protected String getDefaultOperator() {
     protected String getDefaultOperator() {
-        final HttpServletRequest request = LaRequestUtil.getRequest();
+        final HttpServletRequest request = LaRequestUtil.getOptionalRequest().orElse(null);
         if (request != null) {
         if (request != null) {
             final String defaultOperator = (String) request.getAttribute(Constants.DEFAULT_OPERATOR);
             final String defaultOperator = (String) request.getAttribute(Constants.DEFAULT_OPERATOR);
             if (AND.equalsIgnoreCase(defaultOperator)) {
             if (AND.equalsIgnoreCase(defaultOperator)) {

+ 1 - 1
src/main/java/org/codelibs/fess/helper/ViewHelper.java

@@ -141,7 +141,7 @@ public class ViewHelper implements Serializable {
     }
     }
 
 
     public String getContentDescription(final Map<String, Object> document) {
     public String getContentDescription(final Map<String, Object> document) {
-        final HttpServletRequest request = LaRequestUtil.getRequest();
+        final HttpServletRequest request = LaRequestUtil.getOptionalRequest().orElse(null);
         final String[] queries = request == null ? StringUtil.EMPTY_STRINGS : (String[]) request.getAttribute(Constants.HIGHLIGHT_QUERIES);
         final String[] queries = request == null ? StringUtil.EMPTY_STRINGS : (String[]) request.getAttribute(Constants.HIGHLIGHT_QUERIES);
         final int size = descriptionLength;
         final int size = descriptionLength;
 
 

+ 1 - 1
src/main/java/org/codelibs/fess/helper/impl/RoleQueryHelperImpl.java

@@ -82,7 +82,7 @@ public class RoleQueryHelperImpl implements RoleQueryHelper, Serializable {
     @Override
     @Override
     public Set<String> build() {
     public Set<String> build() {
         final Set<String> roleList = new HashSet<>();
         final Set<String> roleList = new HashSet<>();
-        final HttpServletRequest request = LaRequestUtil.getRequest();
+        final HttpServletRequest request = LaRequestUtil.getOptionalRequest().orElse(null);
 
 
         // request parameter
         // request parameter
         if (request != null && StringUtil.isNotBlank(parameterKey)) {
         if (request != null && StringUtil.isNotBlank(parameterKey)) {

+ 8 - 8
src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java

@@ -140,17 +140,17 @@ public interface FessHtmlPath {
     /** The path of the HTML: /admin/jobLog/index.jsp */
     /** The path of the HTML: /admin/jobLog/index.jsp */
     HtmlNext path_AdminJobLog_IndexJsp = new HtmlNext("/admin/jobLog/index.jsp");
     HtmlNext path_AdminJobLog_IndexJsp = new HtmlNext("/admin/jobLog/index.jsp");
 
 
-    /** The path of the HTML: /admin/keyMatch/confirm.jsp */
-    HtmlNext path_AdminKeyMatch_ConfirmJsp = new HtmlNext("/admin/keyMatch/confirm.jsp");
+    /** The path of the HTML: /admin/keymatch/confirm.jsp */
+    HtmlNext path_AdminKeymatch_ConfirmJsp = new HtmlNext("/admin/keymatch/confirm.jsp");
 
 
-    /** The path of the HTML: /admin/keyMatch/edit.jsp */
-    HtmlNext path_AdminKeyMatch_EditJsp = new HtmlNext("/admin/keyMatch/edit.jsp");
+    /** The path of the HTML: /admin/keymatch/edit.jsp */
+    HtmlNext path_AdminKeymatch_EditJsp = new HtmlNext("/admin/keymatch/edit.jsp");
 
 
-    /** The path of the HTML: /admin/keyMatch/error.jsp */
-    HtmlNext path_AdminKeyMatch_ErrorJsp = new HtmlNext("/admin/keyMatch/error.jsp");
+    /** The path of the HTML: /admin/keymatch/error.jsp */
+    HtmlNext path_AdminKeymatch_ErrorJsp = new HtmlNext("/admin/keymatch/error.jsp");
 
 
-    /** The path of the HTML: /admin/keyMatch/index.jsp */
-    HtmlNext path_AdminKeyMatch_IndexJsp = new HtmlNext("/admin/keyMatch/index.jsp");
+    /** The path of the HTML: /admin/keymatch/index.jsp */
+    HtmlNext path_AdminKeymatch_IndexJsp = new HtmlNext("/admin/keymatch/index.jsp");
 
 
     /** The path of the HTML: /admin/labelType/confirm.jsp */
     /** The path of the HTML: /admin/labelType/confirm.jsp */
     HtmlNext path_AdminLabelType_ConfirmJsp = new HtmlNext("/admin/labelType/confirm.jsp");
     HtmlNext path_AdminLabelType_ConfirmJsp = new HtmlNext("/admin/labelType/confirm.jsp");

+ 602 - 0
src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java

@@ -11,6 +11,108 @@ public class FessMessages extends FessLabels {
     /** The serial version UID for object serialization. (Default) */
     /** The serial version UID for object serialization. (Default) */
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
+    /** The key of the message: must be false */
+    public static final String CONSTRAINTS_AssertFalse_MESSAGE = "{constraints.AssertFalse.message}";
+
+    /** The key of the message: must be true */
+    public static final String CONSTRAINTS_AssertTrue_MESSAGE = "{constraints.AssertTrue.message}";
+
+    /** The key of the message: must be less than ${inclusive == true ? 'or equal to ' : ''}{value} */
+    public static final String CONSTRAINTS_DecimalMax_MESSAGE = "{constraints.DecimalMax.message}";
+
+    /** The key of the message: must be greater than ${inclusive == true ? 'or equal to ' : ''}{value} */
+    public static final String CONSTRAINTS_DecimalMin_MESSAGE = "{constraints.DecimalMin.message}";
+
+    /** The key of the message: numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected) */
+    public static final String CONSTRAINTS_Digits_MESSAGE = "{constraints.Digits.message}";
+
+    /** The key of the message: must be in the future */
+    public static final String CONSTRAINTS_Future_MESSAGE = "{constraints.Future.message}";
+
+    /** The key of the message: must be less than or equal to {value} */
+    public static final String CONSTRAINTS_Max_MESSAGE = "{constraints.Max.message}";
+
+    /** The key of the message: must be greater than or equal to {value} */
+    public static final String CONSTRAINTS_Min_MESSAGE = "{constraints.Min.message}";
+
+    /** The key of the message: may not be null */
+    public static final String CONSTRAINTS_NotNull_MESSAGE = "{constraints.NotNull.message}";
+
+    /** The key of the message: must be null */
+    public static final String CONSTRAINTS_Null_MESSAGE = "{constraints.Null.message}";
+
+    /** The key of the message: must be in the past */
+    public static final String CONSTRAINTS_Past_MESSAGE = "{constraints.Past.message}";
+
+    /** The key of the message: must match "{regexp}" */
+    public static final String CONSTRAINTS_Pattern_MESSAGE = "{constraints.Pattern.message}";
+
+    /** The key of the message: size must be between {min} and {max} */
+    public static final String CONSTRAINTS_Size_MESSAGE = "{constraints.Size.message}";
+
+    /** The key of the message: invalid credit card number */
+    public static final String CONSTRAINTS_CreditCardNumber_MESSAGE = "{constraints.CreditCardNumber.message}";
+
+    /** The key of the message: invalid {type} barcode */
+    public static final String CONSTRAINTS_EAN_MESSAGE = "{constraints.EAN.message}";
+
+    /** The key of the message: not a well-formed email address */
+    public static final String CONSTRAINTS_Email_MESSAGE = "{constraints.Email.message}";
+
+    /** The key of the message: length must be between {min} and {max} */
+    public static final String CONSTRAINTS_Length_MESSAGE = "{constraints.Length.message}";
+
+    /** The key of the message: The check digit for ${value} is invalid, Luhn Modulo 10 checksum failed */
+    public static final String CONSTRAINTS_LuhnCheck_MESSAGE = "{constraints.LuhnCheck.message}";
+
+    /** The key of the message: The check digit for ${value} is invalid, Modulo 10 checksum failed */
+    public static final String CONSTRAINTS_Mod10Check_MESSAGE = "{constraints.Mod10Check.message}";
+
+    /** The key of the message: The check digit for ${value} is invalid, Modulo 11 checksum failed */
+    public static final String CONSTRAINTS_Mod11Check_MESSAGE = "{constraints.Mod11Check.message}";
+
+    /** The key of the message: The check digit for ${value} is invalid, ${modType} checksum failed */
+    public static final String CONSTRAINTS_ModCheck_MESSAGE = "{constraints.ModCheck.message}";
+
+    /** The key of the message: may not be empty */
+    public static final String CONSTRAINTS_NotBlank_MESSAGE = "{constraints.NotBlank.message}";
+
+    /** The key of the message: may not be empty */
+    public static final String CONSTRAINTS_NotEmpty_MESSAGE = "{constraints.NotEmpty.message}";
+
+    /** The key of the message: script expression "{script}" didn't evaluate to true */
+    public static final String CONSTRAINTS_ParametersScriptAssert_MESSAGE = "{constraints.ParametersScriptAssert.message}";
+
+    /** The key of the message: must be between {min} and {max} */
+    public static final String CONSTRAINTS_Range_MESSAGE = "{constraints.Range.message}";
+
+    /** The key of the message: may have unsafe html content */
+    public static final String CONSTRAINTS_SafeHtml_MESSAGE = "{constraints.SafeHtml.message}";
+
+    /** The key of the message: script expression "{script}" didn't evaluate to true */
+    public static final String CONSTRAINTS_ScriptAssert_MESSAGE = "{constraints.ScriptAssert.message}";
+
+    /** The key of the message: must be a valid URL */
+    public static final String CONSTRAINTS_URL_MESSAGE = "{constraints.URL.message}";
+
+    /** The key of the message: is required */
+    public static final String CONSTRAINTS_Required_MESSAGE = "{constraints.Required.message}";
+
+    /** The key of the message: could not login */
+    public static final String ERRORS_LOGIN_FAILURE = "{errors.login.failure}";
+
+    /** The key of the message: retry because of illegal transition */
+    public static final String ERRORS_APP_ILLEGAL_TRANSITION = "{errors.app.illegal.transition}";
+
+    /** The key of the message: others might be updated, so retry */
+    public static final String ERRORS_APP_DB_ALREADY_DELETED = "{errors.app.db.already.deleted}";
+
+    /** The key of the message: others might be updated, so retry */
+    public static final String ERRORS_APP_DB_ALREADY_UPDATED = "{errors.app.db.already.updated}";
+
+    /** The key of the message: already existing data, so retry */
+    public static final String ERRORS_APP_DB_ALREADY_EXISTS = "{errors.app.db.already.exists}";
+
     /** The key of the message: <div class="alert"><button type="button" class="close" data-dismiss="alert">×</button> */
     /** The key of the message: <div class="alert"><button type="button" class="close" data-dismiss="alert">×</button> */
     public static final String ERRORS_front_header = "{errors.front_header}";
     public static final String ERRORS_front_header = "{errors.front_header}";
 
 
@@ -444,6 +546,506 @@ public class FessMessages extends FessLabels {
     /** The key of the message: Deleted data. */
     /** The key of the message: Deleted data. */
     public static final String SUCCESS_crud_delete_crud_table = "{success.crud_delete_crud_table}";
     public static final String SUCCESS_crud_delete_crud_table = "{success.crud_delete_crud_table}";
 
 
+    /**
+     * Add the created action message for the key 'constraints.AssertFalse.message' with parameters.
+     * <pre>
+     * message: must be false
+     * comment: ---------------
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsAssertFalseMessage(String property) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_AssertFalse_MESSAGE));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.AssertTrue.message' with parameters.
+     * <pre>
+     * message: must be true
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsAssertTrueMessage(String property) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_AssertTrue_MESSAGE));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.DecimalMax.message' with parameters.
+     * <pre>
+     * message: must be less than ${inclusive == true ? 'or equal to ' : ''}{value}
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @param value The parameter value for message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsDecimalMaxMessage(String property, String value) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_DecimalMax_MESSAGE, value));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.DecimalMin.message' with parameters.
+     * <pre>
+     * message: must be greater than ${inclusive == true ? 'or equal to ' : ''}{value}
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @param value The parameter value for message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsDecimalMinMessage(String property, String value) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_DecimalMin_MESSAGE, value));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.Digits.message' with parameters.
+     * <pre>
+     * message: numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected)
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @param integer The parameter integer for message. (NotNull)
+     * @param fraction The parameter fraction for message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsDigitsMessage(String property, String integer, String fraction) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_Digits_MESSAGE, integer, fraction));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.Future.message' with parameters.
+     * <pre>
+     * message: must be in the future
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsFutureMessage(String property) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_Future_MESSAGE));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.Max.message' with parameters.
+     * <pre>
+     * message: must be less than or equal to {value}
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @param value The parameter value for message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsMaxMessage(String property, String value) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_Max_MESSAGE, value));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.Min.message' with parameters.
+     * <pre>
+     * message: must be greater than or equal to {value}
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @param value The parameter value for message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsMinMessage(String property, String value) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_Min_MESSAGE, value));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.NotNull.message' with parameters.
+     * <pre>
+     * message: may not be null
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsNotNullMessage(String property) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_NotNull_MESSAGE));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.Null.message' with parameters.
+     * <pre>
+     * message: must be null
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsNullMessage(String property) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_Null_MESSAGE));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.Past.message' with parameters.
+     * <pre>
+     * message: must be in the past
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsPastMessage(String property) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_Past_MESSAGE));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.Pattern.message' with parameters.
+     * <pre>
+     * message: must match "{regexp}"
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @param regexp The parameter regexp for message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsPatternMessage(String property, String regexp) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_Pattern_MESSAGE, regexp));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.Size.message' with parameters.
+     * <pre>
+     * message: size must be between {min} and {max}
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @param min The parameter min for message. (NotNull)
+     * @param max The parameter max for message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsSizeMessage(String property, String min, String max) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_Size_MESSAGE, min, max));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.CreditCardNumber.message' with parameters.
+     * <pre>
+     * message: invalid credit card number
+     * comment: -------------------
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsCreditCardNumberMessage(String property) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_CreditCardNumber_MESSAGE));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.EAN.message' with parameters.
+     * <pre>
+     * message: invalid {type} barcode
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @param type The parameter type for message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsEanMessage(String property, String type) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_EAN_MESSAGE, type));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.Email.message' with parameters.
+     * <pre>
+     * message: not a well-formed email address
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsEmailMessage(String property) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_Email_MESSAGE));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.Length.message' with parameters.
+     * <pre>
+     * message: length must be between {min} and {max}
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @param min The parameter min for message. (NotNull)
+     * @param max The parameter max for message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsLengthMessage(String property, String min, String max) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_Length_MESSAGE, min, max));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.LuhnCheck.message' with parameters.
+     * <pre>
+     * message: The check digit for ${value} is invalid, Luhn Modulo 10 checksum failed
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @param value The parameter value for message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsLuhnCheckMessage(String property, String value) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_LuhnCheck_MESSAGE, value));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.Mod10Check.message' with parameters.
+     * <pre>
+     * message: The check digit for ${value} is invalid, Modulo 10 checksum failed
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @param value The parameter value for message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsMod10CheckMessage(String property, String value) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_Mod10Check_MESSAGE, value));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.Mod11Check.message' with parameters.
+     * <pre>
+     * message: The check digit for ${value} is invalid, Modulo 11 checksum failed
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @param value The parameter value for message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsMod11CheckMessage(String property, String value) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_Mod11Check_MESSAGE, value));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.ModCheck.message' with parameters.
+     * <pre>
+     * message: The check digit for ${value} is invalid, ${modType} checksum failed
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @param value The parameter value for message. (NotNull)
+     * @param modType The parameter modType for message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsModCheckMessage(String property, String value, String modType) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_ModCheck_MESSAGE, value, modType));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.NotBlank.message' with parameters.
+     * <pre>
+     * message: may not be empty
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsNotBlankMessage(String property) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_NotBlank_MESSAGE));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.NotEmpty.message' with parameters.
+     * <pre>
+     * message: may not be empty
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsNotEmptyMessage(String property) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_NotEmpty_MESSAGE));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.ParametersScriptAssert.message' with parameters.
+     * <pre>
+     * message: script expression "{script}" didn't evaluate to true
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @param script The parameter script for message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsParametersScriptAssertMessage(String property, String script) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_ParametersScriptAssert_MESSAGE, script));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.Range.message' with parameters.
+     * <pre>
+     * message: must be between {min} and {max}
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @param min The parameter min for message. (NotNull)
+     * @param max The parameter max for message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsRangeMessage(String property, String min, String max) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_Range_MESSAGE, min, max));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.SafeHtml.message' with parameters.
+     * <pre>
+     * message: may have unsafe html content
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsSafeHtmlMessage(String property) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_SafeHtml_MESSAGE));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.ScriptAssert.message' with parameters.
+     * <pre>
+     * message: script expression "{script}" didn't evaluate to true
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @param script The parameter script for message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsScriptAssertMessage(String property, String script) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_ScriptAssert_MESSAGE, script));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.URL.message' with parameters.
+     * <pre>
+     * message: must be a valid URL
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsUrlMessage(String property) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_URL_MESSAGE));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.Required.message' with parameters.
+     * <pre>
+     * message: is required
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsRequiredMessage(String property) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_Required_MESSAGE));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'errors.login.failure' with parameters.
+     * <pre>
+     * message: could not login
+     * comment: - - - - - - - - - -/
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addErrorsLoginFailure(String property) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(ERRORS_LOGIN_FAILURE));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'errors.app.illegal.transition' with parameters.
+     * <pre>
+     * message: retry because of illegal transition
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addErrorsAppIllegalTransition(String property) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(ERRORS_APP_ILLEGAL_TRANSITION));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'errors.app.db.already.deleted' with parameters.
+     * <pre>
+     * message: others might be updated, so retry
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addErrorsAppDbAlreadyDeleted(String property) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(ERRORS_APP_DB_ALREADY_DELETED));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'errors.app.db.already.updated' with parameters.
+     * <pre>
+     * message: others might be updated, so retry
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addErrorsAppDbAlreadyUpdated(String property) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(ERRORS_APP_DB_ALREADY_UPDATED));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'errors.app.db.already.exists' with parameters.
+     * <pre>
+     * message: already existing data, so retry
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addErrorsAppDbAlreadyExists(String property) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(ERRORS_APP_DB_ALREADY_EXISTS));
+        return this;
+    }
+
     /**
     /**
      * Add the created action message for the key 'errors.front_header' with parameters.
      * Add the created action message for the key 'errors.front_header' with parameters.
      * <pre>
      * <pre>

+ 0 - 30
src/main/java/org/codelibs/fess/mylasta/tentative/Required.java

@@ -1,30 +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.mylasta.tentative;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * TODO jflute LastaFluteで対応するまで暫定
- * @author jflute
- */
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Required {
-}

+ 0 - 2
src/main/resources/esclient.xml

@@ -3,11 +3,9 @@
 	"http://dbflute.org/meta/lastadi10.dtd">
 	"http://dbflute.org/meta/lastadi10.dtd">
 <components>
 <components>
 	<component name="fessEsClient" class="org.codelibs.fess.client.FessEsClient">
 	<component name="fessEsClient" class="org.codelibs.fess.client.FessEsClient">
-		<!-- 
 		<property name="settings">
 		<property name="settings">
 			{"http.cors.enabled":"true"}
 			{"http.cors.enabled":"true"}
 		</property>
 		</property>
-		 -->
 		<postConstruct name="addIndexConfig">
 		<postConstruct name="addIndexConfig">
 			<arg>"fess/doc"</arg>
 			<arg>"fess/doc"</arg>
 		</postConstruct>
 		</postConstruct>

+ 10 - 10
src/main/webapp/WEB-INF/view/admin/boostDocumentRule/confirm.jsp

@@ -42,14 +42,14 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -92,15 +92,15 @@
 										<tbody>
 										<tbody>
 											<tr>
 											<tr>
 												<th class="col-xs-2"><la:message key="labels.boost_document_rule_url_expr" /></th>
 												<th class="col-xs-2"><la:message key="labels.boost_document_rule_url_expr" /></th>
-												<td>${f:h(urlExpr)}<html:hidden property="urlExpr" /></td>
+												<td>${f:h(urlExpr)}<la:hidden property="urlExpr" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.boost_document_rule_boost_expr" /></th>
 												<th><la:message key="labels.boost_document_rule_boost_expr" /></th>
-												<td>${f:h(boostExpr)}<html:hidden property="boostExpr" /></td>
+												<td>${f:h(boostExpr)}<la:hidden property="boostExpr" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.boost_document_rule_sort_order" /></th>
 												<th><la:message key="labels.boost_document_rule_sort_order" /></th>
-												<td>${f:h(sortOrder)}<html:hidden property="sortOrder" /></td>
+												<td>${f:h(sortOrder)}<la:hidden property="sortOrder" /></td>
 											</tr>
 											</tr>
 										</tbody>
 										</tbody>
 									</table>
 									</table>
@@ -139,7 +139,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 10 - 10
src/main/webapp/WEB-INF/view/admin/boostDocumentRule/edit.jsp

@@ -43,14 +43,14 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
 					<c:if test="${crudMode==2}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -85,15 +85,15 @@
 									<%-- Form Fields --%>
 									<%-- Form Fields --%>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="urlExpr"><la:message key="labels.boost_document_rule_url_expr" /></label>
 										<label for="urlExpr"><la:message key="labels.boost_document_rule_url_expr" /></label>
-										<html:text property="urlExpr" styleClass="form-control" />
+										<la:text property="urlExpr" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="boostExpr"><la:message key="labels.boost_document_rule_boost_expr" /></label>
 										<label for="boostExpr"><la:message key="labels.boost_document_rule_boost_expr" /></label>
-										<html:text property="boostExpr" styleClass="form-control" />
+										<la:text property="boostExpr" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="sortOrder"><la:message key="labels.boost_document_rule_sort_order" /></label>
 										<label for="sortOrder"><la:message key="labels.boost_document_rule_sort_order" /></label>
-										<html:text property="sortOrder" styleClass="form-control" />
+										<la:text property="sortOrder" styleClass="form-control" />
 									</div>
 									</div>
 								</div>
 								</div>
 								<%-- Box Footer --%>
 								<%-- Box Footer --%>
@@ -114,7 +114,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 13 - 13
src/main/webapp/WEB-INF/view/admin/crawl/index.jsp

@@ -25,7 +25,7 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
+				<la:form>
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -87,7 +87,7 @@
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 											<label for="defaultLabelValue"><la:message key="labels.default_label_value" /></label>
 											<label for="defaultLabelValue"><la:message key="labels.default_label_value" /></label>
-											<html:textarea property="defaultLabelValue" styleClass="form-control" />
+											<la:textarea property="defaultLabelValue" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 											<label for="supportedSearch"><la:message key="labels.supported_search_feature" /></label>
 											<label for="supportedSearch"><la:message key="labels.supported_search_feature" /></label>
@@ -109,33 +109,33 @@
 									<div class="form-group">
 									<div class="form-group">
 											<label for="purgeSearchLogDay"><la:message key="labels.purge_search_log_day" /></label>
 											<label for="purgeSearchLogDay"><la:message key="labels.purge_search_log_day" /></label>
 											<div class="form-inline">
 											<div class="form-inline">
-													<html:text property="purgeSearchLogDay" styleClass="form-control" />
+													<la:text property="purgeSearchLogDay" styleClass="form-control" />
 											</div>
 											</div>
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 											<label for="purgeJobLogDay"><la:message key="labels.purge_job_log_day" /></label>
 											<label for="purgeJobLogDay"><la:message key="labels.purge_job_log_day" /></label>
 											<div class="form-inline">
 											<div class="form-inline">
-													<html:text property="purgeJobLogDay" styleClass="form-control" />
+													<la:text property="purgeJobLogDay" styleClass="form-control" />
 											</div>
 											</div>
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 											<label for="purgeUserInfoDay"><la:message key="labels.purge_user_info_day" /></label>
 											<label for="purgeUserInfoDay"><la:message key="labels.purge_user_info_day" /></label>
 											<div class="form-inline">
 											<div class="form-inline">
-													<html:text property="purgeUserInfoDay" styleClass="form-control" />
+													<la:text property="purgeUserInfoDay" styleClass="form-control" />
 											</div>
 											</div>
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 											<label for="purgeByBots"><la:message key="labels.purge_by_bots" /></label>
 											<label for="purgeByBots"><la:message key="labels.purge_by_bots" /></label>
-											<html:text property="purgeByBots" styleClass="form-control" />
+											<la:text property="purgeByBots" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 											<label for="notificationTo"><la:message key="labels.notification_to" /></label>
 											<label for="notificationTo"><la:message key="labels.notification_to" /></label>
-											<html:text property="notificationTo" styleClass="form-control" />
+											<la:text property="notificationTo" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 											<label for="csvFileEncoding"><la:message key="labels.csv_file_encoding" /></label>
 											<label for="csvFileEncoding"><la:message key="labels.csv_file_encoding" /></label>
 											<div class="form-inline">
 											<div class="form-inline">
-													<html:text property="csvFileEncoding" styleClass="form-control" />
+													<la:text property="csvFileEncoding" styleClass="form-control" />
 											</div>
 											</div>
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
@@ -162,7 +162,7 @@
 									<div class="form-group">
 									<div class="form-group">
 											<label for="crawlingThreadCount"><la:message key="labels.crawling_thread_count" /></label>
 											<label for="crawlingThreadCount"><la:message key="labels.crawling_thread_count" /></label>
 											<div class="form-inline">
 											<div class="form-inline">
-													<html:text property="crawlingThreadCount" styleClass="form-control" />
+													<la:text property="crawlingThreadCount" styleClass="form-control" />
 											</div>
 											</div>
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
@@ -179,12 +179,12 @@
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 											<label for="ignoreFailureType"><la:message key="labels.ignore_failure_type" /></label>
 											<label for="ignoreFailureType"><la:message key="labels.ignore_failure_type" /></label>
-											<html:text property="ignoreFailureType" styleClass="form-control" />
+											<la:text property="ignoreFailureType" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 											<label for="failureCountThreshold"><la:message key="labels.failure_count_threshold" /></label>
 											<label for="failureCountThreshold"><la:message key="labels.failure_count_threshold" /></label>
 											<div class="form-inline">
 											<div class="form-inline">
-													<html:text property="failureCountThreshold" styleClass="form-control" />
+													<la:text property="failureCountThreshold" styleClass="form-control" />
 											</div>
 											</div>
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
@@ -197,7 +197,7 @@
 									<div class="form-group">
 									<div class="form-group">
 											<label for="purgeSuggestSearchLogDay"><la:message key="labels.purge_suggest_search_log_day" /></label>
 											<label for="purgeSuggestSearchLogDay"><la:message key="labels.purge_suggest_search_log_day" /></label>
 											<div class="form-inline">
 											<div class="form-inline">
-													<html:text property="purgeSuggestSearchLogDay" styleClass="form-control" />
+													<la:text property="purgeSuggestSearchLogDay" styleClass="form-control" />
 											</div>
 											</div>
 									</div>
 									</div>
 
 
@@ -211,7 +211,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 8 - 8
src/main/webapp/WEB-INF/view/admin/crawlingSession/confirm.jsp

@@ -42,14 +42,14 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -93,7 +93,7 @@
 											<tr>
 											<tr>
 												<th><la:message key="labels.crawling_session_session_id" /></th>
 												<th><la:message key="labels.crawling_session_session_id" /></th>
 												<td><html:link href="${f:url('/admin/searchList/search')}?query=segment:${f:u(sessionId)}">${f:h(sessionId)}</html:link>
 												<td><html:link href="${f:url('/admin/searchList/search')}?query=segment:${f:u(sessionId)}">${f:h(sessionId)}</html:link>
-													<html:hidden property="sessionId" /></td>
+													<la:hidden property="sessionId" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.crawling_session_name" /></th>
 												<th><la:message key="labels.crawling_session_name" /></th>
@@ -129,7 +129,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 4 - 4
src/main/webapp/WEB-INF/view/admin/crawlingSession/index.jsp

@@ -37,16 +37,16 @@
 								<h3 class="box-title">
 								<h3 class="box-title">
 									<la:message key="labels.crawling_session_title" />
 									<la:message key="labels.crawling_session_title" />
 								</h3>
 								</h3>
-								<s:form>
+								<la:form>
 										<label for="sessionIdSearchBtn"><la:message
 										<label for="sessionIdSearchBtn"><la:message
 												key="labels.crawling_session_session_id_search" /></label>
 												key="labels.crawling_session_session_id_search" /></label>
-										<html:text styleId="sessionIdSearchBtn"
-											property="searchParams.sessionId"></html:text>
+										<la:text styleId="sessionIdSearchBtn"
+											property="searchParams.sessionId"></la:text>
 										<input type="submit" class="btn small primary" name="search"
 										<input type="submit" class="btn small primary" name="search"
 											value="<la:message key="labels.crawling_session_search"/>" /> <input
 											value="<la:message key="labels.crawling_session_search"/>" /> <input
 											type="submit" class="btn small" name="reset"
 											type="submit" class="btn small" name="reset"
 											value="<la:message key="labels.crawling_session_reset"/>" />
 											value="<la:message key="labels.crawling_session_reset"/>" />
-								</s:form>
+								</la:form>
 							</div>
 							</div>
 							<%-- Box Body --%>
 							<%-- Box Body --%>
 							<div class="box-body">
 							<div class="box-body">

+ 4 - 4
src/main/webapp/WEB-INF/view/admin/data/index.jsp

@@ -18,7 +18,7 @@
 		</div>
 		</div>
 		<%-- Message: END --%>
 		<%-- Message: END --%>
 
 
-	<s:form>
+	<la:form>
 	<div>
 	<div>
         <h3><la:message key="labels.backup_title_edit"/></h3>
         <h3><la:message key="labels.backup_title_edit"/></h3>
 		<table class="bordered-table zebra-striped">
 		<table class="bordered-table zebra-striped">
@@ -58,8 +58,8 @@
 			</tbody>
 			</tbody>
 		</table>
 		</table>
 	</div>
 	</div>
-	</s:form>
-	<s:form action="upload" enctype="multipart/form-data" style="margin-top:10px;">
+	</la:form>
+	<la:form action="upload" enctype="multipart/form-data" style="margin-top:10px;">
 	<div>
 	<div>
         <h3><la:message key="labels.restore_title_edit"/></h3>
         <h3><la:message key="labels.restore_title_edit"/></h3>
 		<table >
 		<table >
@@ -90,7 +90,7 @@
 			</tfoot>
 			</tfoot>
 		</table>
 		</table>
 	</div>
 	</div>
-	</s:form>
+	</la:form>
 
 
 </div>
 </div>
 
 

+ 14 - 14
src/main/webapp/WEB-INF/view/admin/dataConfig/confirm.jsp

@@ -42,15 +42,15 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
-					<html:hidden property="sortOrder"/>
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
+					<la:hidden property="sortOrder"/>
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -96,7 +96,7 @@
 											</tr></c:if>
 											</tr></c:if>
 											<tr>
 											<tr>
 												<th class="col-xs-3"><la:message key="labels.name" /></th>
 												<th class="col-xs-3"><la:message key="labels.name" /></th>
-												<td>${f:h(name)}<html:hidden property="name" /></td>
+												<td>${f:h(name)}<la:hidden property="name" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.handler_name" /></th>
 												<th><la:message key="labels.handler_name" /></th>
@@ -106,20 +106,20 @@
 															${f:h(hn.label)}<br/>
 															${f:h(hn.label)}<br/>
 														</c:if>
 														</c:if>
 													</c:forEach>
 													</c:forEach>
-													<html:hidden property="handlerName"/>
+													<la:hidden property="handlerName"/>
 												</td>
 												</td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.handler_parameter" /></th>
 												<th><la:message key="labels.handler_parameter" /></th>
-												<td>${f:br(f:h(handlerParameter))}<html:hidden property="handlerParameter" /></td>
+												<td>${f:br(f:h(handlerParameter))}<la:hidden property="handlerParameter" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.handler_script" /></th>
 												<th><la:message key="labels.handler_script" /></th>
-												<td>${f:br(f:h(handlerScript))}<html:hidden property="handlerScript" /></td>
+												<td>${f:br(f:h(handlerScript))}<la:hidden property="handlerScript" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.boost" /></th>
 												<th><la:message key="labels.boost" /></th>
-												<td>${f:h(boost)}<html:hidden property="boost" /></td>
+												<td>${f:h(boost)}<la:hidden property="boost" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.role_type" /></th>
 												<th><la:message key="labels.role_type" /></th>
@@ -157,7 +157,7 @@
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.available"/></th>
 												<th><la:message key="labels.available"/></th>
-												<td><html:hidden property="available"/>
+												<td><la:hidden property="available"/>
 													<c:if test="${available=='true'}"><la:message key="labels.enabled"/></c:if>
 													<c:if test="${available=='true'}"><la:message key="labels.enabled"/></c:if>
 													<c:if test="${available=='false'}"><la:message key="labels.disabled"/></c:if>
 													<c:if test="${available=='false'}"><la:message key="labels.disabled"/></c:if>
 												</td>
 												</td>
@@ -199,7 +199,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 12 - 12
src/main/webapp/WEB-INF/view/admin/dataConfig/edit.jsp

@@ -42,15 +42,15 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
 					<c:if test="${crudMode==2}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
-					<html:hidden property="sortOrder"/>
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
+					<la:hidden property="sortOrder"/>
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -84,7 +84,7 @@
 									<%-- Form Fields --%>
 									<%-- Form Fields --%>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="name"><la:message key="labels.name" /></label>
 										<label for="name"><la:message key="labels.name" /></label>
-										<html:text property="name" styleClass="form-control" />
+										<la:text property="name" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 											<label for="handlerName"><la:message key="labels.handler_name" /></label>
 											<label for="handlerName"><la:message key="labels.handler_name" /></label>
@@ -96,15 +96,15 @@
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="handlerParameter"><la:message key="labels.handler_parameter" /></label>
 										<label for="handlerParameter"><la:message key="labels.handler_parameter" /></label>
-										<html:textarea property="handlerParameter" styleClass="form-control" rows="5" />
+										<la:textarea property="handlerParameter" styleClass="form-control" rows="5" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="handlerScript"><la:message key="labels.handler_script" /></label>
 										<label for="handlerScript"><la:message key="labels.handler_script" /></label>
-										<html:textarea property="handlerScript" styleClass="form-control" rows="5" />
+										<la:textarea property="handlerScript" styleClass="form-control" rows="5" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="boost"><la:message key="labels.boost" /></label>
 										<label for="boost"><la:message key="labels.boost" /></label>
-										<html:text property="boost" styleClass="form-control" />
+										<la:text property="boost" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="roleTypeIds"><la:message key="labels.role_type" /></label>
 										<label for="roleTypeIds"><la:message key="labels.role_type" /></label>
@@ -153,7 +153,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 7 - 7
src/main/webapp/WEB-INF/view/admin/design/admin_design.jsp

@@ -37,7 +37,7 @@
 						}
 						}
 					// -->
 					// -->
 					</script>
 					</script>
-					<s:form>
+					<la:form>
 						<table class="bordered-table zebra-striped">
 						<table class="bordered-table zebra-striped">
 							<tbody>
 							<tbody>
 								<tr>
 								<tr>
@@ -57,14 +57,14 @@
 									</td>
 									</td>
 								</tr>
 								</tr>
 						</table>
 						</table>
-					</s:form>
+					</la:form>
 				</div>
 				</div>
 
 
 				<div style="margin-top: 5px;">
 				<div style="margin-top: 5px;">
 					<h3>
 					<h3>
 						<la:message key="labels.design_title_file_upload" />
 						<la:message key="labels.design_title_file_upload" />
 					</h3>
 					</h3>
-					<s:form action="upload" enctype="multipart/form-data">
+					<la:form action="upload" enctype="multipart/form-data">
 						<table class="bordered-table zebra-striped">
 						<table class="bordered-table zebra-striped">
 							<tbody>
 							<tbody>
 							<tr>
 							<tr>
@@ -75,7 +75,7 @@
 								</tr>
 								</tr>
 								<tr>
 								<tr>
 									<th><la:message key="labels.design_file_name" /></th>
 									<th><la:message key="labels.design_file_name" /></th>
-									<td style="text-align: center;"><html:text
+									<td style="text-align: center;"><la:text
 											property="designFileName" style="width:98%;" /></td>
 											property="designFileName" style="width:98%;" /></td>
 								</tr>
 								</tr>
 							</tbody>
 							</tbody>
@@ -87,14 +87,14 @@
 								</tr>
 								</tr>
 							</tfoot>
 							</tfoot>
 						</table>
 						</table>
-					</s:form>
+					</la:form>
 				</div>
 				</div>
 
 
 				<div style="margin-top: 5px;">
 				<div style="margin-top: 5px;">
 					<h3>
 					<h3>
 						<la:message key="labels.design_file_title_edit" />
 						<la:message key="labels.design_file_title_edit" />
 					</h3>
 					</h3>
-					<s:form>
+					<la:form>
 					<table class="bordered-table zebra-striped">
 					<table class="bordered-table zebra-striped">
 						<tbody>
 						<tbody>
 							<tr>
 							<tr>
@@ -129,7 +129,7 @@
 								</td>
 								</td>
 							</tr>
 							</tr>
 					</table>
 					</table>
-					</s:form>
+					</la:form>
 				</div>
 				</div>
 			</c:if>
 			</c:if>
 		</div>
 		</div>

+ 5 - 5
src/main/webapp/WEB-INF/view/admin/design/admin_design_edit.jsp

@@ -19,15 +19,15 @@
 		</div>
 		</div>
 		<%-- Message: END --%>
 		<%-- Message: END --%>
 		<c:if test="${editable}">
 		<c:if test="${editable}">
-			<s:form>
+			<la:form>
 				<div>
 				<div>
 					<h3>
 					<h3>
 						<la:message key="labels.design_title_edit_content" />
 						<la:message key="labels.design_title_edit_content" />
 					</h3>
 					</h3>
 					<h4>${f:h(fileName)}</h4>
 					<h4>${f:h(fileName)}</h4>
 					<div>
 					<div>
-						<html:textarea
-								property="content" style="width:98%" rows="20"></html:textarea>
+						<la:textarea
+								property="content" style="width:98%" rows="20"></la:textarea>
 					</div>
 					</div>
 					<div style="margin-top:5px;">
 					<div style="margin-top:5px;">
 						<input type="submit" class="btn small" name="update"
 						<input type="submit" class="btn small" name="update"
@@ -36,8 +36,8 @@
 							value="<la:message key="labels.design_button_back"/>" />
 							value="<la:message key="labels.design_button_back"/>" />
 					</div>
 					</div>
 				</div>
 				</div>
-				<html:hidden property="fileName" />
-			</s:form>
+				<la:hidden property="fileName" />
+			</la:form>
 		</c:if>
 		</c:if>
 
 
 	</tiles:put>
 	</tiles:put>

+ 7 - 7
src/main/webapp/WEB-INF/view/admin/dict/synonym/confirm.jsp

@@ -57,23 +57,23 @@
 			</div>
 			</div>
 
 
 		<%-- Confirm Form: BEGIN --%>
 		<%-- Confirm Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
+		<la:form>
+			<la:hidden property="crudMode" />
 			<div>
 			<div>
-				<html:hidden property="dictId" />
+				<la:hidden property="dictId" />
 				<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 				<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-					<html:hidden property="id" />
+					<la:hidden property="id" />
 				</c:if>
 				</c:if>
 				<table class="bordered-table zebra-striped" style="width: 500px;">
 				<table class="bordered-table zebra-striped" style="width: 500px;">
 					<tbody>
 					<tbody>
 						<tr>
 						<tr>
 							<th style="width: 150px;"><la:message
 							<th style="width: 150px;"><la:message
 									key="labels.dict_synonym_source" /></th>
 									key="labels.dict_synonym_source" /></th>
-							<td>${f:br(f:h(inputs))}<html:hidden property="inputs" /></td>
+							<td>${f:br(f:h(inputs))}<la:hidden property="inputs" /></td>
 						</tr>
 						</tr>
 						<tr>
 						<tr>
 							<th><la:message key="labels.dict_synonym_target" /></th>
 							<th><la:message key="labels.dict_synonym_target" /></th>
-							<td>${f:br(f:h(outputs))}<html:hidden property="outputs" /></td>
+							<td>${f:br(f:h(outputs))}<la:hidden property="outputs" /></td>
 						</tr>
 						</tr>
 					</tbody>
 					</tbody>
 					<tfoot>
 					<tfoot>
@@ -105,7 +105,7 @@
 					</tfoot>
 					</tfoot>
 				</table>
 				</table>
 			</div>
 			</div>
-		</s:form>
+		</la:form>
 		<%-- Confirm Form: BEGIN --%>
 		<%-- Confirm Form: BEGIN --%>
 
 
 	</tiles:put>
 	</tiles:put>

+ 3 - 3
src/main/webapp/WEB-INF/view/admin/dict/synonym/download.jsp

@@ -44,9 +44,9 @@
 			</div>
 			</div>
 
 
 		<%-- Edit Form: BEGIN --%>
 		<%-- Edit Form: BEGIN --%>
-		<s:form>
+		<la:form>
 			<div>
 			<div>
-				<html:hidden property="dictId" />
+				<la:hidden property="dictId" />
 				<table class="bordered-table zebra-striped" style="width: 500px;">
 				<table class="bordered-table zebra-striped" style="width: 500px;">
 					<tbody>
 					<tbody>
 						<tr>
 						<tr>
@@ -59,7 +59,7 @@
 					</tbody>
 					</tbody>
 				</table>
 				</table>
 			</div>
 			</div>
-		</s:form>
+		</la:form>
 		<%-- Edit Form: BEGIN --%>
 		<%-- Edit Form: BEGIN --%>
 
 
 	</tiles:put>
 	</tiles:put>

+ 7 - 7
src/main/webapp/WEB-INF/view/admin/dict/synonym/edit.jsp

@@ -57,24 +57,24 @@
 			</div>
 			</div>
 
 
 		<%-- Edit Form: BEGIN --%>
 		<%-- Edit Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
+		<la:form>
+			<la:hidden property="crudMode" />
 			<div>
 			<div>
-				<html:hidden property="dictId" />
+				<la:hidden property="dictId" />
 				<c:if test="${crudMode==2}">
 				<c:if test="${crudMode==2}">
-					<html:hidden property="id" />
+					<la:hidden property="id" />
 				</c:if>
 				</c:if>
 				<table class="bordered-table zebra-striped" style="width: 500px;">
 				<table class="bordered-table zebra-striped" style="width: 500px;">
 					<tbody>
 					<tbody>
 						<tr>
 						<tr>
 							<th style="width: 150px;"><la:message
 							<th style="width: 150px;"><la:message
 									key="labels.dict_synonym_source" /></th>
 									key="labels.dict_synonym_source" /></th>
-							<td><html:textarea property="inputs" rows="5" style="width:98%;" /></td>
+							<td><la:textarea property="inputs" rows="5" style="width:98%;" /></td>
 						</tr>
 						</tr>
 						<tr>
 						<tr>
 							<th><la:message
 							<th><la:message
 									key="labels.dict_synonym_target" /></th>
 									key="labels.dict_synonym_target" /></th>
-							<td><html:textarea property="outputs" rows="5" style="width:98%;" /></td>
+							<td><la:textarea property="outputs" rows="5" style="width:98%;" /></td>
 						</tr>
 						</tr>
 					</tbody>
 					</tbody>
 					<tfoot>
 					<tfoot>
@@ -94,7 +94,7 @@
 					</tfoot>
 					</tfoot>
 				</table>
 				</table>
 			</div>
 			</div>
-		</s:form>
+		</la:form>
 		<%-- Edit Form: BEGIN --%>
 		<%-- Edit Form: BEGIN --%>
 
 
 	</tiles:put>
 	</tiles:put>

+ 3 - 3
src/main/webapp/WEB-INF/view/admin/dict/synonym/upload.jsp

@@ -44,9 +44,9 @@
 			</div>
 			</div>
 
 
 		<%-- Edit Form: BEGIN --%>
 		<%-- Edit Form: BEGIN --%>
-		<s:form action="upload" enctype="multipart/form-data">
+		<la:form action="upload" enctype="multipart/form-data">
 			<div>
 			<div>
-				<html:hidden property="dictId" />
+				<la:hidden property="dictId" />
 				<table class="bordered-table zebra-striped" style="width: 500px;">
 				<table class="bordered-table zebra-striped" style="width: 500px;">
 					<tbody>
 					<tbody>
 						<tr>
 						<tr>
@@ -69,7 +69,7 @@
 					</tfoot>
 					</tfoot>
 				</table>
 				</table>
 			</div>
 			</div>
-		</s:form>
+		</la:form>
 		<%-- Edit Form: BEGIN --%>
 		<%-- Edit Form: BEGIN --%>
 
 
 	</tiles:put>
 	</tiles:put>

+ 9 - 9
src/main/webapp/WEB-INF/view/admin/dict/userDict/confirm.jsp

@@ -57,31 +57,31 @@
 			</div>
 			</div>
 
 
 		<%-- Confirm Form: BEGIN --%>
 		<%-- Confirm Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
+		<la:form>
+			<la:hidden property="crudMode" />
 			<div>
 			<div>
-				<html:hidden property="dictId" />
+				<la:hidden property="dictId" />
 				<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 				<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-					<html:hidden property="id" />
+					<la:hidden property="id" />
 				</c:if>
 				</c:if>
 				<table class="bordered-table zebra-striped" style="width: 500px;">
 				<table class="bordered-table zebra-striped" style="width: 500px;">
 					<tbody>
 					<tbody>
 						<tr>
 						<tr>
 							<th style="width: 150px;"><la:message
 							<th style="width: 150px;"><la:message
 									key="labels.dict_userdict_token" /></th>
 									key="labels.dict_userdict_token" /></th>
-							<td>${f:h(token)}<html:hidden property="token" /></td>
+							<td>${f:h(token)}<la:hidden property="token" /></td>
 						</tr>
 						</tr>
 						<tr>
 						<tr>
 							<th><la:message key="labels.dict_userdict_segmentation" /></th>
 							<th><la:message key="labels.dict_userdict_segmentation" /></th>
-							<td>${f:h(segmentation)}<html:hidden property="segmentation" /></td>
+							<td>${f:h(segmentation)}<la:hidden property="segmentation" /></td>
 						</tr>
 						</tr>
 						<tr>
 						<tr>
 							<th><la:message key="labels.dict_userdict_reading" /></th>
 							<th><la:message key="labels.dict_userdict_reading" /></th>
-							<td>${f:h(reading)}<html:hidden property="reading" /></td>
+							<td>${f:h(reading)}<la:hidden property="reading" /></td>
 						</tr>
 						</tr>
 						<tr>
 						<tr>
 							<th><la:message key="labels.dict_userdict_pos" /></th>
 							<th><la:message key="labels.dict_userdict_pos" /></th>
-							<td>${f:h(pos)}<html:hidden property="pos" /></td>
+							<td>${f:h(pos)}<la:hidden property="pos" /></td>
 						</tr>
 						</tr>
 					</tbody>
 					</tbody>
 					<tfoot>
 					<tfoot>
@@ -113,7 +113,7 @@
 					</tfoot>
 					</tfoot>
 				</table>
 				</table>
 			</div>
 			</div>
-		</s:form>
+		</la:form>
 		<%-- Confirm Form: BEGIN --%>
 		<%-- Confirm Form: BEGIN --%>
 
 
 	</tiles:put>
 	</tiles:put>

+ 3 - 3
src/main/webapp/WEB-INF/view/admin/dict/userDict/download.jsp

@@ -44,9 +44,9 @@
 			</div>
 			</div>
 
 
 		<%-- Edit Form: BEGIN --%>
 		<%-- Edit Form: BEGIN --%>
-		<s:form>
+		<la:form>
 			<div>
 			<div>
-				<html:hidden property="dictId" />
+				<la:hidden property="dictId" />
 				<table class="bordered-table zebra-striped" style="width: 500px;">
 				<table class="bordered-table zebra-striped" style="width: 500px;">
 					<tbody>
 					<tbody>
 						<tr>
 						<tr>
@@ -59,7 +59,7 @@
 					</tbody>
 					</tbody>
 				</table>
 				</table>
 			</div>
 			</div>
-		</s:form>
+		</la:form>
 		<%-- Edit Form: BEGIN --%>
 		<%-- Edit Form: BEGIN --%>
 
 
 	</tiles:put>
 	</tiles:put>

+ 9 - 9
src/main/webapp/WEB-INF/view/admin/dict/userDict/edit.jsp

@@ -57,34 +57,34 @@
 			</div>
 			</div>
 
 
 		<%-- Edit Form: BEGIN --%>
 		<%-- Edit Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
+		<la:form>
+			<la:hidden property="crudMode" />
 			<div>
 			<div>
-				<html:hidden property="dictId" />
+				<la:hidden property="dictId" />
 				<c:if test="${crudMode==2}">
 				<c:if test="${crudMode==2}">
-					<html:hidden property="id" />
+					<la:hidden property="id" />
 				</c:if>
 				</c:if>
 				<table class="bordered-table zebra-striped" style="width: 500px;">
 				<table class="bordered-table zebra-striped" style="width: 500px;">
 					<tbody>
 					<tbody>
 						<tr>
 						<tr>
 							<th style="width: 150px;"><la:message
 							<th style="width: 150px;"><la:message
 									key="labels.dict_userdict_token" /></th>
 									key="labels.dict_userdict_token" /></th>
-							<td><html:text property="token" style="width:98%;" /></td>
+							<td><la:text property="token" style="width:98%;" /></td>
 						</tr>
 						</tr>
 						<tr>
 						<tr>
 							<th><la:message
 							<th><la:message
 									key="labels.dict_userdict_segmentation" /></th>
 									key="labels.dict_userdict_segmentation" /></th>
-							<td><html:text property="segmentation" style="width:98%;" /></td>
+							<td><la:text property="segmentation" style="width:98%;" /></td>
 						</tr>
 						</tr>
 						<tr>
 						<tr>
 							<th><la:message
 							<th><la:message
 									key="labels.dict_userdict_reading" /></th>
 									key="labels.dict_userdict_reading" /></th>
-							<td><html:text property="reading" style="width:98%;" /></td>
+							<td><la:text property="reading" style="width:98%;" /></td>
 						</tr>
 						</tr>
 						<tr>
 						<tr>
 							<th><la:message
 							<th><la:message
 									key="labels.dict_userdict_pos" /></th>
 									key="labels.dict_userdict_pos" /></th>
-							<td><html:text property="pos" style="width:98%;" /></td>
+							<td><la:text property="pos" style="width:98%;" /></td>
 						</tr>
 						</tr>
 					</tbody>
 					</tbody>
 					<tfoot>
 					<tfoot>
@@ -104,7 +104,7 @@
 					</tfoot>
 					</tfoot>
 				</table>
 				</table>
 			</div>
 			</div>
-		</s:form>
+		</la:form>
 		<%-- Edit Form: BEGIN --%>
 		<%-- Edit Form: BEGIN --%>
 
 
 	</tiles:put>
 	</tiles:put>

+ 3 - 3
src/main/webapp/WEB-INF/view/admin/dict/userDict/upload.jsp

@@ -44,9 +44,9 @@
 			</div>
 			</div>
 
 
 		<%-- Edit Form: BEGIN --%>
 		<%-- Edit Form: BEGIN --%>
-		<s:form action="upload" enctype="multipart/form-data">
+		<la:form action="upload" enctype="multipart/form-data">
 			<div>
 			<div>
-				<html:hidden property="dictId" />
+				<la:hidden property="dictId" />
 				<table class="bordered-table zebra-striped" style="width: 500px;">
 				<table class="bordered-table zebra-striped" style="width: 500px;">
 					<tbody>
 					<tbody>
 						<tr>
 						<tr>
@@ -69,7 +69,7 @@
 					</tfoot>
 					</tfoot>
 				</table>
 				</table>
 			</div>
 			</div>
-		</s:form>
+		</la:form>
 		<%-- Edit Form: BEGIN --%>
 		<%-- Edit Form: BEGIN --%>
 
 
 	</tiles:put>
 	</tiles:put>

+ 14 - 14
src/main/webapp/WEB-INF/view/admin/document/index.jsp

@@ -31,11 +31,11 @@
 				<table class="bordered-table zebra-striped">
 				<table class="bordered-table zebra-striped">
 					<tbody>
 					<tbody>
 						<c:forEach var="groupAction" items="${groupActionItems}">
 						<c:forEach var="groupAction" items="${groupActionItems}">
-							<s:form>
+							<la:form>
 							<tr>
 							<tr>
 								<th style="width:200px;">${f:h(groupAction.groupName)}</th>
 								<th style="width:200px;">${f:h(groupAction.groupName)}</th>
 								<td>
 								<td>
-									<html:hidden property="groupName"
+									<la:hidden property="groupName"
 										value="${f:u(groupAction.groupName)}" />
 										value="${f:u(groupAction.groupName)}" />
 									<html:submit
 									<html:submit
 										property="commit" disabled="${solrProcessRunning}"
 										property="commit" disabled="${solrProcessRunning}"
@@ -48,7 +48,7 @@
 									</html:submit>
 									</html:submit>
 								</td>
 								</td>
 							</tr>
 							</tr>
-							</s:form>
+							</la:form>
 						</c:forEach>
 						</c:forEach>
 					</tbody>
 					</tbody>
 				</table>
 				</table>
@@ -61,7 +61,7 @@
 				<table class="bordered-table zebra-striped">
 				<table class="bordered-table zebra-striped">
 					<tbody>
 					<tbody>
 						<c:forEach var="groupAction" items="${groupActionItems}">
 						<c:forEach var="groupAction" items="${groupActionItems}">
-							<s:form>
+							<la:form>
 							<tr>
 							<tr>
 								<th style="width:200px;" rowspan="2">${f:h(groupAction.groupName)}</th>
 								<th style="width:200px;" rowspan="2">${f:h(groupAction.groupName)}</th>
 								<td>
 								<td>
@@ -81,15 +81,15 @@
 										disabled="${solrProcessRunning}">
 										disabled="${solrProcessRunning}">
 										<la:message key="labels.es_action_delete" />
 										<la:message key="labels.es_action_delete" />
 									</html:submit>
 									</html:submit>
-									<html:hidden property="groupName"
+									<la:hidden property="groupName"
 										value="${f:u(groupAction.groupName)}" />
 										value="${f:u(groupAction.groupName)}" />
 								</td>
 								</td>
 							</tr>
 							</tr>
 							<tr>
 							<tr>
 								<td style="vertical-align: middle;">
 								<td style="vertical-align: middle;">
 									<la:message key="labels.es_action_url_delete" />
 									<la:message key="labels.es_action_url_delete" />
-									<html:text property="deleteUrl" style="width:150px;"
-										disabled="${solrProcessRunning}"></html:text> <html:submit
+									<la:text property="deleteUrl" style="width:150px;"
+										disabled="${solrProcessRunning}"></la:text> <html:submit
 										property="confirmByUrl" styleClass="btn"
 										property="confirmByUrl" styleClass="btn"
 										disabled="${solrProcessRunning}">
 										disabled="${solrProcessRunning}">
 										<la:message key="labels.es_action_confirm_list" />
 										<la:message key="labels.es_action_confirm_list" />
@@ -100,7 +100,7 @@
 									</html:submit>
 									</html:submit>
 								</td>
 								</td>
 							</tr>
 							</tr>
-							</s:form>
+							</la:form>
 						</c:forEach>
 						</c:forEach>
 					</tbody>
 					</tbody>
 				</table>
 				</table>
@@ -164,28 +164,28 @@
 							<td style="vertical-align: middle;"><la:message key="labels.suggest_type_content" /></td>
 							<td style="vertical-align: middle;"><la:message key="labels.suggest_type_content" /></td>
 							<td align="center" style="vertical-align: middle;">${suggestDocumentNums.content}</td>
 							<td align="center" style="vertical-align: middle;">${suggestDocumentNums.content}</td>
 							<td align="center">
 							<td align="center">
-								<s:form style="margin-bottom:0;">
-									<html:hidden property="deleteSuggestType"
+								<la:form style="margin-bottom:0;">
+									<la:hidden property="deleteSuggestType"
 										value="content" />
 										value="content" />
 									<html:submit styleClass="btn" property="deleteSuggest"
 									<html:submit styleClass="btn" property="deleteSuggest"
 										disabled="${solrProcessRunning}">
 										disabled="${solrProcessRunning}">
 										<la:message key="labels.es_action_delete" />
 										<la:message key="labels.es_action_delete" />
 									</html:submit>
 									</html:submit>
-								</s:form>
+								</la:form>
 							</td>
 							</td>
 						</tr>
 						</tr>
 						<tr>
 						<tr>
 							<td style="vertical-align: middle;"><la:message key="labels.suggest_type_searchlog" /></td>
 							<td style="vertical-align: middle;"><la:message key="labels.suggest_type_searchlog" /></td>
 							<td align="center" style="vertical-align: middle;">${suggestDocumentNums.searchLog}</td>
 							<td align="center" style="vertical-align: middle;">${suggestDocumentNums.searchLog}</td>
 							<td align="center">
 							<td align="center">
-								<s:form style="margin-bottom:0;">
-									<html:hidden property="deleteSuggestType"
+								<la:form style="margin-bottom:0;">
+									<la:hidden property="deleteSuggestType"
 										value="searchLog" />
 										value="searchLog" />
 									<html:submit styleClass="btn" property="deleteSuggest"
 									<html:submit styleClass="btn" property="deleteSuggest"
 										disabled="${solrProcessRunning}">
 										disabled="${solrProcessRunning}">
 										<la:message key="labels.es_action_delete" />
 										<la:message key="labels.es_action_delete" />
 									</html:submit>
 									</html:submit>
-								</s:form>
+								</la:form>
 							</td>
 							</td>
 						</tr>
 						</tr>
 					</tbody>
 					</tbody>

+ 14 - 14
src/main/webapp/WEB-INF/view/admin/failureUrl/confirm.jsp

@@ -42,14 +42,14 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -94,7 +94,7 @@
 												<tr>
 												<tr>
 													<th style="width: 150px;"><la:message
 													<th style="width: 150px;"><la:message
 															key="labels.failure_url_id" /></th>
 															key="labels.failure_url_id" /></th>
-													<td style="width: 350px;">${f:h(id)}<html:hidden
+													<td style="width: 350px;">${f:h(id)}<la:hidden
 															property="id" /></td>
 															property="id" /></td>
 												</tr>
 												</tr>
 											</c:if>
 											</c:if>
@@ -102,31 +102,31 @@
 												<th><la:message key="labels.failure_url_url" /></th>
 												<th><la:message key="labels.failure_url_url" /></th>
 												<td><div style="width: 350px; overflow-x: auto;">
 												<td><div style="width: 350px; overflow-x: auto;">
 														${f:h(url)}
 														${f:h(url)}
-														<html:hidden property="url" />
+														<la:hidden property="url" />
 													</div></td>
 													</div></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.failure_url_thread_name" /></th>
 												<th><la:message key="labels.failure_url_thread_name" /></th>
-												<td>${f:h(threadName)}<html:hidden property="threadName" /></td>
+												<td>${f:h(threadName)}<la:hidden property="threadName" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.failure_url_error_name" /></th>
 												<th><la:message key="labels.failure_url_error_name" /></th>
-												<td>${f:h(errorName)}<html:hidden property="errorName" /></td>
+												<td>${f:h(errorName)}<la:hidden property="errorName" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.failure_url_error_log" /></th>
 												<th><la:message key="labels.failure_url_error_log" /></th>
 												<td><div style="width: 350px; overflow-x: auto;">
 												<td><div style="width: 350px; overflow-x: auto;">
 														${f:br(f:nbsp(f:h(errorLog)))}
 														${f:br(f:nbsp(f:h(errorLog)))}
-														<html:hidden property="errorLog" />
+														<la:hidden property="errorLog" />
 													</div></td>
 													</div></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.failure_url_error_count" /></th>
 												<th><la:message key="labels.failure_url_error_count" /></th>
-												<td>${f:h(errorCount)}<html:hidden property="errorCount" /></td>
+												<td>${f:h(errorCount)}<la:hidden property="errorCount" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.failure_url_last_access_time" /></th>
 												<th><la:message key="labels.failure_url_last_access_time" /></th>
-												<td>${f:h(lastAccessTime)}<html:hidden
+												<td>${f:h(lastAccessTime)}<la:hidden
 														property="lastAccessTime" /></td>
 														property="lastAccessTime" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
@@ -155,7 +155,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 7 - 7
src/main/webapp/WEB-INF/view/admin/failureUrl/index.jsp

@@ -37,23 +37,23 @@
 								<h3 class="box-title">
 								<h3 class="box-title">
 									<la:message key="labels.failure_url_configuration" />
 									<la:message key="labels.failure_url_configuration" />
 								</h3>
 								</h3>
-								<s:form>
+								<la:form>
 									<table class="bordered-table zebra-striped">
 									<table class="bordered-table zebra-striped">
 										<tbody>
 										<tbody>
 											<tr>
 											<tr>
 												<th><la:message key="labels.failure_url_search_url" /></th>
 												<th><la:message key="labels.failure_url_search_url" /></th>
-												<td><html:text property="searchParams.url"></html:text></td>
+												<td><la:text property="searchParams.url"></la:text></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message
 												<th><la:message
 														key="labels.failure_url_search_error_count" /></th>
 														key="labels.failure_url_search_error_count" /></th>
-												<td><html:text property="searchParams.errorCountMin"
-														size="2" styleClass="mini"></html:text> - <html:text
+												<td><la:text property="searchParams.errorCountMin"
+														size="2" styleClass="mini"></la:text> - <la:text
 														property="searchParams.errorCountMax" size="2"
 														property="searchParams.errorCountMax" size="2"
-														styleClass="mini"></html:text></td>
+														styleClass="mini"></la:text></td>
 											<tr>
 											<tr>
 												<th><la:message key="labels.failure_url_search_error_name" /></th>
 												<th><la:message key="labels.failure_url_search_error_name" /></th>
-												<td><html:text property="searchParams.errorName"></html:text></td>
+												<td><la:text property="searchParams.errorName"></la:text></td>
 											</tr>
 											</tr>
 										</tbody>
 										</tbody>
 									</table>
 									</table>
@@ -65,7 +65,7 @@
 												value="<la:message key="labels.crud_button_reset"/>" />
 												value="<la:message key="labels.crud_button_reset"/>" />
 										</div>
 										</div>
 									</div>
 									</div>
-								</s:form>
+								</la:form>
 							</div>
 							</div>
 							<%-- Box Body --%>
 							<%-- Box Body --%>
 							<div class="box-body">
 							<div class="box-body">

+ 14 - 14
src/main/webapp/WEB-INF/view/admin/fileAuthentication/confirm.jsp

@@ -42,14 +42,14 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -92,36 +92,36 @@
 										<tbody>
 										<tbody>
 											<tr>
 											<tr>
 												<th class="col-xs-2"><la:message key="labels.file_authentication_hostname" /></th>
 												<th class="col-xs-2"><la:message key="labels.file_authentication_hostname" /></th>
-												<td>${f:h(hostname)}<html:hidden property="hostname" /></td>
+												<td>${f:h(hostname)}<la:hidden property="hostname" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.file_authentication_port" /></th>
 												<th><la:message key="labels.file_authentication_port" /></th>
-												<td>${f:h(port)}<html:hidden property="port" /></td>
+												<td>${f:h(port)}<la:hidden property="port" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 													<th><la:message key="labels.file_authentication_scheme" /></th>
 													<th><la:message key="labels.file_authentication_scheme" /></th>
 													<td><c:forEach var="item" items="${protocolSchemeItems}">
 													<td><c:forEach var="item" items="${protocolSchemeItems}">
 															<c:if test="${protocolScheme==item.value}">${f:h(item.label)}</c:if>
 															<c:if test="${protocolScheme==item.value}">${f:h(item.label)}</c:if>
-													</c:forEach> <html:hidden property="protocolScheme" /></td>
+													</c:forEach> <la:hidden property="protocolScheme" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 													<th><la:message key="labels.file_authentication_username" /></th>
 													<th><la:message key="labels.file_authentication_username" /></th>
-													<td>${f:h(username)}<html:hidden property="username" /></td>
+													<td>${f:h(username)}<la:hidden property="username" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 													<th><la:message key="labels.file_authentication_password" /></th>
 													<th><la:message key="labels.file_authentication_password" /></th>
 													<td><c:if test="${password!=''}">******</c:if>
 													<td><c:if test="${password!=''}">******</c:if>
-															<html:hidden property="password" /></td>
+															<la:hidden property="password" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 													<th><la:message key="labels.file_authentication_parameters" /></th>
 													<th><la:message key="labels.file_authentication_parameters" /></th>
-													<td>${f:br(f:h(parameters))}<html:hidden property="parameters" /></td>
+													<td>${f:br(f:h(parameters))}<la:hidden property="parameters" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 													<th><la:message key="labels.file_authentication_file_crawling_config" /></th>
 													<th><la:message key="labels.file_authentication_file_crawling_config" /></th>
 													<td><c:forEach var="item" items="${fileConfigItems}">
 													<td><c:forEach var="item" items="${fileConfigItems}">
 															<c:if test="${fileConfigId==item.value}">${f:h(item.label)}</c:if>
 															<c:if test="${fileConfigId==item.value}">${f:h(item.label)}</c:if>
-													</c:forEach> <html:hidden property="fileConfigId" /></td>
+													</c:forEach> <la:hidden property="fileConfigId" /></td>
 											</tr>
 											</tr>
 										</tbody>
 										</tbody>
 									</table>
 									</table>
@@ -160,7 +160,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 11 - 11
src/main/webapp/WEB-INF/view/admin/fileAuthentication/edit.jsp

@@ -42,14 +42,14 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
 					<c:if test="${crudMode==2}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
 
 
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
@@ -85,11 +85,11 @@
 									<%-- Form Fields --%>
 									<%-- Form Fields --%>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="hostname"><la:message key="labels.file_authentication_hostname" /></label>
 										<label for="hostname"><la:message key="labels.file_authentication_hostname" /></label>
-										<html:text property="hostname" styleClass="form-control" />
+										<la:text property="hostname" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="port"><la:message key="labels.file_authentication_port" /></label>
 										<label for="port"><la:message key="labels.file_authentication_port" /></label>
-										<html:text property="port" styleClass="form-control" />
+										<la:text property="port" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="protocolScheme"><la:message key="labels.file_authentication_scheme" /></label>
 										<label for="protocolScheme"><la:message key="labels.file_authentication_scheme" /></label>
@@ -101,7 +101,7 @@
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="username"><la:message key="labels.file_authentication_username" /></label>
 										<label for="username"><la:message key="labels.file_authentication_username" /></label>
-										<html:text property="username" styleClass="form-control" />
+										<la:text property="username" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="password"><la:message key="labels.file_authentication_password" /></label>
 										<label for="password"><la:message key="labels.file_authentication_password" /></label>
@@ -109,7 +109,7 @@
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="parameters"><la:message key="labels.file_authentication_parameters" /></label>
 										<label for="parameters"><la:message key="labels.file_authentication_parameters" /></label>
-										<html:textarea property="parameters" styleClass="form-control" rows="5" />
+										<la:textarea property="parameters" styleClass="form-control" rows="5" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="fileConfigId"><la:message key="labels.file_authentication_file_crawling_config" /></label>
 										<label for="fileConfigId"><la:message key="labels.file_authentication_file_crawling_config" /></label>
@@ -139,7 +139,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 21 - 21
src/main/webapp/WEB-INF/view/admin/fileConfig/confirm.jsp

@@ -42,15 +42,15 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
-					<html:hidden property="sortOrder"/>
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
+					<la:hidden property="sortOrder"/>
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -97,51 +97,51 @@
 											</tr></c:if>
 											</tr></c:if>
 											<tr>
 											<tr>
 												<th class="col-xs-3"><la:message key="labels.name" /></th>
 												<th class="col-xs-3"><la:message key="labels.name" /></th>
-												<td>${f:h(name)}<html:hidden property="name" /></td>
+												<td>${f:h(name)}<la:hidden property="name" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.paths" /></th>
 												<th><la:message key="labels.paths" /></th>
-												<td>${f:br(f:h(paths))}<html:hidden property="paths" /></td>
+												<td>${f:br(f:h(paths))}<la:hidden property="paths" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.included_paths" /></th>
 												<th><la:message key="labels.included_paths" /></th>
-												<td>${f:br(f:h(includedPaths))}<html:hidden property="includedPaths" /></td>
+												<td>${f:br(f:h(includedPaths))}<la:hidden property="includedPaths" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.excluded_paths" /></th>
 												<th><la:message key="labels.excluded_paths" /></th>
-												<td>${f:br(f:h(excludedPaths))}<html:hidden property="excludedPaths" /></td>
+												<td>${f:br(f:h(excludedPaths))}<la:hidden property="excludedPaths" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.included_doc_paths" /></th>
 												<th><la:message key="labels.included_doc_paths" /></th>
-												<td>${f:br(f:h(includedDocPaths))}<html:hidden property="includedDocPaths" /></td>
+												<td>${f:br(f:h(includedDocPaths))}<la:hidden property="includedDocPaths" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.excluded_doc_paths" /></th>
 												<th><la:message key="labels.excluded_doc_paths" /></th>
-												<td>${f:br(f:h(excludedDocPaths))}<html:hidden property="excludedDocPaths" /></td>
+												<td>${f:br(f:h(excludedDocPaths))}<la:hidden property="excludedDocPaths" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.config_parameter" /></th>
 												<th><la:message key="labels.config_parameter" /></th>
-												<td>${f:br(f:h(configParameter))}<html:hidden property="configParameter" /></td>
+												<td>${f:br(f:h(configParameter))}<la:hidden property="configParameter" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.depth" /></th>
 												<th><la:message key="labels.depth" /></th>
-												<td>${f:h(depth)}<html:hidden property="depth" /></td>
+												<td>${f:h(depth)}<la:hidden property="depth" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.max_access_count" /></th>
 												<th><la:message key="labels.max_access_count" /></th>
-												<td>${f:h(maxAccessCount)}<html:hidden property="maxAccessCount" /></td>
+												<td>${f:h(maxAccessCount)}<la:hidden property="maxAccessCount" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.number_of_thread" /></th>
 												<th><la:message key="labels.number_of_thread" /></th>
-												<td>${f:h(numOfThread)}<html:hidden property="numOfThread" /></td>
+												<td>${f:h(numOfThread)}<la:hidden property="numOfThread" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.interval_time" /></th>
 												<th><la:message key="labels.interval_time" /></th>
-												<td>${f:h(intervalTime)}<html:hidden property="intervalTime" /><la:message key="labels.millisec"/></td>
+												<td>${f:h(intervalTime)}<la:hidden property="intervalTime" /><la:message key="labels.millisec"/></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.boost" /></th>
 												<th><la:message key="labels.boost" /></th>
-												<td>${f:h(boost)}<html:hidden property="boost" /></td>
+												<td>${f:h(boost)}<la:hidden property="boost" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.role_type" /></th>
 												<th><la:message key="labels.role_type" /></th>
@@ -179,7 +179,7 @@
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.available"/></th>
 												<th><la:message key="labels.available"/></th>
-												<td><html:hidden property="available"/>
+												<td><la:hidden property="available"/>
 													<c:if test="${available=='true'}"><la:message key="labels.enabled"/></c:if>
 													<c:if test="${available=='true'}"><la:message key="labels.enabled"/></c:if>
 													<c:if test="${available=='false'}"><la:message key="labels.disabled"/></c:if>
 													<c:if test="${available=='false'}"><la:message key="labels.disabled"/></c:if>
 												</td>
 												</td>
@@ -221,7 +221,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 20 - 20
src/main/webapp/WEB-INF/view/admin/fileConfig/edit.jsp

@@ -42,15 +42,15 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
 					<c:if test="${crudMode==2}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
-					<html:hidden property="sortOrder"/>
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
+					<la:hidden property="sortOrder"/>
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -87,54 +87,54 @@
 									<%-- Form Fields --%>
 									<%-- Form Fields --%>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="name"><la:message key="labels.name" /></label>
 										<label for="name"><la:message key="labels.name" /></label>
-										<html:text property="name" styleClass="form-control" />
+										<la:text property="name" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="paths"><la:message key="labels.paths" /></label>
 										<label for="paths"><la:message key="labels.paths" /></label>
-										<html:textarea property="paths" styleClass="form-control" rows="5" />
+										<la:textarea property="paths" styleClass="form-control" rows="5" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="includedPaths"><la:message key="labels.included_paths" /></label>
 										<label for="includedPaths"><la:message key="labels.included_paths" /></label>
-										<html:textarea property="includedPaths" styleClass="form-control" rows="5" />
+										<la:textarea property="includedPaths" styleClass="form-control" rows="5" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="excludedPaths"><la:message key="labels.excluded_paths" /></label>
 										<label for="excludedPaths"><la:message key="labels.excluded_paths" /></label>
-										<html:textarea property="excludedPaths" styleClass="form-control" rows="5" />
+										<la:textarea property="excludedPaths" styleClass="form-control" rows="5" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="includedDocPaths"><la:message key="labels.included_doc_paths" /></label>
 										<label for="includedDocPaths"><la:message key="labels.included_doc_paths" /></label>
-										<html:textarea property="includedDocPaths" styleClass="form-control" rows="5" />
+										<la:textarea property="includedDocPaths" styleClass="form-control" rows="5" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="excludedDocPaths"><la:message key="labels.excluded_doc_paths" /></label>
 										<label for="excludedDocPaths"><la:message key="labels.excluded_doc_paths" /></label>
-										<html:textarea property="excludedDocPaths" styleClass="form-control" rows="5" />
+										<la:textarea property="excludedDocPaths" styleClass="form-control" rows="5" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="configParameter"><la:message key="labels.config_parameter" /></label>
 										<label for="configParameter"><la:message key="labels.config_parameter" /></label>
-										<html:text property="configParameter" styleClass="form-control" />
+										<la:text property="configParameter" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="depth"><la:message key="labels.depth" /></label>
 										<label for="depth"><la:message key="labels.depth" /></label>
-										<html:text property="depth" styleClass="form-control" />
+										<la:text property="depth" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="maxAccessCount"><la:message key="labels.max_access_count" /></label>
 										<label for="maxAccessCount"><la:message key="labels.max_access_count" /></label>
-										<html:text property="maxAccessCount" styleClass="form-control" />
+										<la:text property="maxAccessCount" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="numOfThread"><la:message key="labels.number_of_thread" /></label>
 										<label for="numOfThread"><la:message key="labels.number_of_thread" /></label>
-										<html:text property="numOfThread" styleClass="form-control" />
+										<la:text property="numOfThread" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="intervalTime"><la:message key="labels.interval_time" /></label>
 										<label for="intervalTime"><la:message key="labels.interval_time" /></label>
 										<div class="form-inline">
 										<div class="form-inline">
-											<html:text property="intervalTime" styleClass="form-control" />
+											<la:text property="intervalTime" styleClass="form-control" />
 											<la:message key="labels.millisec" />
 											<la:message key="labels.millisec" />
 										</div>
 										</div>
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="boost"><la:message key="labels.boost" /></label>
 										<label for="boost"><la:message key="labels.boost" /></label>
-										<html:text property="boost" styleClass="form-control" />
+										<la:text property="boost" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="roleTypeIds"><la:message key="labels.role_type" /></label>
 										<label for="roleTypeIds"><la:message key="labels.role_type" /></label>
@@ -183,7 +183,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 15 - 15
src/main/webapp/WEB-INF/view/admin/jobLog/confirm.jsp

@@ -42,14 +42,14 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -92,35 +92,35 @@
 										<tbody>
 										<tbody>
 											<tr>
 											<tr>
 												<th class="col-xs-2"><la:message key="labels.joblog_jobName" /></th>
 												<th class="col-xs-2"><la:message key="labels.joblog_jobName" /></th>
-												<td>${f:h(jobName)}<html:hidden property="jobName" /></td>
+												<td>${f:h(jobName)}<la:hidden property="jobName" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.joblog_jobStatus" /></th>
 												<th><la:message key="labels.joblog_jobStatus" /></th>
-												<td>${f:h(jobStatus)}<html:hidden property="jobStatus" /></td>
+												<td>${f:h(jobStatus)}<la:hidden property="jobStatus" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.joblog_target" /></th>
 												<th><la:message key="labels.joblog_target" /></th>
-												<td>${f:h(target)}<html:hidden property="target" /></td>
+												<td>${f:h(target)}<la:hidden property="target" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.joblog_startTime" /></th>
 												<th><la:message key="labels.joblog_startTime" /></th>
-												<td>${f:h(startTime)}<html:hidden property="startTime" /></td>
+												<td>${f:h(startTime)}<la:hidden property="startTime" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.joblog_endTime" /></th>
 												<th><la:message key="labels.joblog_endTime" /></th>
-												<td>${f:h(endTime)}<html:hidden property="endTime" /></td>
+												<td>${f:h(endTime)}<la:hidden property="endTime" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.joblog_scriptType" /></th>
 												<th><la:message key="labels.joblog_scriptType" /></th>
-												<td>${f:h(scriptType)}<html:hidden property="scriptType" /></td>
+												<td>${f:h(scriptType)}<la:hidden property="scriptType" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.joblog_scriptData" /></th>
 												<th><la:message key="labels.joblog_scriptData" /></th>
-												<td>${f:br(f:h(scriptData))}<html:hidden property="scriptData" /></td>
+												<td>${f:br(f:h(scriptData))}<la:hidden property="scriptData" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.joblog_scriptResult" /></th>
 												<th><la:message key="labels.joblog_scriptResult" /></th>
-												<td>${f:br(f:h(scriptResult))}<html:hidden property="scriptResult" /></td>
+												<td>${f:br(f:h(scriptResult))}<la:hidden property="scriptResult" /></td>
 											</tr>
 											</tr>
 										</tbody>
 										</tbody>
 									</table>
 									</table>
@@ -140,7 +140,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 11 - 11
src/main/webapp/WEB-INF/view/admin/keyMatch/confirm.jsp → src/main/webapp/WEB-INF/view/admin/keymatch/confirm.jsp

@@ -42,14 +42,14 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -92,19 +92,19 @@
 										<tbody>
 										<tbody>
 											<tr>
 											<tr>
 												<th class="col-xs-2"><la:message key="labels.key_match_term" /></th>
 												<th class="col-xs-2"><la:message key="labels.key_match_term" /></th>
-												<td>${f:h(term)}<html:hidden property="term" /></td>
+												<td>${f:h(term)}<la:hidden property="term" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.key_match_query" /></th>
 												<th><la:message key="labels.key_match_query" /></th>
-												<td>${f:h(query)}<html:hidden property="query" /></td>
+												<td>${f:h(query)}<la:hidden property="query" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.key_match_size" /></th>
 												<th><la:message key="labels.key_match_size" /></th>
-												<td>${f:h(maxSize)}<html:hidden property="maxSize" /></td>
+												<td>${f:h(maxSize)}<la:hidden property="maxSize" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.key_match_boost" /></th>
 												<th><la:message key="labels.key_match_boost" /></th>
-												<td>${f:h(boost)}<html:hidden property="boost" /></td>
+												<td>${f:h(boost)}<la:hidden property="boost" /></td>
 											</tr>
 											</tr>
 										</tbody>
 										</tbody>
 									</table>
 									</table>
@@ -143,7 +143,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 11 - 11
src/main/webapp/WEB-INF/view/admin/keyMatch/edit.jsp → src/main/webapp/WEB-INF/view/admin/keymatch/edit.jsp

@@ -42,14 +42,14 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
 					<c:if test="${crudMode==2}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -84,19 +84,19 @@
 									<%-- Form Fields --%>
 									<%-- Form Fields --%>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="term"><la:message key="labels.key_match_term" /></label>
 										<label for="term"><la:message key="labels.key_match_term" /></label>
-										<html:text property="term" styleClass="form-control" />
+										<la:text property="term" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="query"><la:message key="labels.key_match_query" /></label>
 										<label for="query"><la:message key="labels.key_match_query" /></label>
-										<html:text property="query" styleClass="form-control" />
+										<la:text property="query" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="maxSize"><la:message key="labels.key_match_size" /></label>
 										<label for="maxSize"><la:message key="labels.key_match_size" /></label>
-										<html:text property="maxSize" styleClass="form-control" />
+										<la:text property="maxSize" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="boost"><la:message key="labels.key_match_boost" /></label>
 										<label for="boost"><la:message key="labels.key_match_boost" /></label>
-										<html:text property="boost" styleClass="form-control" />
+										<la:text property="boost" styleClass="form-control" />
 									</div>
 									</div>
 
 
 								</div>
 								</div>
@@ -118,7 +118,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 0 - 0
src/main/webapp/WEB-INF/view/admin/keyMatch/error.jsp → src/main/webapp/WEB-INF/view/admin/keymatch/error.jsp


+ 0 - 0
src/main/webapp/WEB-INF/view/admin/keyMatch/index.jsp → src/main/webapp/WEB-INF/view/admin/keymatch/index.jsp


+ 12 - 12
src/main/webapp/WEB-INF/view/admin/labelType/confirm.jsp

@@ -42,14 +42,14 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -92,19 +92,19 @@
 										<tbody>
 										<tbody>
 											<tr>
 											<tr>
 												<th class="col-xs-3"><la:message key="labels.labeltype_name" /></th>
 												<th class="col-xs-3"><la:message key="labels.labeltype_name" /></th>
-												<td>${f:h(name)}<html:hidden property="name" /></td>
+												<td>${f:h(name)}<la:hidden property="name" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.labeltype_value" /></th>
 												<th><la:message key="labels.labeltype_value" /></th>
-												<td>${f:h(value)}<html:hidden property="value" /></td>
+												<td>${f:h(value)}<la:hidden property="value" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.labeltype_included_paths" /></th>
 												<th><la:message key="labels.labeltype_included_paths" /></th>
-												<td>${f:br(f:h(includedPaths))}<html:hidden property="includedPaths" /></td>
+												<td>${f:br(f:h(includedPaths))}<la:hidden property="includedPaths" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.labeltype_excluded_paths" /></th>
 												<th><la:message key="labels.labeltype_excluded_paths" /></th>
-												<td>${f:br(f:h(excludedPaths))}<html:hidden property="excludedPaths" /></td>
+												<td>${f:br(f:h(excludedPaths))}<la:hidden property="excludedPaths" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.role_type" /></th>
 												<th><la:message key="labels.role_type" /></th>
@@ -125,7 +125,7 @@
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.sortOrder" /></th>
 												<th><la:message key="labels.sortOrder" /></th>
-												<td>${f:h(sortOrder)}<html:hidden property="sortOrder" /></td>
+												<td>${f:h(sortOrder)}<la:hidden property="sortOrder" /></td>
 											</tr>
 											</tr>
 										</tbody>
 										</tbody>
 									</table>
 									</table>
@@ -164,7 +164,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 12 - 12
src/main/webapp/WEB-INF/view/admin/labelType/edit.jsp

@@ -42,14 +42,14 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
 					<c:if test="${crudMode==2}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -84,19 +84,19 @@
 									<%-- Form Fields --%>
 									<%-- Form Fields --%>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="name"><la:message key="labels.labeltype_name" /></label>
 										<label for="name"><la:message key="labels.labeltype_name" /></label>
-										<html:text property="name" styleClass="form-control" />
+										<la:text property="name" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="paths"><la:message key="labels.labeltype_value" /></label>
 										<label for="paths"><la:message key="labels.labeltype_value" /></label>
-										<html:text property="value" styleClass="form-control" />
+										<la:text property="value" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="includedPaths"><la:message key="labels.labeltype_included_paths" /></label>
 										<label for="includedPaths"><la:message key="labels.labeltype_included_paths" /></label>
-										<html:textarea property="includedPaths" styleClass="form-control" rows="5" />
+										<la:textarea property="includedPaths" styleClass="form-control" rows="5" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="excludedPaths"><la:message key="labels.labeltype_excluded_paths" /></label>
 										<label for="excludedPaths"><la:message key="labels.labeltype_excluded_paths" /></label>
-										<html:textarea property="excludedPaths" styleClass="form-control" rows="5" />
+										<la:textarea property="excludedPaths" styleClass="form-control" rows="5" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="roleTypeIds"><la:message key="labels.role_type" /></label>
 										<label for="roleTypeIds"><la:message key="labels.role_type" /></label>
@@ -108,7 +108,7 @@
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="sortOrder"><la:message key="labels.sortOrder" /></label>
 										<label for="sortOrder"><la:message key="labels.sortOrder" /></label>
-										<html:text property="sortOrder" styleClass="form-control" />
+										<la:text property="sortOrder" styleClass="form-control" />
 									</div>
 									</div>
 								</div>
 								</div>
 
 
@@ -130,7 +130,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 10 - 10
src/main/webapp/WEB-INF/view/admin/overlappingHost/confirm.jsp

@@ -42,15 +42,15 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
-					<html:hidden property="sortOrder" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
+					<la:hidden property="sortOrder" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -93,11 +93,11 @@
 										<tbody>
 										<tbody>
 											<tr>
 											<tr>
 												<th class="col-xs-3"><la:message key="labels.regular_name" /></th>
 												<th class="col-xs-3"><la:message key="labels.regular_name" /></th>
-												<td>${f:h(regularName)}<html:hidden property="regularName" /></td>
+												<td>${f:h(regularName)}<la:hidden property="regularName" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.overlapping_name" /></th>
 												<th><la:message key="labels.overlapping_name" /></th>
-												<td>${f:h(overlappingName)}<html:hidden property="overlappingName" /></td>
+												<td>${f:h(overlappingName)}<la:hidden property="overlappingName" /></td>
 											</tr>
 											</tr>
 										</tbody>
 										</tbody>
 									</table>
 									</table>
@@ -136,7 +136,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 10 - 10
src/main/webapp/WEB-INF/view/admin/overlappingHost/edit.jsp

@@ -42,15 +42,15 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
 					<c:if test="${crudMode==2}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
-					<html:hidden property="sortOrder" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
+					<la:hidden property="sortOrder" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -85,11 +85,11 @@
 									<%-- Form Fields --%>
 									<%-- Form Fields --%>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="regularName"><la:message key="labels.regular_name" /></label>
 										<label for="regularName"><la:message key="labels.regular_name" /></label>
-										<html:text property="regularName" styleClass="form-control" />
+										<la:text property="regularName" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="overlappingName"><la:message key="labels.overlapping_name" /></label>
 										<label for="overlappingName"><la:message key="labels.overlapping_name" /></label>
-										<html:text property="overlappingName" styleClass="form-control" />
+										<la:text property="overlappingName" styleClass="form-control" />
 									</div>
 									</div>
 
 
 								<%-- Box Footer --%>
 								<%-- Box Footer --%>
@@ -110,7 +110,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 11 - 11
src/main/webapp/WEB-INF/view/admin/pathMapping/confirm.jsp

@@ -42,14 +42,14 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
  					</c:if>
  					</c:if>
- 					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
+ 					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -91,11 +91,11 @@
 										<tbody>
 										<tbody>
 											<tr>
 											<tr>
 												<th class="col-xs-2"><la:message key="labels.regex" /></th>
 												<th class="col-xs-2"><la:message key="labels.regex" /></th>
-												<td>${f:h(regex)}<html:hidden property="regex" /></td>
+												<td>${f:h(regex)}<la:hidden property="regex" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.replacement" /></th>
 												<th><la:message key="labels.replacement" /></th>
-												<td>${f:h(replacement)}<html:hidden property="replacement" /></td>
+												<td>${f:h(replacement)}<la:hidden property="replacement" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.processType" /></th>
 												<th><la:message key="labels.processType" /></th>
@@ -109,12 +109,12 @@
 													<c:if test="${processType=='B'}">
 													<c:if test="${processType=='B'}">
 														<la:message key="labels.path_mapping_pt_both" />
 														<la:message key="labels.path_mapping_pt_both" />
 													</c:if> 
 													</c:if> 
-													<html:hidden property="processType" />
+													<la:hidden property="processType" />
 												</td>
 												</td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.sortOrder" /></th>
 												<th><la:message key="labels.sortOrder" /></th>
-												<td>${f:h(sortOrder)}<html:hidden property="sortOrder" /></td>
+												<td>${f:h(sortOrder)}<la:hidden property="sortOrder" /></td>
 											</tr>
 											</tr>
 										</tbody>
 										</tbody>
 									</table>
 									</table>
@@ -152,7 +152,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 10 - 10
src/main/webapp/WEB-INF/view/admin/pathMapping/edit.jsp

@@ -41,14 +41,14 @@
 
 
 			<section class="content">
 			<section class="content">
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
 					<c:if test="${crudMode==2}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -82,11 +82,11 @@
 									<%-- Form Fields --%>
 									<%-- Form Fields --%>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="regex"><la:message key="labels.regex" /></label>
 										<label for="regex"><la:message key="labels.regex" /></label>
-										<html:text property="regex" styleClass="form-control" />
+										<la:text property="regex" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="replacement"><la:message key="labels.replacement" /></label>
 										<label for="replacement"><la:message key="labels.replacement" /></label>
-										<html:text property="replacement" styleClass="form-control" />
+										<la:text property="replacement" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
  										<label for="processType"><la:message key="labels.processType" /></label>
  										<label for="processType"><la:message key="labels.processType" /></label>
@@ -104,7 +104,7 @@
  									</div>
  									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="sortOrder"><la:message key="labels.sortOrder" /></label>
 										<label for="sortOrder"><la:message key="labels.sortOrder" /></label>
-										<html:text property="sortOrder" styleClass="form-control" />
+										<la:text property="sortOrder" styleClass="form-control" />
 									</div>
 									</div>
 								</div>
 								</div>
 								<%-- Box Footer --%>
 								<%-- Box Footer --%>
@@ -125,7 +125,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 10 - 10
src/main/webapp/WEB-INF/view/admin/requestHeader/confirm.jsp

@@ -42,14 +42,14 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -92,17 +92,17 @@
 										<tbody>
 										<tbody>
 											<tr>
 											<tr>
 												<th class="col-xs-2"><la:message key="labels.request_header_name" /></th>
 												<th class="col-xs-2"><la:message key="labels.request_header_name" /></th>
-												<td>${f:h(name)}<html:hidden property="name" /></td>
+												<td>${f:h(name)}<la:hidden property="name" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.request_header_value" /></th>
 												<th><la:message key="labels.request_header_value" /></th>
-												<td>${f:h(value)}<html:hidden property="value" /></td>
+												<td>${f:h(value)}<la:hidden property="value" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 													<th><la:message key="labels.request_header_web_crawling_config" /></th>
 													<th><la:message key="labels.request_header_web_crawling_config" /></th>
 													<td><c:forEach var="item" items="${webConfigItems}">
 													<td><c:forEach var="item" items="${webConfigItems}">
 															<c:if test="${webConfigId==item.value}">${f:h(item.label)}</c:if>
 															<c:if test="${webConfigId==item.value}">${f:h(item.label)}</c:if>
-													</c:forEach> <html:hidden property="webConfigId" /></td>
+													</c:forEach> <la:hidden property="webConfigId" /></td>
 											</tr>
 											</tr>
 										</tbody>
 										</tbody>
 									</table>
 									</table>
@@ -141,7 +141,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 9 - 9
src/main/webapp/WEB-INF/view/admin/requestHeader/edit.jsp

@@ -42,14 +42,14 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
 					<c:if test="${crudMode==2}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
 
 
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
@@ -85,11 +85,11 @@
 									<%-- Form Fields --%>
 									<%-- Form Fields --%>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="name"><la:message key="labels.request_header_name" /></label>
 										<label for="name"><la:message key="labels.request_header_name" /></label>
-										<html:text property="name" styleClass="form-control" />
+										<la:text property="name" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="value"><la:message key="labels.request_header_value" /></label>
 										<label for="value"><la:message key="labels.request_header_value" /></label>
-										<html:text property="value" styleClass="form-control" />
+										<la:text property="value" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="webConfigId"><la:message key="labels.request_header_web_crawling_config" /></label>
 										<label for="webConfigId"><la:message key="labels.request_header_web_crawling_config" /></label>
@@ -119,7 +119,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 10 - 10
src/main/webapp/WEB-INF/view/admin/roleType/confirm.jsp

@@ -42,15 +42,15 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
-					<html:hidden property="sortOrder" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
+					<la:hidden property="sortOrder" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -93,11 +93,11 @@
 										<tbody>
 										<tbody>
 											<tr>
 											<tr>
 												<th class="col-xs-3"><la:message key="labels.roletype_name" /></th>
 												<th class="col-xs-3"><la:message key="labels.roletype_name" /></th>
-												<td>${f:h(name)}<html:hidden property="name" /></td>
+												<td>${f:h(name)}<la:hidden property="name" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.roletype_value" /></th>
 												<th><la:message key="labels.roletype_value" /></th>
-												<td>${f:h(value)}<html:hidden property="value" /></td>
+												<td>${f:h(value)}<la:hidden property="value" /></td>
 											</tr>
 											</tr>
 										</tbody>
 										</tbody>
 									</table>
 									</table>
@@ -136,7 +136,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 10 - 10
src/main/webapp/WEB-INF/view/admin/roleType/edit.jsp

@@ -42,15 +42,15 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
 					<c:if test="${crudMode==2}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
-					<html:hidden property="sortOrder" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
+					<la:hidden property="sortOrder" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -85,11 +85,11 @@
 									<%-- Form Fields --%>
 									<%-- Form Fields --%>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="name"><la:message key="labels.roletype_name" /></label>
 										<label for="name"><la:message key="labels.roletype_name" /></label>
-										<html:text property="name" styleClass="form-control" />
+										<la:text property="name" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="value"><la:message key="labels.roletype_value" /></label>
 										<label for="value"><la:message key="labels.roletype_value" /></label>
-										<html:text property="value" styleClass="form-control" />
+										<la:text property="value" styleClass="form-control" />
 									</div>
 									</div>
 
 
 								<%-- Box Footer --%>
 								<%-- Box Footer --%>
@@ -110,7 +110,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 16 - 16
src/main/webapp/WEB-INF/view/admin/scheduledJob/confirm.jsp

@@ -42,14 +42,14 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -92,30 +92,30 @@
 										<tbody>
 										<tbody>
 											<tr>
 											<tr>
 												<th class="col-xs-2"><la:message key="labels.scheduledjob_name" /></th>
 												<th class="col-xs-2"><la:message key="labels.scheduledjob_name" /></th>
-												<td>${f:h(name)}<html:hidden property="name" /></td>
+												<td>${f:h(name)}<la:hidden property="name" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.scheduledjob_target" /></th>
 												<th><la:message key="labels.scheduledjob_target" /></th>
-												<td>${f:h(target)}<html:hidden property="target" /></td>
+												<td>${f:h(target)}<la:hidden property="target" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.scheduledjob_cronExpression" /></th>
 												<th><la:message key="labels.scheduledjob_cronExpression" /></th>
-												<td>${f:h(cronExpression)}<html:hidden property="cronExpression" /></td>
+												<td>${f:h(cronExpression)}<la:hidden property="cronExpression" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.scheduledjob_scriptType" /></th>
 												<th><la:message key="labels.scheduledjob_scriptType" /></th>
-												<td>${f:h(scriptType)}<html:hidden property="scriptType" /></td>
+												<td>${f:h(scriptType)}<la:hidden property="scriptType" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.scheduledjob_scriptData" /></th>
 												<th><la:message key="labels.scheduledjob_scriptData" /></th>
-												<td>${f:br(f:h(scriptData))}<html:hidden property="scriptData" /></td>
+												<td>${f:br(f:h(scriptData))}<la:hidden property="scriptData" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.scheduledjob_jobLogging" /></th>
 												<th><la:message key="labels.scheduledjob_jobLogging" /></th>
 												<td>
 												<td>
 													<c:if test="${jobLogging=='on'}"><la:message key="labels.enabled"/></c:if>
 													<c:if test="${jobLogging=='on'}"><la:message key="labels.enabled"/></c:if>
 													<c:if test="${jobLogging!='on'}"><la:message key="labels.disabled"/></c:if>
 													<c:if test="${jobLogging!='on'}"><la:message key="labels.disabled"/></c:if>
-													<html:hidden property="jobLogging" />
+													<la:hidden property="jobLogging" />
 												</td>
 												</td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
@@ -123,7 +123,7 @@
 												<td>
 												<td>
 													<c:if test="${crawler=='on'}"><la:message key="labels.enabled"/></c:if>
 													<c:if test="${crawler=='on'}"><la:message key="labels.enabled"/></c:if>
 													<c:if test="${crawler!='on'}"><la:message key="labels.disabled"/></c:if>
 													<c:if test="${crawler!='on'}"><la:message key="labels.disabled"/></c:if>
-													<html:hidden property="crawler" />
+													<la:hidden property="crawler" />
 												</td>
 												</td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
@@ -131,12 +131,12 @@
 												<td>
 												<td>
 													<c:if test="${available=='on'}"><la:message key="labels.enabled"/></c:if>
 													<c:if test="${available=='on'}"><la:message key="labels.enabled"/></c:if>
 													<c:if test="${available!='on'}"><la:message key="labels.disabled"/></c:if>
 													<c:if test="${available!='on'}"><la:message key="labels.disabled"/></c:if>
-													<html:hidden property="available" />
+													<la:hidden property="available" />
 												</td>
 												</td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.sortOrder" /></th>
 												<th><la:message key="labels.sortOrder" /></th>
-												<td>${f:h(sortOrder)}<html:hidden property="sortOrder" /></td>
+												<td>${f:h(sortOrder)}<la:hidden property="sortOrder" /></td>
 											</tr>
 											</tr>
 										</tbody>
 										</tbody>
 									</table>
 									</table>
@@ -175,7 +175,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 13 - 13
src/main/webapp/WEB-INF/view/admin/scheduledJob/edit.jsp

@@ -42,14 +42,14 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
 					<c:if test="${crudMode==2}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -84,23 +84,23 @@
 									<%-- Form Fields --%>
 									<%-- Form Fields --%>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="name"><la:message key="labels.scheduledjob_name" /></label>
 										<label for="name"><la:message key="labels.scheduledjob_name" /></label>
-										<html:text property="name" styleClass="form-control" />
+										<la:text property="name" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 											<label for="target"><la:message key="labels.scheduledjob_target" /></label>
 											<label for="target"><la:message key="labels.scheduledjob_target" /></label>
-											<html:text property="target" styleClass="form-control" />
+											<la:text property="target" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 											<label for="cronExpression"><la:message key="labels.scheduledjob_cronExpression" /></label>
 											<label for="cronExpression"><la:message key="labels.scheduledjob_cronExpression" /></label>
-											<html:text property="cronExpression" styleClass="form-control" />
+											<la:text property="cronExpression" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 											<label for="scriptType"><la:message key="labels.scheduledjob_scriptType" /></label>
 											<label for="scriptType"><la:message key="labels.scheduledjob_scriptType" /></label>
-											<html:text property="scriptType" styleClass="form-control" />
+											<la:text property="scriptType" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 											<label for="scriptData"><la:message key="labels.scheduledjob_scriptData" /></label>
 											<label for="scriptData"><la:message key="labels.scheduledjob_scriptData" /></label>
-											<html:textarea property="scriptData" styleClass="form-control" rows="5" />
+											<la:textarea property="scriptData" styleClass="form-control" rows="5" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 											<label for="jobLogging"><la:message key="labels.scheduledjob_jobLogging"/></label>
 											<label for="jobLogging"><la:message key="labels.scheduledjob_jobLogging"/></label>
@@ -125,7 +125,7 @@
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="sortOrder"><la:message key="labels.sortOrder" /></label>
 										<label for="sortOrder"><la:message key="labels.sortOrder" /></label>
-										<html:text property="sortOrder" styleClass="form-control" />
+										<la:text property="sortOrder" styleClass="form-control" />
 									</div>
 									</div>
 									</div>
 									</div>
 
 
@@ -148,7 +148,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 6 - 6
src/main/webapp/WEB-INF/view/admin/searchList/confirmDelete.jsp

@@ -30,7 +30,7 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
+				<la:form>
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -40,15 +40,15 @@
 								</div>
 								</div>
 								<%-- Box Body --%>
 								<%-- Box Body --%>
 								<div class="box-body">
 								<div class="box-body">
-									<s:form>
-										<html:hidden property="query" />
+									<la:form>
+										<la:hidden property="query" />
 										<div>
 										<div>
 											<table class="bordered-table zebra-striped">
 											<table class="bordered-table zebra-striped">
 												<tbody>
 												<tbody>
 													<tr>
 													<tr>
 														<th style="width: 100px;"><la:message
 														<th style="width: 100px;"><la:message
 																key="labels.search_list_url" /></th>
 																key="labels.search_list_url" /></th>
-														<td style="width: 400px;">${f:h(url)}<html:hidden
+														<td style="width: 400px;">${f:h(url)}<la:hidden
 																property="docId" /></td>
 																property="docId" /></td>
 													</tr>
 													</tr>
 												</tbody>
 												</tbody>
@@ -62,7 +62,7 @@
 												</tfoot>
 												</tfoot>
 											</table>
 											</table>
 										</div>
 										</div>
-									</s:form>
+									</la:form>
 								</div>
 								</div>
 								<%-- Box Footer --%>
 								<%-- Box Footer --%>
 								<div class="box-footer">
 								<div class="box-footer">
@@ -71,7 +71,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 3 - 3
src/main/webapp/WEB-INF/view/admin/searchList/index.jsp

@@ -37,12 +37,12 @@
 								<h3 class="box-title">
 								<h3 class="box-title">
 									<la:message key="labels.search_list_configuration" />
 									<la:message key="labels.search_list_configuration" />
 								</h3>
 								</h3>
-								<s:form action="search" method="get">
+								<la:form action="search" method="get">
 									<div class="input">
 									<div class="input">
-										<html:text styleClass="query" property="query" title="Search" size="50" maxlength="1000" />
+										<la:text styleClass="query" property="query" title="Search" size="50" maxlength="1000" />
 										<input class="btn" type="submit" value="<la:message key="labels.search"/>" name="search" />
 										<input class="btn" type="submit" value="<la:message key="labels.search"/>" name="search" />
 									</div>
 									</div>
-								</s:form>
+								</la:form>
 							</div>
 							</div>
 							<%-- Box Body --%>
 							<%-- Box Body --%>
 							<div class="box-body">
 							<div class="box-body">

+ 8 - 8
src/main/webapp/WEB-INF/view/admin/suggestBadWord/confirm.jsp

@@ -42,14 +42,14 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -92,7 +92,7 @@
 										<tbody>
 										<tbody>
 											<tr>
 											<tr>
 												<th class="col-xs-2"><la:message key="labels.suggest_bad_word_suggest_word" /></th>
 												<th class="col-xs-2"><la:message key="labels.suggest_bad_word_suggest_word" /></th>
-												<td>${f:h(suggestWord)}<html:hidden property="suggestWord" /></td>
+												<td>${f:h(suggestWord)}<la:hidden property="suggestWord" /></td>
 											</tr>
 											</tr>
 										</tbody>
 										</tbody>
 									</table>
 									</table>
@@ -131,7 +131,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 2 - 2
src/main/webapp/WEB-INF/view/admin/suggestBadWord/download.jsp

@@ -55,7 +55,7 @@
 							</div>
 							</div>
 							<%-- Box Body --%>
 							<%-- Box Body --%>
 							<div class="box-body">
 							<div class="box-body">
-								<s:form>
+								<la:form>
 									<table class="table table-bordered">
 									<table class="table table-bordered">
 										<tbody>
 										<tbody>
 											<tr>
 											<tr>
@@ -64,7 +64,7 @@
 											</tr>
 											</tr>
 										</tbody>
 										</tbody>
 									</table>
 									</table>
-								</s:form>
+								</la:form>
 
 
 							</div>
 							</div>
 							<%-- Box Footer --%>
 							<%-- Box Footer --%>

+ 8 - 8
src/main/webapp/WEB-INF/view/admin/suggestBadWord/edit.jsp

@@ -42,14 +42,14 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
 					<c:if test="${crudMode==2}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -93,7 +93,7 @@
 									<%-- Form Fields --%>
 									<%-- Form Fields --%>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="word"><la:message key="labels.suggest_bad_word_suggest_word" /></label>
 										<label for="word"><la:message key="labels.suggest_bad_word_suggest_word" /></label>
-										<html:text property="suggestWord" styleClass="form-control" />
+										<la:text property="suggestWord" styleClass="form-control" />
 									</div>
 									</div>
 								</div>
 								</div>
 								<%-- Box Footer --%>
 								<%-- Box Footer --%>
@@ -114,7 +114,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 2 - 2
src/main/webapp/WEB-INF/view/admin/suggestBadWord/upload.jsp

@@ -55,7 +55,7 @@
 							</div>
 							</div>
 							<%-- Box Body --%>
 							<%-- Box Body --%>
 							<div class="box-body">
 							<div class="box-body">
-								<s:form action="upload" enctype="multipart/form-data">
+								<la:form action="upload" enctype="multipart/form-data">
 									<table class="table table-bordered">
 									<table class="table table-bordered">
 										<tbody>
 										<tbody>
 											<tr>
 											<tr>
@@ -71,7 +71,7 @@
 											</tr>
 											</tr>
 										</tfoot>
 										</tfoot>
 									</table>
 									</table>
-								</s:form>
+								</la:form>
 
 
 							</div>
 							</div>
 							<%-- Box Footer --%>
 							<%-- Box Footer --%>

+ 12 - 12
src/main/webapp/WEB-INF/view/admin/suggestElevateWord/confirm.jsp

@@ -42,14 +42,14 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -92,23 +92,23 @@
 										<tbody>
 										<tbody>
 											<tr>
 											<tr>
 												<th class="col-xs-2"><la:message key="labels.suggest_elevate_word_suggest_word" /></th>
 												<th class="col-xs-2"><la:message key="labels.suggest_elevate_word_suggest_word" /></th>
-												<td>${f:h(suggestWord)}<html:hidden property="suggestWord" /></td>
+												<td>${f:h(suggestWord)}<la:hidden property="suggestWord" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.suggest_elevate_word_reading" /></th>
 												<th><la:message key="labels.suggest_elevate_word_reading" /></th>
-												<td>${f:h(reading)}<html:hidden property="reading" /></td>
+												<td>${f:h(reading)}<la:hidden property="reading" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.suggest_elevate_word_target_role" /></th>
 												<th><la:message key="labels.suggest_elevate_word_target_role" /></th>
-												<td>${f:h(targetRole)}<html:hidden property="targetRole" /></td>
+												<td>${f:h(targetRole)}<la:hidden property="targetRole" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.suggest_elevate_word_target_label" /></th>
 												<th><la:message key="labels.suggest_elevate_word_target_label" /></th>
-												<td>${f:h(targetLabel)}<html:hidden property="targetLabel" /></td>
+												<td>${f:h(targetLabel)}<la:hidden property="targetLabel" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.suggest_elevate_word_boost" /></th>
 												<th><la:message key="labels.suggest_elevate_word_boost" /></th>
-												<td>${f:h(boost)}<html:hidden property="boost" /></td>
+												<td>${f:h(boost)}<la:hidden property="boost" /></td>
 											</tr>
 											</tr>
 										</tbody>
 										</tbody>
 									</table>
 									</table>
@@ -147,7 +147,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 2 - 2
src/main/webapp/WEB-INF/view/admin/suggestElevateWord/download.jsp

@@ -55,7 +55,7 @@
 							</div>
 							</div>
 							<%-- Box Body --%>
 							<%-- Box Body --%>
 							<div class="box-body">
 							<div class="box-body">
-								<s:form>
+								<la:form>
 									<table class="table table-bordered">
 									<table class="table table-bordered">
 										<tbody>
 										<tbody>
 											<tr>
 											<tr>
@@ -64,7 +64,7 @@
 											</tr>
 											</tr>
 										</tbody>
 										</tbody>
 									</table>
 									</table>
-								</s:form>
+								</la:form>
 
 
 							</div>
 							</div>
 							<%-- Box Footer --%>
 							<%-- Box Footer --%>

+ 12 - 12
src/main/webapp/WEB-INF/view/admin/suggestElevateWord/edit.jsp

@@ -42,14 +42,14 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
 					<c:if test="${crudMode==2}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -93,23 +93,23 @@
 									<%-- Form Fields --%>
 									<%-- Form Fields --%>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="word"><la:message key="labels.suggest_elevate_word_suggest_word" /></label>
 										<label for="word"><la:message key="labels.suggest_elevate_word_suggest_word" /></label>
-										<html:text property="suggestWord" styleClass="form-control" />
+										<la:text property="suggestWord" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="reading"><la:message key="labels.suggest_elevate_word_reading" /></label>
 										<label for="reading"><la:message key="labels.suggest_elevate_word_reading" /></label>
-										<html:text property="reading" styleClass="form-control" />
+										<la:text property="reading" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="targetRole"><la:message key="labels.suggest_elevate_word_target_role" /></label>
 										<label for="targetRole"><la:message key="labels.suggest_elevate_word_target_role" /></label>
-										<html:text property="targetRole" styleClass="form-control" />
+										<la:text property="targetRole" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="targetLabel"><la:message key="labels.suggest_elevate_word_target_label" /></label>
 										<label for="targetLabel"><la:message key="labels.suggest_elevate_word_target_label" /></label>
-										<html:text property="targetLabel" styleClass="form-control" />
+										<la:text property="targetLabel" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="boost"><la:message key="labels.suggest_elevate_word_boost" /></label>
 										<label for="boost"><la:message key="labels.suggest_elevate_word_boost" /></label>
-										<html:text property="boost" styleClass="form-control" />
+										<la:text property="boost" styleClass="form-control" />
 									</div>
 									</div>
 								</div>
 								</div>
 								<%-- Box Footer --%>
 								<%-- Box Footer --%>
@@ -130,7 +130,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 2 - 2
src/main/webapp/WEB-INF/view/admin/suggestElevateWord/upload.jsp

@@ -55,7 +55,7 @@
 							</div>
 							</div>
 							<%-- Box Body --%>
 							<%-- Box Body --%>
 							<div class="box-body">
 							<div class="box-body">
-								<s:form action="upload" enctype="multipart/form-data">
+								<la:form action="upload" enctype="multipart/form-data">
 									<table class="table table-bordered">
 									<table class="table table-bordered">
 										<tbody>
 										<tbody>
 											<tr>
 											<tr>
@@ -71,7 +71,7 @@
 											</tr>
 											</tr>
 										</tfoot>
 										</tfoot>
 									</table>
 									</table>
-								</s:form>
+								</la:form>
 
 
 							</div>
 							</div>
 							<%-- Box Footer --%>
 							<%-- Box Footer --%>

+ 2 - 2
src/main/webapp/WEB-INF/view/admin/system/index.jsp

@@ -56,7 +56,7 @@
 																</div>
 																</div>
 														</div>
 														</div>
 
 
-														<s:form>
+														<la:form>
 																<div class="box">
 																<div class="box">
 																		<%-- Box Header --%>
 																		<%-- Box Header --%>
 																		<div class="box-header">
 																		<div class="box-header">
@@ -107,7 +107,7 @@
 																				</table>
 																				</table>
 																		</div>
 																		</div>
 																</div>
 																</div>
-														</s:form>
+														</la:form>
 												</div>
 												</div>
 										</div>
 										</div>
 								</section>
 								</section>

+ 15 - 15
src/main/webapp/WEB-INF/view/admin/webAuthentication/confirm.jsp

@@ -42,14 +42,14 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -92,40 +92,40 @@
 										<tbody>
 										<tbody>
 											<tr>
 											<tr>
 												<th class="col-xs-2"><la:message key="labels.web_authentication_hostname" /></th>
 												<th class="col-xs-2"><la:message key="labels.web_authentication_hostname" /></th>
-												<td>${f:h(hostname)}<html:hidden property="hostname" /></td>
+												<td>${f:h(hostname)}<la:hidden property="hostname" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.web_authentication_port" /></th>
 												<th><la:message key="labels.web_authentication_port" /></th>
-												<td>${f:h(port)}<html:hidden property="port" /></td>
+												<td>${f:h(port)}<la:hidden property="port" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.web_authentication_realm" /></th>
 												<th><la:message key="labels.web_authentication_realm" /></th>
-												<td>${f:h(authRealm)}<html:hidden property="authRealm" /></td>
+												<td>${f:h(authRealm)}<la:hidden property="authRealm" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 													<th><la:message key="labels.web_authentication_scheme" /></th>
 													<th><la:message key="labels.web_authentication_scheme" /></th>
 													<td><c:forEach var="item" items="${protocolSchemeItems}">
 													<td><c:forEach var="item" items="${protocolSchemeItems}">
 															<c:if test="${protocolScheme==item.value}">${f:h(item.label)}</c:if>
 															<c:if test="${protocolScheme==item.value}">${f:h(item.label)}</c:if>
-													</c:forEach> <html:hidden property="protocolScheme" /></td>
+													</c:forEach> <la:hidden property="protocolScheme" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 													<th><la:message key="labels.web_authentication_username" /></th>
 													<th><la:message key="labels.web_authentication_username" /></th>
-													<td>${f:h(username)}<html:hidden property="username" /></td>
+													<td>${f:h(username)}<la:hidden property="username" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 													<th><la:message key="labels.web_authentication_password" /></th>
 													<th><la:message key="labels.web_authentication_password" /></th>
 													<td><c:if test="${password!=''}">******</c:if>
 													<td><c:if test="${password!=''}">******</c:if>
-															<html:hidden property="password" /></td>
+															<la:hidden property="password" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 													<th><la:message key="labels.web_authentication_parameters" /></th>
 													<th><la:message key="labels.web_authentication_parameters" /></th>
-													<td>${f:br(f:h(parameters))}<html:hidden property="parameters" /></td>
+													<td>${f:br(f:h(parameters))}<la:hidden property="parameters" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 													<th><la:message key="labels.web_authentication_web_crawling_config" /></th>
 													<th><la:message key="labels.web_authentication_web_crawling_config" /></th>
 													<td><c:forEach var="item" items="${webConfigItems}">
 													<td><c:forEach var="item" items="${webConfigItems}">
 															<c:if test="${webConfigId==item.value}">${f:h(item.label)}</c:if>
 															<c:if test="${webConfigId==item.value}">${f:h(item.label)}</c:if>
-													</c:forEach> <html:hidden property="webConfigId" /></td>
+													</c:forEach> <la:hidden property="webConfigId" /></td>
 											</tr>
 											</tr>
 										</tbody>
 										</tbody>
 									</table>
 									</table>
@@ -164,7 +164,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 12 - 12
src/main/webapp/WEB-INF/view/admin/webAuthentication/edit.jsp

@@ -42,14 +42,14 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
 					<c:if test="${crudMode==2}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
 
 
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
@@ -85,15 +85,15 @@
 									<%-- Form Fields --%>
 									<%-- Form Fields --%>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="hostname"><la:message key="labels.web_authentication_hostname" /></label>
 										<label for="hostname"><la:message key="labels.web_authentication_hostname" /></label>
-										<html:text property="hostname" styleClass="form-control" />
+										<la:text property="hostname" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="port"><la:message key="labels.web_authentication_port" /></label>
 										<label for="port"><la:message key="labels.web_authentication_port" /></label>
-										<html:text property="port" styleClass="form-control" />
+										<la:text property="port" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="authRealm"><la:message key="labels.web_authentication_realm" /></label>
 										<label for="authRealm"><la:message key="labels.web_authentication_realm" /></label>
-										<html:text property="authRealm" styleClass="form-control" />
+										<la:text property="authRealm" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="protocolScheme"><la:message key="labels.web_authentication_scheme" /></label>
 										<label for="protocolScheme"><la:message key="labels.web_authentication_scheme" /></label>
@@ -105,7 +105,7 @@
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="username"><la:message key="labels.web_authentication_username" /></label>
 										<label for="username"><la:message key="labels.web_authentication_username" /></label>
-										<html:text property="username" styleClass="form-control" />
+										<la:text property="username" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="password"><la:message key="labels.web_authentication_password" /></label>
 										<label for="password"><la:message key="labels.web_authentication_password" /></label>
@@ -113,7 +113,7 @@
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="parameters"><la:message key="labels.web_authentication_parameters" /></label>
 										<label for="parameters"><la:message key="labels.web_authentication_parameters" /></label>
-										<html:textarea property="parameters" styleClass="form-control" rows="5" />
+										<la:textarea property="parameters" styleClass="form-control" rows="5" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="webConfigId"><la:message key="labels.web_authentication_web_crawling_config" /></label>
 										<label for="webConfigId"><la:message key="labels.web_authentication_web_crawling_config" /></label>
@@ -143,7 +143,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 22 - 22
src/main/webapp/WEB-INF/view/admin/webConfig/confirm.jsp

@@ -42,15 +42,15 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
-					<html:hidden property="sortOrder"/>
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
+					<la:hidden property="sortOrder"/>
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -97,55 +97,55 @@
 											</tr></c:if>
 											</tr></c:if>
 											<tr>
 											<tr>
 												<th class="col-xs-3"><la:message key="labels.name" /></th>
 												<th class="col-xs-3"><la:message key="labels.name" /></th>
-												<td>${f:h(name)}<html:hidden property="name" /></td>
+												<td>${f:h(name)}<la:hidden property="name" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.urls" /></th>
 												<th><la:message key="labels.urls" /></th>
-												<td>${f:br(f:h(urls))}<html:hidden property="urls" /></td>
+												<td>${f:br(f:h(urls))}<la:hidden property="urls" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.included_urls" /></th>
 												<th><la:message key="labels.included_urls" /></th>
-												<td>${f:br(f:h(includedUrls))}<html:hidden property="includedUrls" /></td>
+												<td>${f:br(f:h(includedUrls))}<la:hidden property="includedUrls" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.excluded_urls" /></th>
 												<th><la:message key="labels.excluded_urls" /></th>
-												<td>${f:br(f:h(excludedUrls))}<html:hidden property="excludedUrls" /></td>
+												<td>${f:br(f:h(excludedUrls))}<la:hidden property="excludedUrls" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.included_doc_urls" /></th>
 												<th><la:message key="labels.included_doc_urls" /></th>
-												<td>${f:br(f:h(includedDocUrls))}<html:hidden property="includedDocUrls" /></td>
+												<td>${f:br(f:h(includedDocUrls))}<la:hidden property="includedDocUrls" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.excluded_doc_urls" /></th>
 												<th><la:message key="labels.excluded_doc_urls" /></th>
-												<td>${f:br(f:h(excludedDocUrls))}<html:hidden property="excludedDocUrls" /></td>
+												<td>${f:br(f:h(excludedDocUrls))}<la:hidden property="excludedDocUrls" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.config_parameter" /></th>
 												<th><la:message key="labels.config_parameter" /></th>
-												<td>${f:br(f:h(configParameter))}<html:hidden property="configParameter" /></td>
+												<td>${f:br(f:h(configParameter))}<la:hidden property="configParameter" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.depth" /></th>
 												<th><la:message key="labels.depth" /></th>
-												<td>${f:h(depth)}<html:hidden property="depth" /></td>
+												<td>${f:h(depth)}<la:hidden property="depth" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.max_access_count" /></th>
 												<th><la:message key="labels.max_access_count" /></th>
-												<td>${f:h(maxAccessCount)}<html:hidden property="maxAccessCount" /></td>
+												<td>${f:h(maxAccessCount)}<la:hidden property="maxAccessCount" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.user_agent" /></th>
 												<th><la:message key="labels.user_agent" /></th>
-												<td>${f:h(userAgent)}<html:hidden property="userAgent" /></td>
+												<td>${f:h(userAgent)}<la:hidden property="userAgent" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.number_of_thread" /></th>
 												<th><la:message key="labels.number_of_thread" /></th>
-												<td>${f:h(numOfThread)}<html:hidden property="numOfThread" /></td>
+												<td>${f:h(numOfThread)}<la:hidden property="numOfThread" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.interval_time" /></th>
 												<th><la:message key="labels.interval_time" /></th>
-												<td>${f:h(intervalTime)}<html:hidden property="intervalTime" /><la:message key="labels.millisec"/></td>
+												<td>${f:h(intervalTime)}<la:hidden property="intervalTime" /><la:message key="labels.millisec"/></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 												<th><la:message key="labels.boost" /></th>
 												<th><la:message key="labels.boost" /></th>
-												<td>${f:h(boost)}<html:hidden property="boost" /></td>
+												<td>${f:h(boost)}<la:hidden property="boost" /></td>
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 													<th><la:message key="labels.role_type" /></th>
 													<th><la:message key="labels.role_type" /></th>
@@ -183,7 +183,7 @@
 											</tr>
 											</tr>
 											<tr>
 											<tr>
 													<th><la:message key="labels.available"/></th>
 													<th><la:message key="labels.available"/></th>
-													<td><html:hidden property="available"/>
+													<td><la:hidden property="available"/>
 															<c:if test="${available=='true'}"><la:message key="labels.enabled"/></c:if>
 															<c:if test="${available=='true'}"><la:message key="labels.enabled"/></c:if>
 															<c:if test="${available=='false'}"><la:message key="labels.disabled"/></c:if>
 															<c:if test="${available=='false'}"><la:message key="labels.disabled"/></c:if>
 													</td>
 													</td>
@@ -225,7 +225,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 21 - 21
src/main/webapp/WEB-INF/view/admin/webConfig/edit.jsp

@@ -42,15 +42,15 @@
 			<section class="content">
 			<section class="content">
 
 
 				<%-- Form --%>
 				<%-- Form --%>
-				<s:form>
-					<html:hidden property="crudMode" />
+				<la:form>
+					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
 					<c:if test="${crudMode==2}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
 					</c:if>
 					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
-					<html:hidden property="sortOrder"/>
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
+					<la:hidden property="sortOrder"/>
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -85,58 +85,58 @@
 									<%-- Form Fields --%>
 									<%-- Form Fields --%>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="name"><la:message key="labels.name" /></label>
 										<label for="name"><la:message key="labels.name" /></label>
-										<html:text property="name" styleClass="form-control" />
+										<la:text property="name" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="urls"><la:message key="labels.urls" /></label>
 										<label for="urls"><la:message key="labels.urls" /></label>
-										<html:textarea property="urls" styleClass="form-control" rows="5" />
+										<la:textarea property="urls" styleClass="form-control" rows="5" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="includedUrls"><la:message key="labels.included_urls" /></label>
 										<label for="includedUrls"><la:message key="labels.included_urls" /></label>
-										<html:textarea property="includedUrls" styleClass="form-control" rows="5" />
+										<la:textarea property="includedUrls" styleClass="form-control" rows="5" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="excludedUrls"><la:message key="labels.excluded_urls" /></label>
 										<label for="excludedUrls"><la:message key="labels.excluded_urls" /></label>
-										<html:textarea property="excludedUrls" styleClass="form-control" rows="5" />
+										<la:textarea property="excludedUrls" styleClass="form-control" rows="5" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="includedDocUrls"><la:message key="labels.included_doc_urls" /></label>
 										<label for="includedDocUrls"><la:message key="labels.included_doc_urls" /></label>
-										<html:textarea property="includedDocUrls" styleClass="form-control" rows="5" />
+										<la:textarea property="includedDocUrls" styleClass="form-control" rows="5" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="excludedDocUrls"><la:message key="labels.excluded_doc_urls" /></label>
 										<label for="excludedDocUrls"><la:message key="labels.excluded_doc_urls" /></label>
-										<html:textarea property="excludedDocUrls" styleClass="form-control" rows="5" />
+										<la:textarea property="excludedDocUrls" styleClass="form-control" rows="5" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="configParameter"><la:message key="labels.config_parameter" /></label>
 										<label for="configParameter"><la:message key="labels.config_parameter" /></label>
-										<html:text property="configParameter" styleClass="form-control" />
+										<la:text property="configParameter" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="depth"><la:message key="labels.depth" /></label>
 										<label for="depth"><la:message key="labels.depth" /></label>
-										<html:text property="depth" styleClass="form-control" />
+										<la:text property="depth" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="maxAccessCount"><la:message key="labels.max_access_count" /></label>
 										<label for="maxAccessCount"><la:message key="labels.max_access_count" /></label>
-										<html:text property="maxAccessCount" styleClass="form-control" />
+										<la:text property="maxAccessCount" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="userAgent"><la:message key="labels.user_agent" /></label>
 										<label for="userAgent"><la:message key="labels.user_agent" /></label>
-										<html:text property="userAgent" styleClass="form-control" />
+										<la:text property="userAgent" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="numOfThread"><la:message key="labels.number_of_thread" /></label>
 										<label for="numOfThread"><la:message key="labels.number_of_thread" /></label>
-										<html:text property="numOfThread" styleClass="form-control" />
+										<la:text property="numOfThread" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="intervalTime"><la:message key="labels.interval_time" /></label>
 										<label for="intervalTime"><la:message key="labels.interval_time" /></label>
 										<div class="form-inline">
 										<div class="form-inline">
-											<html:text property="intervalTime" styleClass="form-control" />
+											<la:text property="intervalTime" styleClass="form-control" />
 											<la:message key="labels.millisec" />
 											<la:message key="labels.millisec" />
 										</div>
 										</div>
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="boost"><la:message key="labels.boost" /></label>
 										<label for="boost"><la:message key="labels.boost" /></label>
-										<html:text property="boost" styleClass="form-control" />
+										<la:text property="boost" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="roleTypeIds"><la:message key="labels.role_type" /></label>
 										<label for="roleTypeIds"><la:message key="labels.role_type" /></label>
@@ -185,7 +185,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 6 - 6
src/main/webapp/WEB-INF/view/admin/wizard/crawlingConfig.jsp

@@ -28,7 +28,7 @@
 
 
 			<section class="content">
 			<section class="content">
 
 
-				<s:form>
+				<la:form>
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -52,19 +52,19 @@
 
 
 									<div class="form-group">
 									<div class="form-group">
 										<label for="crawlingConfigName"><la:message key="labels.wizard_crawling_config_name" /></label>
 										<label for="crawlingConfigName"><la:message key="labels.wizard_crawling_config_name" /></label>
-										<html:text property="crawlingConfigName" styleClass="form-control" />
+										<la:text property="crawlingConfigName" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="crawlingConfigPath"><la:message key="labels.wizard_crawling_config_path" /></label>
 										<label for="crawlingConfigPath"><la:message key="labels.wizard_crawling_config_path" /></label>
-										<html:text property="crawlingConfigPath" styleClass="form-control" />
+										<la:text property="crawlingConfigPath" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="maxAccessCount"><la:message key="labels.maxAccessCount" /></label>
 										<label for="maxAccessCount"><la:message key="labels.maxAccessCount" /></label>
-										<html:text property="maxAccessCount" styleClass="form-control" />
+										<la:text property="maxAccessCount" styleClass="form-control" />
 									</div>
 									</div>
 									<div class="form-group">
 									<div class="form-group">
 										<label for="depth"><la:message key="labels.depth" /></label>
 										<label for="depth"><la:message key="labels.depth" /></label>
-										<html:text property="depth" styleClass="form-control" />
+										<la:text property="depth" styleClass="form-control" />
 									</div>
 									</div>
 								</div>
 								</div>
 								<div class="box-footer">
 								<div class="box-footer">
@@ -79,7 +79,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 2 - 2
src/main/webapp/WEB-INF/view/admin/wizard/index.jsp

@@ -27,7 +27,7 @@
 
 
 			<section class="content">
 			<section class="content">
 
 
-				<s:form>
+				<la:form>
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -59,7 +59,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 2 - 2
src/main/webapp/WEB-INF/view/admin/wizard/startCrawling.jsp

@@ -30,7 +30,7 @@
 			<!-- Main content -->
 			<!-- Main content -->
 			<section class="content">
 			<section class="content">
 
 
-				<s:form>
+				<la:form>
 					<div class="row">
 					<div class="row">
 						<div class="col-md-12">
 						<div class="col-md-12">
 							<div class="box">
 							<div class="box">
@@ -61,7 +61,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 
 
 			</section>
 			</section>
 		</div>
 		</div>

+ 3 - 3
src/main/webapp/WEB-INF/view/common/admin/header.jsp

@@ -20,15 +20,15 @@
 						<la:message key="labels.menu.logout" />
 						<la:message key="labels.menu.logout" />
 					</la:link></li>
 					</la:link></li>
 			</ul>
 			</ul>
-			<s:form styleClass="pull-right" action="/admin/searchList/search"
+			<la:form styleClass="pull-right" action="/admin/searchList/search"
 				method="get">
 				method="get">
-				<html:text styleClass="input-large" property="query" title="Search"
+				<la:text styleClass="input-large" property="query" title="Search"
 					maxlength="1000" styleId="query" />
 					maxlength="1000" styleId="query" />
 				<button class="btn medium primary" type="submit" name="search"
 				<button class="btn medium primary" type="submit" name="search"
 					id="searchButton">
 					id="searchButton">
 					<la:message key="labels.search" />
 					<la:message key="labels.search" />
 				</button>
 				</button>
-			</s:form>
+			</la:form>
 		</div>
 		</div>
 	</div>
 	</div>
 </div>
 </div>

+ 3 - 3
src/main/webapp/WEB-INF/view/common/admin2/sidebar.jsp

@@ -6,16 +6,16 @@
 	<section class="sidebar">
 	<section class="sidebar">
 
 
 		<!-- search form -->
 		<!-- search form -->
-		<s:form action="/admin/searchList/search" method="get" styleClass="sidebar-form">
+		<todo:form action="/admin/searchList/search" method="get" styleClass="sidebar-form">
 			<div class="input-group">
 			<div class="input-group">
-				<html:text styleClass="form-control" property="query" title="Search" maxlength="1000" styleId="query" />
+				<todo:text styleClass="form-control" property="query" title="Search" maxlength="1000" styleId="query" />
 				<span class="input-group-btn">
 				<span class="input-group-btn">
 					<button type='submit' name='search' id='search-btn' class="btn btn-flat">
 					<button type='submit' name='search' id='search-btn' class="btn btn-flat">
 						<i class="fa fa-search"></i>
 						<i class="fa fa-search"></i>
 					</button>
 					</button>
 				</span>
 				</span>
 			</div>
 			</div>
-		</s:form>
+		</todo:form>
 		<!-- /.search form -->
 		<!-- /.search form -->
 
 
 		<!-- Sidebar Menu -->
 		<!-- Sidebar Menu -->

+ 3 - 3
src/main/webapp/WEB-INF/view/error/header.jsp

@@ -1,5 +1,5 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
-<s:form action="/search" method="get">
+<la:form action="/search" method="get">
 	<div class="navbar navbar-inverse navbar-fixed-top">
 	<div class="navbar navbar-inverse navbar-fixed-top">
 		<div class="navbar-inner">
 		<div class="navbar-inner">
 			<div class="container">
 			<div class="container">
@@ -8,7 +8,7 @@
 						alt="<la:message key="labels.header_brand_name" />" />
 						alt="<la:message key="labels.header_brand_name" />" />
 				</la:link>
 				</la:link>
 				<div class="navbar-form pull-right">
 				<div class="navbar-form pull-right">
-					<html:text property="query" maxlength="1000" styleId="query" />
+					<la:text property="query" maxlength="1000" styleId="query" />
 					<button class="btn medium btn-primary" type="submit" name="search"
 					<button class="btn medium btn-primary" type="submit" name="search"
 						id="searchButton">
 						id="searchButton">
 						<la:message key="labels.search" />
 						<la:message key="labels.search" />
@@ -120,5 +120,5 @@
 			</button>
 			</button>
 		</div>
 		</div>
 	</div>
 	</div>
-</s:form>
+</la:form>
 
 

+ 3 - 3
src/main/webapp/WEB-INF/view/header.jsp

@@ -1,5 +1,5 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
-<s:form action="search" method="get" styleId="searchForm" styleClass="searchResultForm">
+<la:form action="search" method="get" styleId="searchForm" styleClass="searchResultForm">
 ${fe:facetForm()}${fe:geoForm()}
 ${fe:facetForm()}${fe:geoForm()}
 	<div class="navbar navbar-inverse navbar-fixed-top">
 	<div class="navbar navbar-inverse navbar-fixed-top">
 		<div class="navbar-inner">
 		<div class="navbar-inner">
@@ -9,7 +9,7 @@ ${fe:facetForm()}${fe:geoForm()}
 						alt="<la:message key="labels.header_brand_name" />" />
 						alt="<la:message key="labels.header_brand_name" />" />
 				</la:link>
 				</la:link>
 				<div class="navbar-form pull-right">
 				<div class="navbar-form pull-right">
-					<html:text property="query" maxlength="1000" styleId="query" autocomplete="off"/>
+					<la:text property="query" maxlength="1000" styleId="query" autocomplete="off"/>
 					<button class="btn medium btn-primary" type="submit" name="search"
 					<button class="btn medium btn-primary" type="submit" name="search"
 						id="searchButton">
 						id="searchButton">
 						<i class="icon-search icon-white"></i><span class="hidden-phone"><la:message
 						<i class="icon-search icon-white"></i><span class="hidden-phone"><la:message
@@ -144,5 +144,5 @@ ${fe:facetForm()}${fe:geoForm()}
 			</button>
 			</button>
 		</div>
 		</div>
 	</div>
 	</div>
-</s:form>
+</la:form>
 
 

+ 3 - 3
src/main/webapp/WEB-INF/view/index.jsp

@@ -50,13 +50,13 @@
 						footer="errors.front_footer" prefix="errors.front_prefix"
 						footer="errors.front_footer" prefix="errors.front_prefix"
 						suffix="errors.front_suffix" />
 						suffix="errors.front_suffix" />
 				</div>
 				</div>
-				<s:form styleClass="form-stacked" action="search" method="get"
+				<la:form styleClass="form-stacked" action="search" method="get"
 					styleId="searchForm">
 					styleId="searchForm">
 					${fe:facetForm()}${fe:geoForm()}
 					${fe:facetForm()}${fe:geoForm()}
 					<fieldset>
 					<fieldset>
 						<div class="clearfix">
 						<div class="clearfix">
 							<div class="input">
 							<div class="input">
-								<html:text styleClass="query" property="query" size="50"
+								<la:text styleClass="query" property="query" size="50"
 									maxlength="1000" styleId="contentQuery" autocomplete="off" />
 									maxlength="1000" styleId="contentQuery" autocomplete="off" />
 							</div>
 							</div>
 						</div>
 						</div>
@@ -204,7 +204,7 @@
 							</button>
 							</button>
 						</div>
 						</div>
 					</div>
 					</div>
-				</s:form>
+				</la:form>
 			</div>
 			</div>
 		</div>
 		</div>
 		<jsp:include page="footer.jsp" />
 		<jsp:include page="footer.jsp" />

+ 2 - 2
src/main/webapp/WEB-INF/view/login/logout.jsp

@@ -23,10 +23,10 @@
 						<la:message key="labels.do_you_want_to_logout" />
 						<la:message key="labels.do_you_want_to_logout" />
 					</div>
 					</div>
 					<div class="action">
 					<div class="action">
-						<s:form>
+						<la:form>
 						<input type="submit" name="logout"
 						<input type="submit" name="logout"
 							value="<la:message key="labels.logout_button"/>" />
 							value="<la:message key="labels.logout_button"/>" />
-						</s:form>
+						</la:form>
 					</div>
 					</div>
 				</div>
 				</div>
 			</div>
 			</div>

+ 6 - 6
src/main/webapp/WEB-INF/web.xml

@@ -58,13 +58,13 @@
   </filter>
   </filter>
 
 
   <filter>
   <filter>
-    <filter-name>diFilter</filter-name>
-    <filter-class>org.codelibs.fess.filter.DIFilter</filter-class>
+    <filter-name>lastaPrepareFilter</filter-name>
+    <filter-class>org.lastaflute.web.servlet.filter.LastaPrepareFilter</filter-class>
   </filter>
   </filter>
 
 
   <filter>
   <filter>
-    <filter-name>routingFilter</filter-name>
-    <filter-class>org.codelibs.fess.filter.RoutingFilter</filter-class>
+    <filter-name>lastaToActionFilter</filter-name>
+    <filter-class>org.lastaflute.web.servlet.filter.LastaToActionFilter</filter-class>
   </filter>
   </filter>
 
 
   <!--
   <!--
@@ -160,7 +160,7 @@
   </filter-mapping>
   </filter-mapping>
 
 
   <filter-mapping>
   <filter-mapping>
-    <filter-name>diFilter</filter-name>
+    <filter-name>lastaPrepareFilter</filter-name>
     <url-pattern>/*</url-pattern>
     <url-pattern>/*</url-pattern>
     <dispatcher>REQUEST</dispatcher>
     <dispatcher>REQUEST</dispatcher>
   </filter-mapping>
   </filter-mapping>
@@ -179,7 +179,7 @@
   </filter-mapping>
   </filter-mapping>
 
 
   <filter-mapping>
   <filter-mapping>
-    <filter-name>routingFilter</filter-name>
+    <filter-name>lastaToActionFilter</filter-name>
     <url-pattern>/*</url-pattern>
     <url-pattern>/*</url-pattern>
     <dispatcher>REQUEST</dispatcher>
     <dispatcher>REQUEST</dispatcher>
   </filter-mapping>
   </filter-mapping>