Browse Source

improve messages

Shinsuke Sugaya 9 years ago
parent
commit
08254cb922
100 changed files with 208 additions and 189 deletions
  1. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java
  2. 1 1
      src/main/java/org/codelibs/fess/app/web/go/GoAction.java
  3. 7 8
      src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java
  4. 1 1
      src/main/java/org/codelibs/fess/crawler/interval/FessIntervalController.java
  5. 11 11
      src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java
  6. 1 1
      src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessXpathTransformer.java
  7. 2 2
      src/main/java/org/codelibs/fess/crawler/transformer/FessFileTransformer.java
  8. 1 1
      src/main/java/org/codelibs/fess/crawler/transformer/FessTikaTransformer.java
  9. 11 11
      src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java
  10. 2 2
      src/main/java/org/codelibs/fess/ds/impl/CsvDataStoreImpl.java
  11. 9 9
      src/main/java/org/codelibs/fess/ds/impl/FileListDataStoreImpl.java
  12. 7 7
      src/main/java/org/codelibs/fess/es/exentity/DataConfig.java
  13. 3 3
      src/main/java/org/codelibs/fess/es/exentity/FileConfig.java
  14. 3 3
      src/main/java/org/codelibs/fess/es/exentity/WebAuthentication.java
  15. 3 3
      src/main/java/org/codelibs/fess/es/exentity/WebConfig.java
  16. 1 1
      src/main/java/org/codelibs/fess/exec/Crawler.java
  17. 2 2
      src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java
  18. 1 1
      src/main/java/org/codelibs/fess/helper/SystemHelper.java
  19. 5 5
      src/main/java/org/codelibs/fess/helper/ViewHelper.java
  20. 5 5
      src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java
  21. 10 10
      src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
  22. 26 11
      src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
  23. 3 3
      src/main/java/org/codelibs/fess/util/ComponentUtil.java
  24. 16 11
      src/main/resources/fess_label.properties
  25. 1 1
      src/main/webapp/WEB-INF/view/admin/boostdocumentrule/confirm.jsp
  26. 1 1
      src/main/webapp/WEB-INF/view/admin/boostdocumentrule/edit.jsp
  27. 1 1
      src/main/webapp/WEB-INF/view/admin/boostdocumentrule/error.jsp
  28. 1 1
      src/main/webapp/WEB-INF/view/admin/boostdocumentrule/index.jsp
  29. 1 1
      src/main/webapp/WEB-INF/view/admin/crawl/index.jsp
  30. 1 1
      src/main/webapp/WEB-INF/view/admin/crawlingsession/confirm.jsp
  31. 1 1
      src/main/webapp/WEB-INF/view/admin/crawlingsession/error.jsp
  32. 1 1
      src/main/webapp/WEB-INF/view/admin/crawlingsession/index.jsp
  33. 1 1
      src/main/webapp/WEB-INF/view/admin/dataconfig/confirm.jsp
  34. 1 1
      src/main/webapp/WEB-INF/view/admin/dataconfig/edit.jsp
  35. 1 1
      src/main/webapp/WEB-INF/view/admin/dataconfig/error.jsp
  36. 1 1
      src/main/webapp/WEB-INF/view/admin/dataconfig/index.jsp
  37. 1 1
      src/main/webapp/WEB-INF/view/admin/design/admin_design.jsp
  38. 1 1
      src/main/webapp/WEB-INF/view/admin/design/admin_design_edit.jsp
  39. 1 1
      src/main/webapp/WEB-INF/view/admin/dict/error.jsp
  40. 1 1
      src/main/webapp/WEB-INF/view/admin/dict/index.jsp
  41. 1 1
      src/main/webapp/WEB-INF/view/admin/dict/kuromoji/confirm.jsp
  42. 1 1
      src/main/webapp/WEB-INF/view/admin/dict/kuromoji/download.jsp
  43. 1 1
      src/main/webapp/WEB-INF/view/admin/dict/kuromoji/edit.jsp
  44. 1 1
      src/main/webapp/WEB-INF/view/admin/dict/kuromoji/error.jsp
  45. 1 1
      src/main/webapp/WEB-INF/view/admin/dict/kuromoji/index.jsp
  46. 1 1
      src/main/webapp/WEB-INF/view/admin/dict/kuromoji/upload.jsp
  47. 1 1
      src/main/webapp/WEB-INF/view/admin/dict/synonym/confirm.jsp
  48. 1 1
      src/main/webapp/WEB-INF/view/admin/dict/synonym/download.jsp
  49. 1 1
      src/main/webapp/WEB-INF/view/admin/dict/synonym/edit.jsp
  50. 1 1
      src/main/webapp/WEB-INF/view/admin/dict/synonym/error.jsp
  51. 1 1
      src/main/webapp/WEB-INF/view/admin/dict/synonym/index.jsp
  52. 1 1
      src/main/webapp/WEB-INF/view/admin/dict/synonym/upload.jsp
  53. 1 1
      src/main/webapp/WEB-INF/view/admin/failureurl/confirm.jsp
  54. 1 1
      src/main/webapp/WEB-INF/view/admin/failureurl/error.jsp
  55. 1 1
      src/main/webapp/WEB-INF/view/admin/failureurl/index.jsp
  56. 1 1
      src/main/webapp/WEB-INF/view/admin/fileauthentication/confirm.jsp
  57. 1 1
      src/main/webapp/WEB-INF/view/admin/fileauthentication/edit.jsp
  58. 1 1
      src/main/webapp/WEB-INF/view/admin/fileauthentication/error.jsp
  59. 1 1
      src/main/webapp/WEB-INF/view/admin/fileauthentication/index.jsp
  60. 1 1
      src/main/webapp/WEB-INF/view/admin/fileconfig/confirm.jsp
  61. 1 1
      src/main/webapp/WEB-INF/view/admin/fileconfig/edit.jsp
  62. 1 1
      src/main/webapp/WEB-INF/view/admin/fileconfig/error.jsp
  63. 1 1
      src/main/webapp/WEB-INF/view/admin/fileconfig/index.jsp
  64. 1 1
      src/main/webapp/WEB-INF/view/admin/group/confirm.jsp
  65. 1 1
      src/main/webapp/WEB-INF/view/admin/group/edit.jsp
  66. 1 1
      src/main/webapp/WEB-INF/view/admin/group/error.jsp
  67. 1 1
      src/main/webapp/WEB-INF/view/admin/group/index.jsp
  68. 1 1
      src/main/webapp/WEB-INF/view/admin/joblog/confirm.jsp
  69. 1 1
      src/main/webapp/WEB-INF/view/admin/joblog/error.jsp
  70. 1 1
      src/main/webapp/WEB-INF/view/admin/joblog/index.jsp
  71. 1 1
      src/main/webapp/WEB-INF/view/admin/keymatch/confirm.jsp
  72. 1 1
      src/main/webapp/WEB-INF/view/admin/keymatch/edit.jsp
  73. 1 1
      src/main/webapp/WEB-INF/view/admin/keymatch/error.jsp
  74. 1 1
      src/main/webapp/WEB-INF/view/admin/keymatch/index.jsp
  75. 1 1
      src/main/webapp/WEB-INF/view/admin/labeltype/confirm.jsp
  76. 1 1
      src/main/webapp/WEB-INF/view/admin/labeltype/edit.jsp
  77. 1 1
      src/main/webapp/WEB-INF/view/admin/labeltype/error.jsp
  78. 1 1
      src/main/webapp/WEB-INF/view/admin/labeltype/index.jsp
  79. 1 1
      src/main/webapp/WEB-INF/view/admin/log/index.jsp
  80. 1 1
      src/main/webapp/WEB-INF/view/admin/overlappinghost/confirm.jsp
  81. 1 1
      src/main/webapp/WEB-INF/view/admin/overlappinghost/edit.jsp
  82. 1 1
      src/main/webapp/WEB-INF/view/admin/overlappinghost/error.jsp
  83. 1 1
      src/main/webapp/WEB-INF/view/admin/overlappinghost/index.jsp
  84. 1 1
      src/main/webapp/WEB-INF/view/admin/pathmapping/confirm.jsp
  85. 1 1
      src/main/webapp/WEB-INF/view/admin/pathmapping/edit.jsp
  86. 1 1
      src/main/webapp/WEB-INF/view/admin/pathmapping/error.jsp
  87. 1 1
      src/main/webapp/WEB-INF/view/admin/pathmapping/index.jsp
  88. 1 1
      src/main/webapp/WEB-INF/view/admin/requestheader/confirm.jsp
  89. 1 1
      src/main/webapp/WEB-INF/view/admin/requestheader/edit.jsp
  90. 1 1
      src/main/webapp/WEB-INF/view/admin/requestheader/error.jsp
  91. 1 1
      src/main/webapp/WEB-INF/view/admin/requestheader/index.jsp
  92. 1 1
      src/main/webapp/WEB-INF/view/admin/role/confirm.jsp
  93. 1 1
      src/main/webapp/WEB-INF/view/admin/role/edit.jsp
  94. 1 1
      src/main/webapp/WEB-INF/view/admin/role/error.jsp
  95. 1 1
      src/main/webapp/WEB-INF/view/admin/role/index.jsp
  96. 1 1
      src/main/webapp/WEB-INF/view/admin/roletype/confirm.jsp
  97. 1 1
      src/main/webapp/WEB-INF/view/admin/roletype/edit.jsp
  98. 1 1
      src/main/webapp/WEB-INF/view/admin/roletype/error.jsp
  99. 1 1
      src/main/webapp/WEB-INF/view/admin/roletype/index.jsp
  100. 1 1
      src/main/webapp/WEB-INF/view/admin/scheduledjob/confirm.jsp

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java

@@ -32,6 +32,7 @@ import org.codelibs.fess.app.service.ScheduledJobService;
 import org.codelibs.fess.app.service.WebConfigService;
 import org.codelibs.fess.app.web.admin.system.AdminSystemAction;
 import org.codelibs.fess.app.web.base.FessAdminAction;
+import org.codelibs.fess.crawler.util.CharUtil;
 import org.codelibs.fess.es.exentity.FileConfig;
 import org.codelibs.fess.es.exentity.ScheduledJob;
 import org.codelibs.fess.es.exentity.WebConfig;
@@ -39,7 +40,6 @@ import org.codelibs.fess.helper.JobHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.job.TriggeredJob;
 import org.codelibs.fess.util.ComponentUtil;
-import org.codelibs.fess.crawler.util.CharUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.callback.ActionRuntime;
 import org.lastaflute.web.response.HtmlResponse;

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/go/GoAction.java

@@ -29,12 +29,12 @@ import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.net.URLUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.web.base.FessSearchAction;
+import org.codelibs.fess.crawler.util.CharUtil;
 import org.codelibs.fess.es.exentity.ClickLog;
 import org.codelibs.fess.helper.SearchLogHelper;
 import org.codelibs.fess.helper.ViewHelper;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
-import org.codelibs.fess.crawler.util.CharUtil;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.lastaflute.web.Execute;

+ 7 - 8
src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java

@@ -28,6 +28,13 @@ import java.util.Set;
 import org.apache.commons.io.IOUtils;
 import org.codelibs.core.misc.DynamicProperties;
 import org.codelibs.fess.Constants;
+import org.codelibs.fess.crawler.builder.RequestDataBuilder;
+import org.codelibs.fess.crawler.client.CrawlerClient;
+import org.codelibs.fess.crawler.client.smb.SmbClient;
+import org.codelibs.fess.crawler.entity.RequestData;
+import org.codelibs.fess.crawler.entity.ResponseData;
+import org.codelibs.fess.crawler.entity.UrlQueue;
+import org.codelibs.fess.crawler.log.LogType;
 import org.codelibs.fess.es.client.FessEsClient;
 import org.codelibs.fess.es.exentity.CrawlingConfig;
 import org.codelibs.fess.helper.CrawlingConfigHelper;
@@ -36,14 +43,6 @@ import org.codelibs.fess.helper.FieldHelper;
 import org.codelibs.fess.helper.IndexingHelper;
 import org.codelibs.fess.helper.SambaHelper;
 import org.codelibs.fess.util.ComponentUtil;
-import org.codelibs.fess.crawler.CrawlerThread;
-import org.codelibs.fess.crawler.builder.RequestDataBuilder;
-import org.codelibs.fess.crawler.client.CrawlerClient;
-import org.codelibs.fess.crawler.client.smb.SmbClient;
-import org.codelibs.fess.crawler.entity.RequestData;
-import org.codelibs.fess.crawler.entity.ResponseData;
-import org.codelibs.fess.crawler.entity.UrlQueue;
-import org.codelibs.fess.crawler.log.LogType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

+ 1 - 1
src/main/java/org/codelibs/fess/crawler/interval/FessIntervalController.java

@@ -16,9 +16,9 @@
 
 package org.codelibs.fess.crawler.interval;
 
+import org.codelibs.fess.crawler.interval.impl.DefaultIntervalController;
 import org.codelibs.fess.helper.IntervalControlHelper;
 import org.codelibs.fess.util.ComponentUtil;
-import org.codelibs.fess.crawler.interval.impl.DefaultIntervalController;
 
 public class FessIntervalController extends DefaultIntervalController {
 

+ 11 - 11
src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java

@@ -37,6 +37,17 @@ import org.codelibs.core.io.SerializeUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.misc.DynamicProperties;
 import org.codelibs.fess.Constants;
+import org.codelibs.fess.crawler.client.smb.SmbClient;
+import org.codelibs.fess.crawler.entity.AccessResult;
+import org.codelibs.fess.crawler.entity.AccessResultData;
+import org.codelibs.fess.crawler.entity.ExtractData;
+import org.codelibs.fess.crawler.entity.ResponseData;
+import org.codelibs.fess.crawler.entity.ResultData;
+import org.codelibs.fess.crawler.entity.UrlQueue;
+import org.codelibs.fess.crawler.exception.CrawlerSystemException;
+import org.codelibs.fess.crawler.exception.CrawlingAccessException;
+import org.codelibs.fess.crawler.extractor.Extractor;
+import org.codelibs.fess.crawler.util.CrawlingParameterUtil;
 import org.codelibs.fess.es.exentity.CrawlingConfig;
 import org.codelibs.fess.es.exentity.CrawlingConfig.ConfigName;
 import org.codelibs.fess.helper.CrawlingConfigHelper;
@@ -48,17 +59,6 @@ import org.codelibs.fess.helper.PathMappingHelper;
 import org.codelibs.fess.helper.SambaHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.util.ComponentUtil;
-import org.codelibs.fess.crawler.client.smb.SmbClient;
-import org.codelibs.fess.crawler.entity.AccessResult;
-import org.codelibs.fess.crawler.entity.AccessResultData;
-import org.codelibs.fess.crawler.entity.ExtractData;
-import org.codelibs.fess.crawler.entity.ResponseData;
-import org.codelibs.fess.crawler.entity.ResultData;
-import org.codelibs.fess.crawler.entity.UrlQueue;
-import org.codelibs.fess.crawler.exception.CrawlingAccessException;
-import org.codelibs.fess.crawler.exception.CrawlerSystemException;
-import org.codelibs.fess.crawler.extractor.Extractor;
-import org.codelibs.fess.crawler.util.CrawlingParameterUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

+ 1 - 1
src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessXpathTransformer.java

@@ -23,9 +23,9 @@ import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fess.crawler.transformer.impl.XpathTransformer;
 import org.codelibs.fess.helper.FieldHelper;
 import org.codelibs.fess.util.ComponentUtil;
-import org.codelibs.fess.crawler.transformer.impl.XpathTransformer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

+ 2 - 2
src/main/java/org/codelibs/fess/crawler/transformer/FessFileTransformer.java

@@ -16,11 +16,11 @@
 
 package org.codelibs.fess.crawler.transformer;
 
-import org.codelibs.fess.exception.FessSystemException;
-import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.crawler.entity.ResponseData;
 import org.codelibs.fess.crawler.extractor.Extractor;
 import org.codelibs.fess.crawler.extractor.ExtractorFactory;
+import org.codelibs.fess.exception.FessSystemException;
+import org.codelibs.fess.util.ComponentUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

+ 1 - 1
src/main/java/org/codelibs/fess/crawler/transformer/FessTikaTransformer.java

@@ -16,9 +16,9 @@
 
 package org.codelibs.fess.crawler.transformer;
 
-import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.crawler.entity.ResponseData;
 import org.codelibs.fess.crawler.extractor.Extractor;
+import org.codelibs.fess.exception.FessSystemException;
 import org.lastaflute.di.core.SingletonLaContainer;
 
 public class FessTikaTransformer extends AbstractFessFileTransformer {

+ 11 - 11
src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java

@@ -39,6 +39,17 @@ import org.codelibs.core.io.InputStreamUtil;
 import org.codelibs.core.io.SerializeUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
+import org.codelibs.fess.crawler.builder.RequestDataBuilder;
+import org.codelibs.fess.crawler.entity.AccessResultData;
+import org.codelibs.fess.crawler.entity.RequestData;
+import org.codelibs.fess.crawler.entity.ResponseData;
+import org.codelibs.fess.crawler.entity.ResultData;
+import org.codelibs.fess.crawler.entity.UrlQueue;
+import org.codelibs.fess.crawler.exception.ChildUrlsException;
+import org.codelibs.fess.crawler.exception.CrawlerSystemException;
+import org.codelibs.fess.crawler.exception.CrawlingAccessException;
+import org.codelibs.fess.crawler.util.CrawlingParameterUtil;
+import org.codelibs.fess.crawler.util.ResponseDataUtil;
 import org.codelibs.fess.es.exentity.CrawlingConfig;
 import org.codelibs.fess.es.exentity.CrawlingConfig.ConfigName;
 import org.codelibs.fess.helper.CrawlingConfigHelper;
@@ -50,17 +61,6 @@ import org.codelibs.fess.helper.OverlappingHostHelper;
 import org.codelibs.fess.helper.PathMappingHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.util.ComponentUtil;
-import org.codelibs.fess.crawler.builder.RequestDataBuilder;
-import org.codelibs.fess.crawler.entity.AccessResultData;
-import org.codelibs.fess.crawler.entity.RequestData;
-import org.codelibs.fess.crawler.entity.ResponseData;
-import org.codelibs.fess.crawler.entity.ResultData;
-import org.codelibs.fess.crawler.entity.UrlQueue;
-import org.codelibs.fess.crawler.exception.ChildUrlsException;
-import org.codelibs.fess.crawler.exception.CrawlingAccessException;
-import org.codelibs.fess.crawler.exception.CrawlerSystemException;
-import org.codelibs.fess.crawler.util.CrawlingParameterUtil;
-import org.codelibs.fess.crawler.util.ResponseDataUtil;
 import org.cyberneko.html.parsers.DOMParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+ 2 - 2
src/main/java/org/codelibs/fess/ds/impl/CsvDataStoreImpl.java

@@ -32,12 +32,12 @@ import org.apache.commons.io.IOUtils;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.service.FailureUrlService;
+import org.codelibs.fess.crawler.exception.CrawlingAccessException;
+import org.codelibs.fess.crawler.exception.MultipleCrawlingAccessException;
 import org.codelibs.fess.ds.DataStoreCrawlingException;
 import org.codelibs.fess.ds.DataStoreException;
 import org.codelibs.fess.ds.IndexUpdateCallback;
 import org.codelibs.fess.es.exentity.DataConfig;
-import org.codelibs.fess.crawler.exception.CrawlingAccessException;
-import org.codelibs.fess.crawler.exception.MultipleCrawlingAccessException;
 import org.lastaflute.di.core.SingletonLaContainer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+ 9 - 9
src/main/java/org/codelibs/fess/ds/impl/FileListDataStoreImpl.java

@@ -25,15 +25,6 @@ import java.util.Map;
 import org.codelibs.core.collection.LruHashMap;
 import org.codelibs.core.io.SerializeUtil;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.ds.DataStoreCrawlingException;
-import org.codelibs.fess.ds.DataStoreException;
-import org.codelibs.fess.ds.IndexUpdateCallback;
-import org.codelibs.fess.es.client.FessEsClient;
-import org.codelibs.fess.es.exentity.DataConfig;
-import org.codelibs.fess.helper.CrawlingSessionHelper;
-import org.codelibs.fess.helper.FieldHelper;
-import org.codelibs.fess.helper.IndexingHelper;
-import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.crawler.builder.RequestDataBuilder;
 import org.codelibs.fess.crawler.client.CrawlerClient;
 import org.codelibs.fess.crawler.client.CrawlerClientFactory;
@@ -45,6 +36,15 @@ import org.codelibs.fess.crawler.processor.impl.DefaultResponseProcessor;
 import org.codelibs.fess.crawler.rule.Rule;
 import org.codelibs.fess.crawler.rule.RuleManager;
 import org.codelibs.fess.crawler.transformer.Transformer;
+import org.codelibs.fess.ds.DataStoreCrawlingException;
+import org.codelibs.fess.ds.DataStoreException;
+import org.codelibs.fess.ds.IndexUpdateCallback;
+import org.codelibs.fess.es.client.FessEsClient;
+import org.codelibs.fess.es.exentity.DataConfig;
+import org.codelibs.fess.helper.CrawlingSessionHelper;
+import org.codelibs.fess.helper.FieldHelper;
+import org.codelibs.fess.helper.IndexingHelper;
+import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.di.core.SingletonLaContainer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+ 7 - 7
src/main/java/org/codelibs/fess/es/exentity/DataConfig.java

@@ -17,13 +17,6 @@ import org.apache.http.impl.auth.DigestScheme;
 import org.apache.http.impl.auth.NTLMScheme;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.es.bsentity.BsDataConfig;
-import org.codelibs.fess.es.exbhv.FileConfigToLabelBhv;
-import org.codelibs.fess.es.exbhv.FileConfigToRoleBhv;
-import org.codelibs.fess.es.exbhv.LabelTypeBhv;
-import org.codelibs.fess.es.exbhv.RoleTypeBhv;
-import org.codelibs.fess.util.ComponentUtil;
-import org.codelibs.fess.util.ParameterUtil;
 import org.codelibs.fess.crawler.client.CrawlerClientFactory;
 import org.codelibs.fess.crawler.client.http.Authentication;
 import org.codelibs.fess.crawler.client.http.HcHttpClient;
@@ -31,6 +24,13 @@ import org.codelibs.fess.crawler.client.http.impl.AuthenticationImpl;
 import org.codelibs.fess.crawler.client.http.ntlm.JcifsEngine;
 import org.codelibs.fess.crawler.client.smb.SmbAuthentication;
 import org.codelibs.fess.crawler.client.smb.SmbClient;
+import org.codelibs.fess.es.bsentity.BsDataConfig;
+import org.codelibs.fess.es.exbhv.FileConfigToLabelBhv;
+import org.codelibs.fess.es.exbhv.FileConfigToRoleBhv;
+import org.codelibs.fess.es.exbhv.LabelTypeBhv;
+import org.codelibs.fess.es.exbhv.RoleTypeBhv;
+import org.codelibs.fess.util.ComponentUtil;
+import org.codelibs.fess.util.ParameterUtil;
 import org.dbflute.cbean.result.ListResultBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+ 3 - 3
src/main/java/org/codelibs/fess/es/exentity/FileConfig.java

@@ -10,6 +10,9 @@ import java.util.regex.Pattern;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.service.FileAuthenticationService;
+import org.codelibs.fess.crawler.client.CrawlerClientFactory;
+import org.codelibs.fess.crawler.client.smb.SmbAuthentication;
+import org.codelibs.fess.crawler.client.smb.SmbClient;
 import org.codelibs.fess.es.bsentity.BsFileConfig;
 import org.codelibs.fess.es.exbhv.FileConfigToLabelBhv;
 import org.codelibs.fess.es.exbhv.FileConfigToRoleBhv;
@@ -18,9 +21,6 @@ import org.codelibs.fess.es.exbhv.RoleTypeBhv;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.ParameterUtil;
-import org.codelibs.fess.crawler.client.CrawlerClientFactory;
-import org.codelibs.fess.crawler.client.smb.SmbAuthentication;
-import org.codelibs.fess.crawler.client.smb.SmbClient;
 import org.dbflute.cbean.result.ListResultBean;
 import org.lastaflute.di.core.SingletonLaContainer;
 

+ 3 - 3
src/main/java/org/codelibs/fess/es/exentity/WebAuthentication.java

@@ -13,13 +13,13 @@ import org.apache.http.impl.auth.NTLMScheme;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.service.WebConfigService;
-import org.codelibs.fess.es.bsentity.BsWebAuthentication;
-import org.codelibs.fess.util.ComponentUtil;
-import org.codelibs.fess.util.ParameterUtil;
 import org.codelibs.fess.crawler.client.http.Authentication;
 import org.codelibs.fess.crawler.client.http.impl.AuthenticationImpl;
 import org.codelibs.fess.crawler.client.http.ntlm.JcifsEngine;
 import org.codelibs.fess.crawler.exception.CrawlerSystemException;
+import org.codelibs.fess.es.bsentity.BsWebAuthentication;
+import org.codelibs.fess.util.ComponentUtil;
+import org.codelibs.fess.util.ParameterUtil;
 
 /**
  * @author FreeGen

+ 3 - 3
src/main/java/org/codelibs/fess/es/exentity/WebConfig.java

@@ -11,6 +11,9 @@ import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.service.RequestHeaderService;
 import org.codelibs.fess.app.service.WebAuthenticationService;
+import org.codelibs.fess.crawler.client.CrawlerClientFactory;
+import org.codelibs.fess.crawler.client.http.Authentication;
+import org.codelibs.fess.crawler.client.http.HcHttpClient;
 import org.codelibs.fess.es.bsentity.BsWebConfig;
 import org.codelibs.fess.es.exbhv.LabelTypeBhv;
 import org.codelibs.fess.es.exbhv.RoleTypeBhv;
@@ -18,9 +21,6 @@ import org.codelibs.fess.es.exbhv.WebConfigToLabelBhv;
 import org.codelibs.fess.es.exbhv.WebConfigToRoleBhv;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.ParameterUtil;
-import org.codelibs.fess.crawler.client.CrawlerClientFactory;
-import org.codelibs.fess.crawler.client.http.Authentication;
-import org.codelibs.fess.crawler.client.http.HcHttpClient;
 import org.dbflute.cbean.result.ListResultBean;
 import org.lastaflute.di.core.SingletonLaContainer;
 

+ 1 - 1
src/main/java/org/codelibs/fess/exec/Crawler.java

@@ -36,6 +36,7 @@ import org.codelibs.core.misc.DynamicProperties;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.service.CrawlingSessionService;
 import org.codelibs.fess.app.service.PathMappingService;
+import org.codelibs.fess.crawler.client.EsClient;
 import org.codelibs.fess.es.client.FessEsClient;
 import org.codelibs.fess.helper.CrawlingSessionHelper;
 import org.codelibs.fess.helper.DataIndexHelper;
@@ -46,7 +47,6 @@ import org.codelibs.fess.helper.PathMappingHelper;
 import org.codelibs.fess.helper.WebFsIndexHelper;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.ResourceUtil;
-import org.codelibs.fess.crawler.client.EsClient;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.kohsuke.args4j.CmdLineException;

+ 2 - 2
src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java

@@ -17,13 +17,13 @@
 package org.codelibs.fess.helper;
 
 import org.codelibs.fess.app.service.FailureUrlService;
-import org.codelibs.fess.es.exentity.CrawlingConfig;
-import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.crawler.CrawlerContext;
 import org.codelibs.fess.crawler.entity.UrlQueue;
 import org.codelibs.fess.crawler.exception.MultipleCrawlingAccessException;
 import org.codelibs.fess.crawler.helper.impl.LogHelperImpl;
 import org.codelibs.fess.crawler.log.LogType;
+import org.codelibs.fess.es.exentity.CrawlingConfig;
+import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.di.core.SingletonLaContainer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -40,9 +40,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.service.RoleTypeService;
+import org.codelibs.fess.crawler.util.CharUtil;
 import org.codelibs.fess.es.exentity.RoleType;
 import org.codelibs.fess.util.ComponentUtil;
-import org.codelibs.fess.crawler.util.CharUtil;
 import org.lastaflute.di.core.SingletonLaContainer;
 import org.lastaflute.web.util.LaRequestUtil;
 

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

@@ -48,6 +48,11 @@ import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.service.DataConfigService;
 import org.codelibs.fess.app.service.FileConfigService;
 import org.codelibs.fess.app.service.WebConfigService;
+import org.codelibs.fess.crawler.builder.RequestDataBuilder;
+import org.codelibs.fess.crawler.client.CrawlerClient;
+import org.codelibs.fess.crawler.client.CrawlerClientFactory;
+import org.codelibs.fess.crawler.entity.ResponseData;
+import org.codelibs.fess.crawler.util.CharUtil;
 import org.codelibs.fess.entity.FacetQueryView;
 import org.codelibs.fess.es.exentity.CrawlingConfig;
 import org.codelibs.fess.es.exentity.CrawlingConfig.ConfigType;
@@ -56,11 +61,6 @@ import org.codelibs.fess.helper.UserAgentHelper.UserAgentType;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
 import org.codelibs.fess.util.ResourceUtil;
-import org.codelibs.fess.crawler.builder.RequestDataBuilder;
-import org.codelibs.fess.crawler.client.CrawlerClient;
-import org.codelibs.fess.crawler.client.CrawlerClientFactory;
-import org.codelibs.fess.crawler.entity.ResponseData;
-import org.codelibs.fess.crawler.util.CharUtil;
 import org.lastaflute.di.core.SingletonLaContainer;
 import org.lastaflute.taglib.function.LaFunctions;
 import org.lastaflute.web.response.StreamResponse;

+ 5 - 5
src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java

@@ -31,17 +31,17 @@ import org.codelibs.fess.app.service.FailureUrlService;
 import org.codelibs.fess.app.service.FileAuthenticationService;
 import org.codelibs.fess.app.service.FileConfigService;
 import org.codelibs.fess.app.service.WebConfigService;
+import org.codelibs.fess.crawler.Crawler;
+import org.codelibs.fess.crawler.CrawlerContext;
 import org.codelibs.fess.crawler.interval.FessIntervalController;
+import org.codelibs.fess.crawler.service.DataService;
+import org.codelibs.fess.crawler.service.UrlFilterService;
+import org.codelibs.fess.crawler.service.UrlQueueService;
 import org.codelibs.fess.es.exentity.BoostDocumentRule;
 import org.codelibs.fess.es.exentity.FileConfig;
 import org.codelibs.fess.es.exentity.WebConfig;
 import org.codelibs.fess.indexer.IndexUpdater;
 import org.codelibs.fess.util.ComponentUtil;
-import org.codelibs.fess.crawler.Crawler;
-import org.codelibs.fess.crawler.CrawlerContext;
-import org.codelibs.fess.crawler.service.DataService;
-import org.codelibs.fess.crawler.service.UrlFilterService;
-import org.codelibs.fess.crawler.service.UrlQueueService;
 import org.lastaflute.di.core.SingletonLaContainer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+ 10 - 10
src/main/java/org/codelibs/fess/indexer/IndexUpdater.java

@@ -26,16 +26,6 @@ import javax.annotation.Resource;
 
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.es.client.FessEsClient;
-import org.codelibs.fess.es.exbhv.ClickLogBhv;
-import org.codelibs.fess.es.exbhv.FavoriteLogBhv;
-import org.codelibs.fess.exception.FessSystemException;
-import org.codelibs.fess.helper.FieldHelper;
-import org.codelibs.fess.helper.IndexingHelper;
-import org.codelibs.fess.helper.IntervalControlHelper;
-import org.codelibs.fess.helper.SearchLogHelper;
-import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.crawler.Crawler;
 import org.codelibs.fess.crawler.entity.AccessResult;
 import org.codelibs.fess.crawler.entity.AccessResultData;
@@ -47,6 +37,16 @@ import org.codelibs.fess.crawler.service.UrlQueueService;
 import org.codelibs.fess.crawler.service.impl.EsDataService;
 import org.codelibs.fess.crawler.transformer.Transformer;
 import org.codelibs.fess.crawler.util.EsResultList;
+import org.codelibs.fess.es.client.FessEsClient;
+import org.codelibs.fess.es.exbhv.ClickLogBhv;
+import org.codelibs.fess.es.exbhv.FavoriteLogBhv;
+import org.codelibs.fess.exception.FessSystemException;
+import org.codelibs.fess.helper.FieldHelper;
+import org.codelibs.fess.helper.IndexingHelper;
+import org.codelibs.fess.helper.IntervalControlHelper;
+import org.codelibs.fess.helper.SearchLogHelper;
+import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.util.ComponentUtil;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.FilterBuilders;
 import org.elasticsearch.index.query.QueryBuilder;

+ 26 - 11
src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java

@@ -509,7 +509,7 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: General */
     public static final String LABELS_menu_crawl_config = "{labels.menu_crawl_config}";
 
-    /** The key of the message: Scheduled Jobs */
+    /** The key of the message: Scheduled Job */
     public static final String LABELS_menu_scheduled_job_config = "{labels.menu_scheduled_job_config}";
 
     /** The key of the message: System */
@@ -932,7 +932,7 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Accessing {0}<br>At a first time starting, it might take a little more time to open the file. */
     public static final String LABELS_open_uri = "{labels.open_uri}";
 
-    /** The key of the message: File Crawling Configuration */
+    /** The key of the message: File Crawling */
     public static final String LABELS_file_crawling_configuration = "{labels.file_crawling_configuration}";
 
     /** The key of the message: File Crawling Configuration */
@@ -1016,7 +1016,7 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Next */
     public static final String LABELS_file_crawling_link_next_page = "{labels.file_crawling_link_next_page}";
 
-    /** The key of the message: Web Crawling Configuration */
+    /** The key of the message: Web Crawling */
     public static final String LABELS_web_crawling_configuration = "{labels.web_crawling_configuration}";
 
     /** The key of the message: Web Crawling Configuration */
@@ -1199,7 +1199,7 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Notification Email */
     public static final String LABELS_notification_to = "{labels.notification_to}";
 
-    /** The key of the message: Path Mapping Configuration */
+    /** The key of the message: Path Mapping */
     public static final String LABELS_path_mapping_configuration = "{labels.path_mapping_configuration}";
 
     /** The key of the message: Path Mapping */
@@ -1274,7 +1274,7 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Next */
     public static final String LABELS_path_mapping_link_next_page = "{labels.path_mapping_link_next_page}";
 
-    /** The key of the message: Overlapping Host Configuration */
+    /** The key of the message: Overlapping Host */
     public static final String LABELS_overlapping_host_configuration = "{labels.overlapping_host_configuration}";
 
     /** The key of the message: Overlapping Host */
@@ -2141,7 +2141,7 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Back */
     public static final String LABELS_design_button_back = "{labels.design_button_back}";
 
-    /** The key of the message: Data Crawling Configuration */
+    /** The key of the message: Data Crawling */
     public static final String LABELS_data_crawling_configuration = "{labels.data_crawling_configuration}";
 
     /** The key of the message: Data Crawling Configuration */
@@ -2216,13 +2216,13 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Configuration Wizard */
     public static final String LABELS_wizard_title_configuration = "{labels.wizard_title_configuration}";
 
-    /** The key of the message: Configuration Wizard */
+    /** The key of the message: Quick Setup */
     public static final String LABELS_wizard_start_title = "{labels.wizard_start_title}";
 
     /** The key of the message: Using Configuration Wizard, you can create crawling settings easily. */
     public static final String LABELS_wizard_start_desc = "{labels.wizard_start_desc}";
 
-    /** The key of the message: Start */
+    /** The key of the message: Start Configuration */
     public static final String LABELS_wizard_start_button = "{labels.wizard_start_button}";
 
     /** The key of the message: Crawling Schedule */
@@ -2273,6 +2273,9 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Crawling Configuration */
     public static final String LABELS_wizard_crawling_config_title = "{labels.wizard_crawling_config_title}";
 
+    /** The key of the message: Crawling Setting */
+    public static final String LABELS_wizard_crawling_setting_title = "{labels.wizard_crawling_setting_title}";
+
     /** The key of the message: Name */
     public static final String LABELS_wizard_crawling_config_name = "{labels.wizard_crawling_config_name}";
 
@@ -2282,7 +2285,7 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Create again */
     public static final String LABELS_wizard_button_register_again = "{labels.wizard_button_register_again}";
 
-    /** The key of the message: Create/Next */
+    /** The key of the message: Create and Next */
     public static final String LABELS_wizard_button_register_next = "{labels.wizard_button_register_next}";
 
     /** The key of the message: Sun */
@@ -2318,13 +2321,16 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Start Crawling */
     public static final String LABELS_wizard_start_crawling_title = "{labels.wizard_start_crawling_title}";
 
+    /** The key of the message: Crawler */
+    public static final String LABELS_wizard_start_crawler_title = "{labels.wizard_start_crawler_title}";
+
     /** The key of the message: To click "Start Crawling" button, you can start a crawling now. */
     public static final String LABELS_wizard_start_crawling_desc = "{labels.wizard_start_crawling_desc}";
 
     /** The key of the message: Start Crawling */
     public static final String LABELS_wizard_button_start_crawling = "{labels.wizard_button_start_crawling}";
 
-    /** The key of the message: Finish */
+    /** The key of the message: Skip */
     public static final String LABELS_wizard_button_finish = "{labels.wizard_button_finish}";
 
     /** The key of the message: Search Result */
@@ -2749,7 +2755,7 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: ID */
     public static final String LABELS_favorite_log_id = "{labels.favorite_log_id}";
 
-    /** The key of the message: Managed Jobs */
+    /** The key of the message: Job Scheduler */
     public static final String LABELS_scheduledjob_configuration = "{labels.scheduledjob_configuration}";
 
     /** The key of the message: Jobs */
@@ -3598,6 +3604,15 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Confirmation */
     public static final String LABELS_crud_title_confirm = "{labels.crud_title_confirm}";
 
+    /** The key of the message: Fess */
+    public static final String LABELS_admin_brand_title = "{labels.admin_brand_title}";
+
+    /** The key of the message: Fess Dashboard */
+    public static final String LABELS_admin_dashboard_title = "{labels.admin_dashboard_title}";
+
+    /** The key of the message: Toggle navigation */
+    public static final String LABELS_admin_toggle_navi = "{labels.admin_toggle_navi}";
+
     /** The key of the message:  */
     public static final String LABELS_LABEL_TYPE_IDS = "{labels.labelTypeIds}";
 

+ 3 - 3
src/main/java/org/codelibs/fess/util/ComponentUtil.java

@@ -20,6 +20,9 @@ import org.codelibs.core.crypto.CachedCipher;
 import org.codelibs.core.misc.DynamicProperties;
 import org.codelibs.fess.api.WebApiManagerFactory;
 import org.codelibs.fess.app.web.base.login.FessLoginAssist;
+import org.codelibs.fess.crawler.entity.EsAccessResult;
+import org.codelibs.fess.crawler.extractor.ExtractorFactory;
+import org.codelibs.fess.crawler.service.DataService;
 import org.codelibs.fess.dict.DictionaryManager;
 import org.codelibs.fess.ds.DataStoreFactory;
 import org.codelibs.fess.es.client.FessEsClient;
@@ -45,9 +48,6 @@ import org.codelibs.fess.helper.UserAgentHelper;
 import org.codelibs.fess.helper.ViewHelper;
 import org.codelibs.fess.indexer.IndexUpdater;
 import org.codelibs.fess.job.JobExecutor;
-import org.codelibs.fess.crawler.entity.EsAccessResult;
-import org.codelibs.fess.crawler.extractor.ExtractorFactory;
-import org.codelibs.fess.crawler.service.DataService;
 import org.lastaflute.core.message.MessageManager;
 import org.lastaflute.di.core.SingletonLaContainer;
 import org.lastaflute.di.core.factory.SingletonLaContainerFactory;

+ 16 - 11
src/main/resources/fess_label.properties

@@ -170,7 +170,7 @@ labels.suggestBadWordFile=Bad Word File
 labels.menu_system=System
 labels.menu_wizard=Wizard
 labels.menu_crawl_config=General
-labels.menu_scheduled_job_config=Scheduled Jobs
+labels.menu_scheduled_job_config=Scheduled Job
 labels.menu_system_config=System
 labels.menu_document_config=Index
 labels.menu_design=Design
@@ -312,7 +312,7 @@ labels.footer_back_to_top=Back to top
 labels.header_brand_name=Fess
 labels.header_form_option_btn=Options
 labels.open_uri=Accessing {0}<br>At a first time starting, it might take a little more time to open the file.
-labels.file_crawling_configuration=File Crawling Configuration
+labels.file_crawling_configuration=File Crawling
 labels.file_crawling_title_details=File Crawling Configuration
 labels.included_paths=Included Paths For Crawling
 labels.excluded_paths=Excluded Paths For Crawling
@@ -343,7 +343,7 @@ labels.file_crawling_link_edit=Edit
 labels.file_crawling_link_delete=Delete
 labels.file_crawling_link_prev_page=Prev
 labels.file_crawling_link_next_page=Next
-labels.web_crawling_configuration=Web Crawling Configuration
+labels.web_crawling_configuration=Web Crawling
 labels.web_crawling_title_details=Web Crawling Configuration
 labels.included_urls=Included URLs For Crawling
 labels.excluded_urls=Excluded URLs For Crawling
@@ -405,7 +405,7 @@ labels.purge_user_info_day=Purge User Before
 labels.purge_by_bots=Bots Name For Purge
 labels.csv_file_encoding=Encoding for CSV
 labels.notification_to=Notification Email
-labels.path_mapping_configuration=Path Mapping Configuration
+labels.path_mapping_configuration=Path Mapping
 labels.path_mapping_title_details=Path Mapping
 labels.path_mapping_button_create=Create
 labels.path_mapping_button_back=Back
@@ -433,7 +433,7 @@ labels.path_mapping_link_edit=Edit
 labels.path_mapping_link_delete=Delete
 labels.path_mapping_link_prev_page=Prev
 labels.path_mapping_link_next_page=Next
-labels.overlapping_host_configuration=Overlapping Host Configuration
+labels.overlapping_host_configuration=Overlapping Host
 labels.overlapping_host_title_details=Overlapping Host
 labels.overlapping_host_button_create=Create
 labels.overlapping_host_button_back=Back
@@ -734,7 +734,7 @@ labels.design_delete_confirmation=Do you want to delete it?
 labels.design_title_edit_content=Edit Page View File
 labels.design_button_update=Update
 labels.design_button_back=Back
-labels.data_crawling_configuration=Data Crawling Configuration
+labels.data_crawling_configuration=Data Crawling
 labels.data_crawling_title_details=Data Crawling Configuration
 labels.handler_name=Handler Name
 labels.handler_parameter=Parameter
@@ -760,9 +760,9 @@ labels.data_crawling_link_delete=Delete
 labels.data_crawling_link_prev_page=Prev
 labels.data_crawling_link_next_page=Next
 labels.wizard_title_configuration=Configuration Wizard
-labels.wizard_start_title=Configuration Wizard
+labels.wizard_start_title=Quick Setup
 labels.wizard_start_desc=Using Configuration Wizard, you can create crawling settings easily.
-labels.wizard_start_button=Start
+labels.wizard_start_button=Start Configuration
 labels.wizard_schedule_title=Crawling Schedule
 labels.wizard_schedule_enabled=Use Schedule
 labels.wizard_schedule=Schedule
@@ -779,10 +779,11 @@ labels.wizard_button_skip=Skip
 labels.wizard_button_cancel=Cancel
 labels.wizard_button_back=Back
 labels.wizard_crawling_config_title=Crawling Configuration
+labels.wizard_crawling_setting_title=Crawling Setting
 labels.wizard_crawling_config_name=Name
 labels.wizard_crawling_config_path=Crawling Path
 labels.wizard_button_register_again=Create again
-labels.wizard_button_register_next=Create/Next
+labels.wizard_button_register_next=Create and Next
 labels.wizard_schedule_day_sun=Sun
 labels.wizard_schedule_day_mon=Mon
 labels.wizard_schedule_day_tue=Tue
@@ -794,9 +795,10 @@ labels.wizard_schedule_day_m_f=Mon-Fri
 labels.wizard_schedule_day_mwf=Mon,Wed,Fri
 labels.wizard_schedule_day_tt=Tue,Thu
 labels.wizard_start_crawling_title=Start Crawling
+labels.wizard_start_crawler_title=Crawler
 labels.wizard_start_crawling_desc=To click "Start Crawling" button, you can start a crawling now.
 labels.wizard_button_start_crawling=Start Crawling
-labels.wizard_button_finish=Finish
+labels.wizard_button_finish=Skip
 labels.search_list_configuration=Search Result
 labels.search_list_index_page=Type a search query.
 labels.search_list_title_confirm_delete=Delete Confirmation
@@ -940,7 +942,7 @@ labels.favorite_log_download_csv=Download (CSV)
 labels.favorite_log_search_term=Term
 labels.favorite_log_title_confirm=Details
 labels.favorite_log_id=ID
-labels.scheduledjob_configuration=Managed Jobs
+labels.scheduledjob_configuration=Job Scheduler
 labels.scheduledjob_title_details=Jobs
 labels.scheduledjob_button_create=Create
 labels.scheduledjob_button_back=Back
@@ -1232,3 +1234,6 @@ labels.crud_link_next_page=Next
 labels.crud_link_prev_page=Back
 labels.crud_title_details=Details
 labels.crud_title_confirm=Confirmation
+labels.admin_brand_title=Fess
+labels.admin_dashboard_title=Fess Dashboard
+labels.admin_toggle_navi=Toggle navigation

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/boostdocumentrule/confirm.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.boost_document_rule_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.boost_document_rule_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/boostdocumentrule/edit.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.boost_document_rule_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.boost_document_rule_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/boostdocumentrule/error.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.boost_document_rule_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.boost_document_rule_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/boostdocumentrule/index.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.boost_document_rule_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.boost_document_rule_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

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

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.crawler_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.crawler_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/crawlingsession/confirm.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.crawling_session_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.crawling_session_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/crawlingsession/error.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.crawling_session_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.crawling_session_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/crawlingsession/index.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.crawling_session_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.crawling_session_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/dataconfig/confirm.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.data_crawling_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.data_crawling_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/dataconfig/edit.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.data_crawling_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.data_crawling_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/dataconfig/error.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.data_crawling_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.data_crawling_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/dataconfig/index.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.data_crawling_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.data_crawling_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

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

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.design_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.design_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

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

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.design_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.design_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/dict/error.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.dict_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/dict/index.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.dict_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/dict/kuromoji/confirm.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.dict_kuromoji_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_kuromoji_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/dict/kuromoji/download.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.dict_kuromoji_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_kuromoji_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/dict/kuromoji/edit.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.dict_kuromoji_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_kuromoji_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/dict/kuromoji/error.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.dict_kuromoji_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_kuromoji_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/dict/kuromoji/index.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.dict_kuromoji_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_kuromoji_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/dict/kuromoji/upload.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.dict_kuromoji_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_kuromoji_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

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

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.dict_synonym_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_synonym_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

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

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.dict_synonym_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_synonym_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

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

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.dict_synonym_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_synonym_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/dict/synonym/error.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.dict_synonym_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_synonym_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/dict/synonym/index.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.dict_synonym_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_synonym_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

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

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.dict_synonym_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_synonym_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/failureurl/confirm.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.failure_url_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.failure_url_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/failureurl/error.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.failure_url_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.failure_url_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/failureurl/index.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.failure_url_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.failure_url_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/fileauthentication/confirm.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.file_authentication_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.file_authentication_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/fileauthentication/edit.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.file_authentication_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.file_authentication_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/fileauthentication/error.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.file_authentication_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.file_authentication_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/fileauthentication/index.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.file_authentication_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.file_authentication_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/fileconfig/confirm.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.file_crawling_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.file_crawling_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/fileconfig/edit.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.file_crawling_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.file_crawling_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/fileconfig/error.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.file_crawling_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.file_crawling_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/fileconfig/index.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.file_crawling_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.file_crawling_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/group/confirm.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.group_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.group_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/group/edit.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.group_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.group_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/group/error.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.group_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.group_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/group/index.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.group_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.group_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/joblog/confirm.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.joblog_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.joblog_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/joblog/error.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.joblog_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.joblog_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/joblog/index.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.joblog_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.joblog_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/keymatch/confirm.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.key_match_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.key_match_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/keymatch/edit.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.key_match_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.key_match_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/keymatch/error.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.key_match_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.key_match_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/keymatch/index.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.key_match_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.key_match_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/labeltype/confirm.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.labeltype_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.labeltype_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/labeltype/edit.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.labeltype_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.labeltype_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/labeltype/error.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.labeltype_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.labeltype_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/labeltype/index.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.labeltype_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.labeltype_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/log/index.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.log_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.log_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/overlappinghost/confirm.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.overlapping_host_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.overlapping_host_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/overlappinghost/edit.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.overlapping_host_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.overlapping_host_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/overlappinghost/error.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.overlapping_host_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.overlapping_host_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/overlappinghost/index.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.overlapping_host_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.overlapping_host_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/pathmapping/confirm.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.path_mapping_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.path_mapping_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/pathmapping/edit.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.path_mapping_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.path_mapping_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/pathmapping/error.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.path_mapping_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.path_mapping_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/pathmapping/index.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.path_mapping_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.path_mapping_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/requestheader/confirm.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.request_header_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.request_header_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/requestheader/edit.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.request_header_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.request_header_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/requestheader/error.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.request_header_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.request_header_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/requestheader/index.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.request_header_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.request_header_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/role/confirm.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.role_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.role_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/role/edit.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.role_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.role_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/role/error.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.role_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.role_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/role/index.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.role_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.role_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/roletype/confirm.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.roletype_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.roletype_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/roletype/edit.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.roletype_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.roletype_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/roletype/error.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.roletype_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.roletype_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/roletype/index.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.roletype_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.roletype_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/scheduledjob/confirm.jsp

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Fess | <la:message key="labels.scheduledjob_configuration" /></title>
+<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.scheduledjob_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">

Some files were not shown because too many files changed in this diff