rename jsp and labels

src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java

@@ -268,8 +268,7 @@ public class AdminFileauthAction extends FessAdminAction {
     protected void registerProtocolSchemeItems(final RenderData data) {
         final List<Map<String, String>> itemList = new ArrayList<Map<String, String>>();
         final Locale locale = LaRequestUtil.getRequest().getLocale();
-        itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.file_authentication_scheme_samba"),
-                Constants.SAMBA));
+        itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.file_auth_scheme_samba"), Constants.SAMBA));
         data.register("protocolSchemeItems", itemList);
     }
 

src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java

@@ -269,12 +269,9 @@ public class AdminReqheaderAction extends FessAdminAction {
     protected void registerProtocolSchemeItems(final RenderData data) {
         final List<Map<String, String>> itemList = new ArrayList<Map<String, String>>();
         final Locale locale = LaRequestUtil.getRequest().getLocale();
-        itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.web_authentication_scheme_basic"),
-                Constants.BASIC));
-        itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.web_authentication_scheme_digest"),
-                Constants.DIGEST));
-        itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.web_authentication_scheme_ntlm"),
-                Constants.NTLM));
+        itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.webauth_scheme_basic"), Constants.BASIC));
+        itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.webauth_scheme_digest"), Constants.DIGEST));
+        itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.webauth_scheme_ntlm"), Constants.NTLM));
         data.register("protocolSchemeItems", itemList);
     }
 

src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java

@@ -268,12 +268,9 @@ public class AdminWebauthAction extends FessAdminAction {
     protected void registerProtocolSchemeItems(final RenderData data) {
         final List<Map<String, String>> itemList = new ArrayList<Map<String, String>>();
         final Locale locale = LaRequestUtil.getRequest().getLocale();
-        itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.web_authentication_scheme_basic"),
-                Constants.BASIC));
-        itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.web_authentication_scheme_digest"),
-                Constants.DIGEST));
-        itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.web_authentication_scheme_ntlm"),
-                Constants.NTLM));
+        itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.webauth_scheme_basic"), Constants.BASIC));
+        itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.webauth_scheme_digest"), Constants.DIGEST));
+        itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.webauth_scheme_ntlm"), Constants.NTLM));
         data.register("protocolSchemeItems", itemList);
     }
 

src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java

@@ -94,7 +94,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         final int from;
         final int size;
         if (cb.isFetchScopeEffective()) {
-            from = cb.getPageStartIndex();
+            from = cb.getFetchStartIndex();
             size = cb.getFetchSize();
         } else {
             from = 0;

src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java

@@ -94,7 +94,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         final int from;
         final int size;
         if (cb.isFetchScopeEffective()) {
-            from = cb.getPageStartIndex();
+            from = cb.getFetchStartIndex();
             size = cb.getFetchSize();
         } else {
             from = 0;

src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java

@@ -94,7 +94,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         final int from;
         final int size;
         if (cb.isFetchScopeEffective()) {
-            from = cb.getPageStartIndex();
+            from = cb.getFetchStartIndex();
             size = cb.getFetchSize();
         } else {
             from = 0;

src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java

@@ -1053,22 +1053,22 @@ public class FessLabels extends ActionMessages {
     public static final String LABELS_notification_to = "{labels.notification_to}";
 
     /** The key of the message: Path Mapping */
-    public static final String LABELS_path_mapping_configuration = "{labels.path_mapping_configuration}";
+    public static final String LABELS_pathmap_configuration = "{labels.pathmap_configuration}";
 
     /** The key of the message: Path Mapping */
-    public static final String LABELS_path_mapping_title_details = "{labels.path_mapping_title_details}";
+    public static final String LABELS_pathmap_title_details = "{labels.pathmap_title_details}";
 
     /** The key of the message: Disabled */
     public static final String LABELS_DISABLED = "{labels.disabled}";
 
     /** The key of the message: Crawling */
-    public static final String LABELS_path_mapping_pt_crawling = "{labels.path_mapping_pt_crawling}";
+    public static final String LABELS_pathmap_pt_crawling = "{labels.pathmap_pt_crawling}";
 
     /** The key of the message: Displaying */
-    public static final String LABELS_path_mapping_pt_displaying = "{labels.path_mapping_pt_displaying}";
+    public static final String LABELS_pathmap_pt_displaying = "{labels.pathmap_pt_displaying}";
 
     /** The key of the message: Crawling/Displaying */
-    public static final String LABELS_path_mapping_pt_both = "{labels.path_mapping_pt_both}";
+    public static final String LABELS_pathmap_pt_both = "{labels.pathmap_pt_both}";
 
     /** The key of the message: Regular Name */
     public static final String LABELS_regular_name = "{labels.regular_name}";
@@ -1179,55 +1179,55 @@ public class FessLabels extends ActionMessages {
     public static final String LABELS_crawling_session_DataIndexSize = "{labels.crawling_session_DataIndexSize}";
 
     /** The key of the message: Web Authentication */
-    public static final String LABELS_web_authentication_configuration = "{labels.web_authentication_configuration}";
+    public static final String LABELS_webauth_configuration = "{labels.webauth_configuration}";
 
     /** The key of the message: Hostname */
-    public static final String LABELS_web_authentication_list_hostname = "{labels.web_authentication_list_hostname}";
+    public static final String LABELS_webauth_list_hostname = "{labels.webauth_list_hostname}";
 
     /** The key of the message: Config Name */
-    public static final String LABELS_web_authentication_list_web_crawling_config = "{labels.web_authentication_list_web_crawling_config}";
+    public static final String LABELS_webauth_list_web_crawling_config = "{labels.webauth_list_web_crawling_config}";
 
     /** The key of the message: Any */
-    public static final String LABELS_web_authentication_any = "{labels.web_authentication_any}";
+    public static final String LABELS_webauth_any = "{labels.webauth_any}";
 
     /** The key of the message: Create New Web Config */
-    public static final String LABELS_web_authentication_create_web_config = "{labels.web_authentication_create_web_config}";
+    public static final String LABELS_webauth_create_web_config = "{labels.webauth_create_web_config}";
 
     /** The key of the message: Web Authentication */
-    public static final String LABELS_web_authentication_title_details = "{labels.web_authentication_title_details}";
+    public static final String LABELS_webauth_title_details = "{labels.webauth_title_details}";
 
     /** The key of the message: Hostname */
-    public static final String LABELS_web_authentication_hostname = "{labels.web_authentication_hostname}";
+    public static final String LABELS_webauth_hostname = "{labels.webauth_hostname}";
 
     /** The key of the message: Port */
-    public static final String LABELS_web_authentication_port = "{labels.web_authentication_port}";
+    public static final String LABELS_webauth_port = "{labels.webauth_port}";
 
     /** The key of the message: Realm */
-    public static final String LABELS_web_authentication_realm = "{labels.web_authentication_realm}";
+    public static final String LABELS_webauth_realm = "{labels.webauth_realm}";
 
     /** The key of the message: Scheme */
-    public static final String LABELS_web_authentication_scheme = "{labels.web_authentication_scheme}";
+    public static final String LABELS_webauth_scheme = "{labels.webauth_scheme}";
 
     /** The key of the message: Username */
-    public static final String LABELS_web_authentication_username = "{labels.web_authentication_username}";
+    public static final String LABELS_webauth_username = "{labels.webauth_username}";
 
     /** The key of the message: Password */
-    public static final String LABELS_web_authentication_password = "{labels.web_authentication_password}";
+    public static final String LABELS_webauth_password = "{labels.webauth_password}";
 
     /** The key of the message: Parameters */
-    public static final String LABELS_web_authentication_parameters = "{labels.web_authentication_parameters}";
+    public static final String LABELS_webauth_parameters = "{labels.webauth_parameters}";
 
     /** The key of the message: Web Config */
-    public static final String LABELS_web_authentication_web_crawling_config = "{labels.web_authentication_web_crawling_config}";
+    public static final String LABELS_webauth_web_crawling_config = "{labels.webauth_web_crawling_config}";
 
     /** The key of the message: Basic */
-    public static final String LABELS_web_authentication_scheme_basic = "{labels.web_authentication_scheme_basic}";
+    public static final String LABELS_webauth_scheme_basic = "{labels.webauth_scheme_basic}";
 
     /** The key of the message: Digest */
-    public static final String LABELS_web_authentication_scheme_digest = "{labels.web_authentication_scheme_digest}";
+    public static final String LABELS_webauth_scheme_digest = "{labels.webauth_scheme_digest}";
 
     /** The key of the message: NTLM */
-    public static final String LABELS_web_authentication_scheme_ntlm = "{labels.web_authentication_scheme_ntlm}";
+    public static final String LABELS_webauth_scheme_ntlm = "{labels.webauth_scheme_ntlm}";
 
     /** The key of the message: Log Files */
     public static final String LABELS_log_configuration = "{labels.log_configuration}";
@@ -1576,47 +1576,46 @@ public class FessLabels extends ActionMessages {
             "{labels.system_info_crawler_properties_does_not_exist}";
 
     /** The key of the message: File Authentication */
-    public static final String LABELS_file_authentication_configuration = "{labels.file_authentication_configuration}";
+    public static final String LABELS_file_auth_configuration = "{labels.file_auth_configuration}";
 
     /** The key of the message: Hostname */
-    public static final String LABELS_file_authentication_list_hostname = "{labels.file_authentication_list_hostname}";
+    public static final String LABELS_file_auth_list_hostname = "{labels.file_auth_list_hostname}";
 
     /** The key of the message: Config Name */
-    public static final String LABELS_file_authentication_list_file_crawling_config =
-            "{labels.file_authentication_list_file_crawling_config}";
+    public static final String LABELS_file_auth_list_file_crawling_config = "{labels.file_auth_list_file_crawling_config}";
 
     /** The key of the message: Any */
-    public static final String LABELS_file_authentication_any = "{labels.file_authentication_any}";
+    public static final String LABELS_file_auth_any = "{labels.file_auth_any}";
 
     /** The key of the message: Create New File Config */
-    public static final String LABELS_file_authentication_create_file_config = "{labels.file_authentication_create_file_config}";
+    public static final String LABELS_file_auth_create_file_config = "{labels.file_auth_create_file_config}";
 
     /** The key of the message: File Authentication */
-    public static final String LABELS_file_authentication_title_details = "{labels.file_authentication_title_details}";
+    public static final String LABELS_file_auth_title_details = "{labels.file_auth_title_details}";
 
     /** The key of the message: Hostname */
-    public static final String LABELS_file_authentication_hostname = "{labels.file_authentication_hostname}";
+    public static final String LABELS_file_auth_hostname = "{labels.file_auth_hostname}";
 
     /** The key of the message: Port */
-    public static final String LABELS_file_authentication_port = "{labels.file_authentication_port}";
+    public static final String LABELS_file_auth_port = "{labels.file_auth_port}";
 
     /** The key of the message: Scheme */
-    public static final String LABELS_file_authentication_scheme = "{labels.file_authentication_scheme}";
+    public static final String LABELS_file_auth_scheme = "{labels.file_auth_scheme}";
 
     /** The key of the message: Username */
-    public static final String LABELS_file_authentication_username = "{labels.file_authentication_username}";
+    public static final String LABELS_file_auth_username = "{labels.file_auth_username}";
 
     /** The key of the message: Password */
-    public static final String LABELS_file_authentication_password = "{labels.file_authentication_password}";
+    public static final String LABELS_file_auth_password = "{labels.file_auth_password}";
 
     /** The key of the message: Parameters */
-    public static final String LABELS_file_authentication_parameters = "{labels.file_authentication_parameters}";
+    public static final String LABELS_file_auth_parameters = "{labels.file_auth_parameters}";
 
     /** The key of the message: FS Config */
-    public static final String LABELS_file_authentication_file_crawling_config = "{labels.file_authentication_file_crawling_config}";
+    public static final String LABELS_file_auth_file_crawling_config = "{labels.file_auth_file_crawling_config}";
 
     /** The key of the message: Samba */
-    public static final String LABELS_file_authentication_scheme_samba = "{labels.file_authentication_scheme_samba}";
+    public static final String LABELS_file_auth_scheme_samba = "{labels.file_auth_scheme_samba}";
 
     /** The key of the message: {0}/{1} ({2} items) */
     public static final String LABELS_pagination_page_guide_msg = "{labels.pagination_page_guide_msg}";

src/main/resources/fess_label.properties

@@ -348,12 +348,12 @@ 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
-labels.path_mapping_title_details=Path Mapping
+labels.pathmap_configuration=Path Mapping
+labels.pathmap_title_details=Path Mapping
 labels.disabled=Disabled
-labels.path_mapping_pt_crawling=Crawling
-labels.path_mapping_pt_displaying=Displaying
-labels.path_mapping_pt_both=Crawling/Displaying
+labels.pathmap_pt_crawling=Crawling
+labels.pathmap_pt_displaying=Displaying
+labels.pathmap_pt_both=Crawling/Displaying
 labels.regular_name=Regular Name
 labels.duplicate_name=Duplicate Name
 labels.duplicate_host_configuration=Duplicate Host
@@ -390,23 +390,23 @@ labels.crawling_session_DataCrawlStartTime=Crawl start time (Data store)
 labels.crawling_session_DataCrawlEndTime=Crawl end time (Data store)
 labels.crawling_session_DataIndexExecTime=Index exec time (Data store)
 labels.crawling_session_DataIndexSize=Index size (Data store)
-labels.web_authentication_configuration=Web Authentication
-labels.web_authentication_list_hostname=Hostname
-labels.web_authentication_list_web_crawling_config=Config Name
-labels.web_authentication_any=Any
-labels.web_authentication_create_web_config=Create New Web Config
-labels.web_authentication_title_details=Web Authentication
-labels.web_authentication_hostname=Hostname
-labels.web_authentication_port=Port
-labels.web_authentication_realm=Realm
-labels.web_authentication_scheme=Scheme
-labels.web_authentication_username=Username
-labels.web_authentication_password=Password
-labels.web_authentication_parameters=Parameters
-labels.web_authentication_web_crawling_config=Web Config
-labels.web_authentication_scheme_basic=Basic
-labels.web_authentication_scheme_digest=Digest
-labels.web_authentication_scheme_ntlm=NTLM
+labels.webauth_configuration=Web Authentication
+labels.webauth_list_hostname=Hostname
+labels.webauth_list_web_crawling_config=Config Name
+labels.webauth_any=Any
+labels.webauth_create_web_config=Create New Web Config
+labels.webauth_title_details=Web Authentication
+labels.webauth_hostname=Hostname
+labels.webauth_port=Port
+labels.webauth_realm=Realm
+labels.webauth_scheme=Scheme
+labels.webauth_username=Username
+labels.webauth_password=Password
+labels.webauth_parameters=Parameters
+labels.webauth_web_crawling_config=Web Config
+labels.webauth_scheme_basic=Basic
+labels.webauth_scheme_digest=Digest
+labels.webauth_scheme_ntlm=NTLM
 labels.log_configuration=Log Files
 labels.log_file_name=File Name
 labels.log_file_date=Timestamp
@@ -523,20 +523,20 @@ labels.system_info_prop_title=System Properties
 labels.system_info_fess_prop_title=Fess Properties
 labels.system_info_bug_report_title=Properties for Bug Report
 labels.system_info_crawler_properties_does_not_exist=crawler.properties does not exist. Default values are applied.
-labels.file_authentication_configuration=File Authentication
-labels.file_authentication_list_hostname=Hostname
-labels.file_authentication_list_file_crawling_config=Config Name
-labels.file_authentication_any=Any
-labels.file_authentication_create_file_config=Create New File Config
-labels.file_authentication_title_details=File Authentication
-labels.file_authentication_hostname=Hostname
-labels.file_authentication_port=Port
-labels.file_authentication_scheme=Scheme
-labels.file_authentication_username=Username
-labels.file_authentication_password=Password
-labels.file_authentication_parameters=Parameters
-labels.file_authentication_file_crawling_config=FS Config
-labels.file_authentication_scheme_samba=Samba
+labels.file_auth_configuration=File Authentication
+labels.file_auth_list_hostname=Hostname
+labels.file_auth_list_file_crawling_config=Config Name
+labels.file_auth_any=Any
+labels.file_auth_create_file_config=Create New File Config
+labels.file_auth_title_details=File Authentication
+labels.file_auth_hostname=Hostname
+labels.file_auth_port=Port
+labels.file_auth_scheme=Scheme
+labels.file_auth_username=Username
+labels.file_auth_password=Password
+labels.file_auth_parameters=Parameters
+labels.file_auth_file_crawling_config=FS Config
+labels.file_auth_scheme_samba=Samba
 labels.pagination_page_guide_msg={0}/{1} ({2} items)
 labels.list_could_not_find_crud_table=No data.
 labels.scheduledjob_configuration=Job Scheduler

src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth.jsp

@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.file_authentication_configuration" /></title>
+		key="labels.file_auth_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">
@@ -16,7 +16,7 @@
 		<div class="content-wrapper">
 			<section class="content-header">
 				<h1>
-					<la:message key="labels.file_authentication_configuration" />
+					<la:message key="labels.file_auth_configuration" />
 				</h1>
 				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
@@ -26,7 +26,7 @@
 						<c:if test="${!displayCreateLink}">
 							<la:link href="/admin/fileconfig/" styleClass="btn btn-primary">
 								<i class="fa fa-arrow-circle-right"></i>
-								<la:message key="labels.file_authentication_create_file_config" />
+								<la:message key="labels.file_auth_create_file_config" />
 							</la:link>
 						</c:if>
 						<c:if test="${displayCreateLink}">
@@ -58,21 +58,21 @@
 											<thead>
 												<tr>
 													<th><la:message
-															key="labels.file_authentication_list_hostname" /></th>
+															key="labels.file_auth_list_hostname" /></th>
 													<th><la:message
-															key="labels.file_authentication_list_file_crawling_config" /></th>
+															key="labels.file_auth_list_file_crawling_config" /></th>
 												</tr>
 											</thead>
 											<tbody>
 												<c:forEach var="data" varStatus="s"
 													items="${fileAuthenticationItems}">
 													<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
-														data-href="${contextPath}/admin/fileauthentication/details/4/${f:u(data.id)}">
+														data-href="${contextPath}/admin/fileauth/details/4/${f:u(data.id)}">
 														<td><c:if
 																test="${data.hostname==null||data.hostname==''}">
-																<la:message key="labels.file_authentication_any" />
+																<la:message key="labels.file_auth_any" />
 															</c:if> ${f:h(data.hostname)}: <c:if test="${data.port==-1}">
-																<la:message key="labels.file_authentication_any" />
+																<la:message key="labels.file_auth_any" />
 															</c:if> <c:if test="${data.port!=-1}">
 																${f:h(data.port)}
 															</c:if></td>

src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth_details.jsp

@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.file_authentication_configuration" /></title>
+		key="labels.file_auth_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">
@@ -16,7 +16,7 @@
 		<div class="content-wrapper">
 			<section class="content-header">
 				<h1>
-					<la:message key="labels.file_authentication_title_details" />
+					<la:message key="labels.file_auth_title_details" />
 				</h1>
 				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
@@ -51,15 +51,15 @@
 										<tbody>
 											<tr>
 												<th class="col-xs-2"><la:message
-														key="labels.file_authentication_hostname" /></th>
+														key="labels.file_auth_hostname" /></th>
 												<td>${f:h(hostname)}<la:hidden property="hostname" /></td>
 											</tr>
 											<tr>
-												<th><la:message key="labels.file_authentication_port" /></th>
+												<th><la:message key="labels.file_auth_port" /></th>
 												<td>${f:h(port)}<la:hidden property="port" /></td>
 											</tr>
 											<tr>
-												<th><la:message key="labels.file_authentication_scheme" /></th>
+												<th><la:message key="labels.file_auth_scheme" /></th>
 												<td><c:forEach var="item"
 														items="${protocolSchemeItems}">
 														<c:if test="${protocolScheme==item.value}">${f:h(item.label)}</c:if>
@@ -67,24 +67,24 @@
 											</tr>
 											<tr>
 												<th><la:message
-														key="labels.file_authentication_username" /></th>
+														key="labels.file_auth_username" /></th>
 												<td>${f:h(username)}<la:hidden property="username" /></td>
 											</tr>
 											<tr>
 												<th><la:message
-														key="labels.file_authentication_password" /></th>
+														key="labels.file_auth_password" /></th>
 												<td><c:if test="${password!=''}">******</c:if> <la:hidden
 														property="password" /></td>
 											</tr>
 											<tr>
 												<th><la:message
-														key="labels.file_authentication_parameters" /></th>
+														key="labels.file_auth_parameters" /></th>
 												<td>${f:br(f:h(parameters))}<la:hidden
 														property="parameters" /></td>
 											</tr>
 											<tr>
 												<th><la:message
-														key="labels.file_authentication_file_crawling_config" /></th>
+														key="labels.file_auth_file_crawling_config" /></th>
 												<td><c:forEach var="item" items="${fileConfigItems}">
 														<c:if test="${fileConfigId==item.value}">${f:h(item.label)}</c:if>
 													</c:forEach> <la:hidden property="fileConfigId" /></td>

src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth_edit.jsp

@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.file_authentication_configuration" /></title>
+		key="labels.file_auth_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">
@@ -16,7 +16,7 @@
 		<div class="content-wrapper">
 			<section class="content-header">
 				<h1>
-					<la:message key="labels.file_authentication_title_details" />
+					<la:message key="labels.file_auth_title_details" />
 				</h1>
 				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
@@ -49,21 +49,21 @@
 									<%-- Form Fields --%>
 									<div class="form-group">
 										<label for="hostname" class="col-sm-3 control-label"><la:message
-												key="labels.file_authentication_hostname" /></label>
+												key="labels.file_auth_hostname" /></label>
 										<div class="col-sm-9">
 											<la:text property="hostname" styleClass="form-control" />
 										</div>
 									</div>
 									<div class="form-group">
 										<label for="port" class="col-sm-3 control-label"><la:message
-												key="labels.file_authentication_port" /></label>
+												key="labels.file_auth_port" /></label>
 										<div class="col-sm-9">
 											<la:text property="port" styleClass="form-control" />
 										</div>
 									</div>
 									<div class="form-group">
 										<label for="protocolScheme" class="col-sm-3 control-label"><la:message
-												key="labels.file_authentication_scheme" /></label>
+												key="labels.file_auth_scheme" /></label>
 										<div class="col-sm-9">
 											<la:select property="protocolScheme"
 												styleClass="form-control">
@@ -75,21 +75,21 @@
 									</div>
 									<div class="form-group">
 										<label for="username" class="col-sm-3 control-label"><la:message
-												key="labels.file_authentication_username" /></label>
+												key="labels.file_auth_username" /></label>
 										<div class="col-sm-9">
 											<la:text property="username" styleClass="form-control" />
 										</div>
 									</div>
 									<div class="form-group">
 										<label for="password" class="col-sm-3 control-label"><la:message
-												key="labels.file_authentication_password" /></label>
+												key="labels.file_auth_password" /></label>
 										<div class="col-sm-9">
 											<la:password property="password" styleClass="form-control" />
 										</div>
 									</div>
 									<div class="form-group">
 										<label for="parameters" class="col-sm-3 control-label"><la:message
-												key="labels.file_authentication_parameters" /></label>
+												key="labels.file_auth_parameters" /></label>
 										<div class="col-sm-9">
 											<la:textarea property="parameters" styleClass="form-control"
 												rows="5" />
@@ -97,7 +97,7 @@
 									</div>
 									<div class="form-group">
 										<label for="fileConfigId" class="col-sm-3 control-label"><la:message
-												key="labels.file_authentication_file_crawling_config" /></label>
+												key="labels.file_auth_file_crawling_config" /></label>
 										<div class="col-sm-9">
 											<la:select property="fileConfigId" styleClass="form-control">
 												<c:forEach var="item" items="${fileConfigItems}">

src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap.jsp

@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.path_mapping_configuration" /></title>
+		key="labels.pathmap_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">
@@ -16,7 +16,7 @@
 		<div class="content-wrapper">
 			<section class="content-header">
 				<h1>
-					<la:message key="labels.path_mapping_configuration" />
+					<la:message key="labels.pathmap_configuration" />
 				</h1>
 				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
@@ -60,7 +60,7 @@
 													<c:forEach var="data" varStatus="s"
 														items="${pathMappingItems}">
 														<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
-															data-href="${contextPath}/admin/pathmapping/details/4/${f:u(data.id)}">
+															data-href="${contextPath}/admin/pathmap/details/4/${f:u(data.id)}">
 															<td>${f:h(data.regex)}</td>
 															<td>${f:h(data.replacement)}</td>
 														</tr>

src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap_details.jsp

@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.path_mapping_configuration" /></title>
+		key="labels.pathmap_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">
@@ -16,7 +16,7 @@
 		<div class="content-wrapper">
 			<section class="content-header">
 				<h1>
-					<la:message key="labels.path_mapping_title_details" />
+					<la:message key="labels.pathmap_title_details" />
 				</h1>
 				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
@@ -61,11 +61,11 @@
 											<tr>
 												<th><la:message key="labels.processType" /></th>
 												<td><c:if test="${processType=='C'}">
-														<la:message key="labels.path_mapping_pt_crawling" />
+														<la:message key="labels.pathmap_pt_crawling" />
 													</c:if> <c:if test="${processType=='D'}">
-														<la:message key="labels.path_mapping_pt_displaying" />
+														<la:message key="labels.pathmap_pt_displaying" />
 													</c:if> <c:if test="${processType=='B'}">
-														<la:message key="labels.path_mapping_pt_both" />
+														<la:message key="labels.pathmap_pt_both" />
 													</c:if> <la:hidden property="processType" /></td>
 											</tr>
 											<tr>

src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap_edit.jsp

@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.path_mapping_configuration" /></title>
+		key="labels.pathmap_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">
@@ -17,7 +17,7 @@
 			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
-					<la:message key="labels.path_mapping_title_details" />
+					<la:message key="labels.pathmap_title_details" />
 				</h1>
 				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
@@ -68,13 +68,13 @@
 										<div class="col-sm-9">
 											<la:select property="processType" styleClass="form-control">
 												<la:option value="C">
-													<la:message key="labels.path_mapping_pt_crawling" />
+													<la:message key="labels.pathmap_pt_crawling" />
 												</la:option>
 												<la:option value="D">
-													<la:message key="labels.path_mapping_pt_displaying" />
+													<la:message key="labels.pathmap_pt_displaying" />
 												</la:option>
 												<la:option value="B">
-													<la:message key="labels.path_mapping_pt_both" />
+													<la:message key="labels.pathmap_pt_both" />
 												</la:option>
 											</la:select>
 										</div>

src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth.jsp

@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.web_authentication_configuration" /></title>
+		key="labels.webauth_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">
@@ -16,7 +16,7 @@
 		<div class="content-wrapper">
 			<section class="content-header">
 				<h1>
-					<la:message key="labels.web_authentication_configuration" />
+					<la:message key="labels.webauth_configuration" />
 				</h1>
 				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
@@ -26,7 +26,7 @@
 						<c:if test="${!displayCreateLink}">
 							<la:link href="../webconfig/" styleClass="btn btn-primary">
 								<i class="fa fa-arrow-circle-right"></i>
-								<la:message key="labels.web_authentication_create_web_config" />
+								<la:message key="labels.webauth_create_web_config" />
 							</la:link>
 						</c:if>
 						<c:if test="${displayCreateLink}">
@@ -58,21 +58,21 @@
 											<thead>
 												<tr>
 													<th><la:message
-															key="labels.web_authentication_list_hostname" /></th>
+															key="labels.webauth_list_hostname" /></th>
 													<th><la:message
-															key="labels.web_authentication_list_web_crawling_config" /></th>
+															key="labels.webauth_list_web_crawling_config" /></th>
 												</tr>
 											</thead>
 											<tbody>
 												<c:forEach var="data" varStatus="s"
 													items="${webAuthenticationItems}">
 													<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
-														data-href="${contextPath}/admin/webauthentication/details/4/${f:u(data.id)}">
+														data-href="${contextPath}/admin/webauth/details/4/${f:u(data.id)}">
 														<td><c:if
 																test="${data.hostname==null||data.hostname==''}">
-																<la:message key="labels.web_authentication_any" />
+																<la:message key="labels.webauth_any" />
 															</c:if> ${f:h(data.hostname)}: <c:if test="${data.port==-1}">
-																<la:message key="labels.web_authentication_any" />
+																<la:message key="labels.webauth_any" />
 															</c:if> <c:if test="${data.port!=-1}">
 																${f:h(data.port)}
 															</c:if></td>

src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth_details.jsp

@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.web_authentication_configuration" /></title>
+		key="labels.webauth_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">
@@ -16,7 +16,7 @@
 		<div class="content-wrapper">
 			<section class="content-header">
 				<h1>
-					<la:message key="labels.web_authentication_title_details" />
+					<la:message key="labels.webauth_title_details" />
 				</h1>
 				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
@@ -51,19 +51,19 @@
 										<tbody>
 											<tr>
 												<th class="col-xs-2"><la:message
-														key="labels.web_authentication_hostname" /></th>
+														key="labels.webauth_hostname" /></th>
 												<td>${f:h(hostname)}<la:hidden property="hostname" /></td>
 											</tr>
 											<tr>
-												<th><la:message key="labels.web_authentication_port" /></th>
+												<th><la:message key="labels.webauth_port" /></th>
 												<td>${f:h(port)}<la:hidden property="port" /></td>
 											</tr>
 											<tr>
-												<th><la:message key="labels.web_authentication_realm" /></th>
+												<th><la:message key="labels.webauth_realm" /></th>
 												<td>${f:h(authRealm)}<la:hidden property="authRealm" /></td>
 											</tr>
 											<tr>
-												<th><la:message key="labels.web_authentication_scheme" /></th>
+												<th><la:message key="labels.webauth_scheme" /></th>
 												<td><c:forEach var="item"
 														items="${protocolSchemeItems}">
 														<c:if test="${protocolScheme==item.value}">${f:h(item.label)}</c:if>
@@ -71,24 +71,24 @@
 											</tr>
 											<tr>
 												<th><la:message
-														key="labels.web_authentication_username" /></th>
+														key="labels.webauth_username" /></th>
 												<td>${f:h(username)}<la:hidden property="username" /></td>
 											</tr>
 											<tr>
 												<th><la:message
-														key="labels.web_authentication_password" /></th>
+														key="labels.webauth_password" /></th>
 												<td><c:if test="${password!=''}">******</c:if> <la:hidden
 														property="password" /></td>
 											</tr>
 											<tr>
 												<th><la:message
-														key="labels.web_authentication_parameters" /></th>
+														key="labels.webauth_parameters" /></th>
 												<td>${f:br(f:h(parameters))}<la:hidden
 														property="parameters" /></td>
 											</tr>
 											<tr>
 												<th><la:message
-														key="labels.web_authentication_web_crawling_config" /></th>
+														key="labels.webauth_web_crawling_config" /></th>
 												<td><c:forEach var="item" items="${webConfigItems}">
 														<c:if test="${webConfigId==item.value}">${f:h(item.label)}</c:if>
 													</c:forEach> <la:hidden property="webConfigId" /></td>

src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth_edit.jsp

@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.web_authentication_configuration" /></title>
+		key="labels.webauth_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">
@@ -16,7 +16,7 @@
 		<div class="content-wrapper">
 			<section class="content-header">
 				<h1>
-					<la:message key="labels.web_authentication_title_details" />
+					<la:message key="labels.webauth_title_details" />
 				</h1>
 				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
@@ -49,28 +49,28 @@
 									<%-- Form Fields --%>
 									<div class="form-group">
 										<label for="hostname" class="col-sm-3 control-label"><la:message
-												key="labels.web_authentication_hostname" /></label>
+												key="labels.webauth_hostname" /></label>
 										<div class="col-sm-9">
 											<la:text property="hostname" styleClass="form-control" />
 										</div>
 									</div>
 									<div class="form-group">
 										<label for="port" class="col-sm-3 control-label"><la:message
-												key="labels.web_authentication_port" /></label>
+												key="labels.webauth_port" /></label>
 										<div class="col-sm-9">
 											<la:text property="port" styleClass="form-control" />
 										</div>
 									</div>
 									<div class="form-group">
 										<label for="authRealm" class="col-sm-3 control-label"><la:message
-												key="labels.web_authentication_realm" /></label>
+												key="labels.webauth_realm" /></label>
 										<div class="col-sm-9">
 											<la:text property="authRealm" styleClass="form-control" />
 										</div>
 									</div>
 									<div class="form-group">
 										<label for="protocolScheme" class="col-sm-3 control-label"><la:message
-												key="labels.web_authentication_scheme" /></label>
+												key="labels.webauth_scheme" /></label>
 										<div class="col-sm-9">
 											<la:select property="protocolScheme"
 												styleClass="form-control">
@@ -82,21 +82,21 @@
 									</div>
 									<div class="form-group">
 										<label for="username" class="col-sm-3 control-label"><la:message
-												key="labels.web_authentication_username" /></label>
+												key="labels.webauth_username" /></label>
 										<div class="col-sm-9">
 											<la:text property="username" styleClass="form-control" />
 										</div>
 									</div>
 									<div class="form-group">
 										<label for="password" class="col-sm-3 control-label"><la:message
-												key="labels.web_authentication_password" /></label>
+												key="labels.webauth_password" /></label>
 										<div class="col-sm-9">
 											<la:password property="password" styleClass="form-control" />
 										</div>
 									</div>
 									<div class="form-group">
 										<label for="parameters" class="col-sm-3 control-label"><la:message
-												key="labels.web_authentication_parameters" /></label>
+												key="labels.webauth_parameters" /></label>
 										<div class="col-sm-9">
 											<la:textarea property="parameters" styleClass="form-control"
 												rows="5" />
@@ -104,7 +104,7 @@
 									</div>
 									<div class="form-group">
 										<label for="webConfigId" class="col-sm-3 control-label"><la:message
-												key="labels.web_authentication_web_crawling_config" /></label>
+												key="labels.webauth_web_crawling_config" /></label>
 										<div class="col-sm-9">
 											<la:select property="webConfigId" styleClass="form-control">
 												<c:forEach var="item" items="${webConfigItems}">