diff --git a/src/main/config/es/fess_config.json b/src/main/config/es/fess_config.json
index 838b2954e726e5c31619546a5ebfdd97aaf9136c..d5ff25424c39b8a2bec60f108e5d1fe5415f8f69 100644
--- a/src/main/config/es/fess_config.json
+++ b/src/main/config/es/fess_config.json
@@ -268,6 +268,9 @@
},
"userAgent" : {
"type": "keyword"
+ },
+ "virtualHosts" : {
+ "type": "keyword"
}
}
},
@@ -454,6 +457,9 @@
},
"updatedTime" : {
"type" : "long"
+ },
+ "virtualHosts" : {
+ "type": "keyword"
}
}
},
@@ -725,6 +731,9 @@
},
"updatedTime" : {
"type" : "long"
+ },
+ "virtualHosts" : {
+ "type": "keyword"
}
}
},
@@ -939,6 +948,9 @@
"properties" : {
"permissions" : {
"array" : "true"
+ },
+ "virtualHosts" : {
+ "array" : "true"
}
}
},
@@ -946,6 +958,9 @@
"properties" : {
"permissions" : {
"array" : "true"
+ },
+ "virtualHosts" : {
+ "array" : "true"
}
}
},
@@ -960,6 +975,9 @@
"properties" : {
"permissions" : {
"array" : "true"
+ },
+ "virtualHosts" : {
+ "array" : "true"
}
}
},
diff --git a/src/main/java/org/codelibs/fess/Constants.java b/src/main/java/org/codelibs/fess/Constants.java
index bf8173bb7e411de531c6d83cb716f7f0a44ce654..25536561797d17789c0466bd3ce6fdfe8baf4a81 100644
--- a/src/main/java/org/codelibs/fess/Constants.java
+++ b/src/main/java/org/codelibs/fess/Constants.java
@@ -407,6 +407,8 @@ public class Constants extends CoreLibConstants {
public static final String QUERIES = "queries";
+ public static final String VIRTUAL_HOSTS = "virtualHosts";
+
public static final String CIPHER_PREFIX = "{cipher}";
public static final String SYSTEM_USER = "system";
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java
index eb2a2200114bc8f82015159f4ee85d5492a1b574..05d9a7230f800e512afb36b18b02a414db79931d 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java
@@ -147,13 +147,16 @@ public class AdminDataconfigAction extends FessAdminAction {
entity -> {
copyBeanToBean(entity, form, copyOp -> {
copyOp.excludeNull();
- copyOp.exclude(Constants.PERMISSIONS);
+ copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
});
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
form.permissions =
stream(entity.getPermissions()).get(
stream -> stream.map(permissionHelper::decode).filter(StringUtil::isNotBlank).distinct()
.collect(Collectors.joining("\n")));
+ form.virtualHosts =
+ stream(entity.getVirtualHosts()).get(
+ stream -> stream.filter(StringUtil::isNotBlank).collect(Collectors.joining("\n")));
}).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asListHtml());
});
@@ -185,7 +188,7 @@ public class AdminDataconfigAction extends FessAdminAction {
entity -> {
copyBeanToBean(entity, form, copyOp -> {
copyOp.excludeNull();
- copyOp.exclude(Constants.PERMISSIONS);
+ copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
});
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
form.permissions =
@@ -193,6 +196,10 @@ public class AdminDataconfigAction extends FessAdminAction {
stream -> stream.map(s -> permissionHelper.decode(s))
.filter(StringUtil::isNotBlank).distinct()
.collect(Collectors.joining("\n")));
+ form.virtualHosts =
+ stream(entity.getVirtualHosts()).get(
+ stream -> stream.filter(StringUtil::isNotBlank).collect(
+ Collectors.joining("\n")));
form.crudMode = crudMode;
})
.orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id),
@@ -298,12 +305,17 @@ public class AdminDataconfigAction extends FessAdminAction {
entity -> {
entity.setUpdatedBy(username);
entity.setUpdatedTime(currentTime);
- copyBeanToBean(form, entity, op -> op.exclude(Stream.concat(Stream.of(Constants.COMMON_CONVERSION_RULE),
- Stream.of(Constants.PERMISSIONS)).toArray(n -> new String[n])));
+ copyBeanToBean(
+ form,
+ entity,
+ op -> op.exclude(Stream.concat(Stream.of(Constants.COMMON_CONVERSION_RULE),
+ Stream.of(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS)).toArray(n -> new String[n])));
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
entity.setPermissions(split(form.permissions, "\n").get(
stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).distinct()
.toArray(n -> new String[n])));
+ entity.setVirtualHosts(split(form.virtualHosts, "\n").get(
+ stream -> stream.filter(StringUtil::isNotBlank).distinct().toArray(n -> new String[n])));
return entity;
});
}
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java
index b2a4abfc32072052bb292eb62fce42d440eacdcd..2a0f1a49391d78834fe10b79458d12c97493c7c6 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java
@@ -64,6 +64,9 @@ public class CreateForm {
@CustomSize(maxKey = "form.admin.max.input.size")
public String permissions;
+ @CustomSize(maxKey = "form.admin.max.input.size")
+ public String virtualHosts;
+
@Required
@Min(value = 0)
@Max(value = 2147483647)
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java
index cde050b0628b01e8626fd1449625c54f58bea720..cc5d45d2dc58d82489f8659d9656e133a5ad191d 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java
@@ -143,12 +143,15 @@ public class AdminFileconfigAction extends FessAdminAction {
entity -> {
copyBeanToBean(entity, form, copyOp -> {
copyOp.excludeNull();
- copyOp.exclude(Constants.PERMISSIONS);
+ copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
});
form.permissions =
stream(entity.getPermissions()).get(
stream -> stream.map(permissionHelper::decode).filter(StringUtil::isNotBlank).distinct()
.collect(Collectors.joining("\n")));
+ form.virtualHosts =
+ stream(entity.getVirtualHosts()).get(
+ stream -> stream.filter(StringUtil::isNotBlank).collect(Collectors.joining("\n")));
})
.orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asListHtml()));
saveToken();
@@ -178,7 +181,7 @@ public class AdminFileconfigAction extends FessAdminAction {
entity -> {
copyBeanToBean(entity, form, copyOp -> {
copyOp.excludeNull();
- copyOp.exclude(Constants.PERMISSIONS);
+ copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
});
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
form.permissions =
@@ -186,6 +189,9 @@ public class AdminFileconfigAction extends FessAdminAction {
stream -> stream.map(s -> permissionHelper.decode(s))
.filter(StringUtil::isNotBlank).distinct()
.collect(Collectors.joining("\n")));
+ form.virtualHosts =
+ stream(entity.getVirtualHosts()).get(
+ stream -> stream.filter(StringUtil::isNotBlank).collect(Collectors.joining("\n")));
form.crudMode = crudMode;
})
.orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id),
@@ -290,12 +296,17 @@ public class AdminFileconfigAction extends FessAdminAction {
entity -> {
entity.setUpdatedBy(username);
entity.setUpdatedTime(currentTime);
- copyBeanToBean(form, entity, op -> op.exclude(Stream.concat(Stream.of(Constants.COMMON_CONVERSION_RULE),
- Stream.of(Constants.PERMISSIONS)).toArray(n -> new String[n])));
+ copyBeanToBean(
+ form,
+ entity,
+ op -> op.exclude(Stream.concat(Stream.of(Constants.COMMON_CONVERSION_RULE),
+ Stream.of(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS)).toArray(n -> new String[n])));
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
entity.setPermissions(split(form.permissions, "\n").get(
stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).distinct()
.toArray(n -> new String[n])));
+ entity.setVirtualHosts(split(form.virtualHosts, "\n").get(
+ stream -> stream.filter(StringUtil::isNotBlank).distinct().toArray(n -> new String[n])));
return entity;
});
}
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java
index 6599e01ff20912dbfbd2536804b5a9325960775a..7b048f3253ddcec1d9db80782b006a56a3f272aa 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java
@@ -99,6 +99,9 @@ public class CreateForm {
@CustomSize(maxKey = "form.admin.max.input.size")
public String permissions;
+ @CustomSize(maxKey = "form.admin.max.input.size")
+ public String virtualHosts;
+
@Required
@Min(value = 0)
@Max(value = 2147483647)
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java
index 3328a00683d87fcd10ee0f7644bb6fbff4cd364e..0100303e8856b28d9b0675a5959bf158e08face8 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java
@@ -144,13 +144,16 @@ public class AdminWebconfigAction extends FessAdminAction {
entity -> {
copyBeanToBean(entity, form, copyOp -> {
copyOp.excludeNull();
- copyOp.exclude(Constants.PERMISSIONS);
+ copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
});
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
form.permissions =
stream(entity.getPermissions()).get(
stream -> stream.map(s -> permissionHelper.decode(s)).filter(StringUtil::isNotBlank).distinct()
.collect(Collectors.joining("\n")));
+ form.virtualHosts =
+ stream(entity.getVirtualHosts()).get(
+ stream -> stream.filter(StringUtil::isNotBlank).collect(Collectors.joining("\n")));
}).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asListHtml());
});
@@ -182,7 +185,7 @@ public class AdminWebconfigAction extends FessAdminAction {
entity -> {
copyBeanToBean(entity, form, copyOp -> {
copyOp.excludeNull();
- copyOp.exclude(Constants.PERMISSIONS);
+ copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
});
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
form.permissions =
@@ -190,6 +193,10 @@ public class AdminWebconfigAction extends FessAdminAction {
stream -> stream.map(s -> permissionHelper.decode(s))
.filter(StringUtil::isNotBlank).distinct()
.collect(Collectors.joining("\n")));
+ form.virtualHosts =
+ stream(entity.getVirtualHosts()).get(
+ stream -> stream.filter(StringUtil::isNotBlank).collect(
+ Collectors.joining("\n")));
form.crudMode = crudMode;
})
.orElse(() -> {
@@ -297,12 +304,17 @@ public class AdminWebconfigAction extends FessAdminAction {
entity -> {
entity.setUpdatedBy(username);
entity.setUpdatedTime(currentTime);
- copyBeanToBean(form, entity, op -> op.exclude(Stream.concat(Stream.of(Constants.COMMON_CONVERSION_RULE),
- Stream.of(Constants.PERMISSIONS)).toArray(n -> new String[n])));
+ copyBeanToBean(
+ form,
+ entity,
+ op -> op.exclude(Stream.concat(Stream.of(Constants.COMMON_CONVERSION_RULE),
+ Stream.of(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS)).toArray(n -> new String[n])));
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
entity.setPermissions(split(form.permissions, "\n").get(
stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).distinct()
.toArray(n -> new String[n])));
+ entity.setVirtualHosts(split(form.virtualHosts, "\n").get(
+ stream -> stream.filter(StringUtil::isNotBlank).distinct().toArray(n -> new String[n])));
return entity;
});
}
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/CreateForm.java
index 43c6e04246cd7eb61ceb955a21106a5037c5dad6..917c4f0731a91975e29d2a0f01888ea2ca45abb5 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/CreateForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/CreateForm.java
@@ -105,6 +105,9 @@ public class CreateForm {
@CustomSize(maxKey = "form.admin.max.input.size")
public String permissions;
+ @CustomSize(maxKey = "form.admin.max.input.size")
+ public String virtualHosts;
+
@Required
@Min(value = 0)
@Max(value = 2147483647)
diff --git a/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java b/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java
index 87ec602d1ad77c7958229b50000e9e6fd4613175..db7f1feb0aae273d2a65d3829eb036e85d7bd2c3 100644
--- a/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java
+++ b/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java
@@ -295,6 +295,9 @@ public abstract class AbstractFessFileTransformer extends AbstractTransformer im
final List<String> roleTypeList = getRoleTypes(responseData);
stream(crawlingConfig.getPermissions()).of(stream -> stream.forEach(p -> roleTypeList.add(p)));
putResultDataBody(dataMap, fessConfig.getIndexFieldRole(), roleTypeList);
+ // virtualHosts
+ putResultDataBody(dataMap, fessConfig.getIndexFieldVirtualHost(),
+ stream(crawlingConfig.getVirtualHosts()).get(stream -> stream.filter(StringUtil::isNotBlank).toArray(n -> new String[n])));
// TODO date
// lang
if (StringUtil.isNotBlank(fessConfig.getCrawlerDocumentFileDefaultLang())) {
diff --git a/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java b/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java
index 912837dfb6e5df229807a7cd82996c6aa9c9cf88..418b54ab15f30b62fd3d1a1040a94c6577730f57 100644
--- a/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java
+++ b/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java
@@ -382,6 +382,9 @@ public class FessXpathTransformer extends XpathTransformer implements FessTransf
final List<String> roleTypeList = new ArrayList<>();
stream(crawlingConfig.getPermissions()).of(stream -> stream.forEach(p -> roleTypeList.add(p)));
putResultDataBody(dataMap, fessConfig.getIndexFieldRole(), roleTypeList);
+ // virtualHosts
+ putResultDataBody(dataMap, fessConfig.getIndexFieldVirtualHost(),
+ stream(crawlingConfig.getVirtualHosts()).get(stream -> stream.filter(StringUtil::isNotBlank).toArray(n -> new String[n])));
// id
putResultDataBody(dataMap, fessConfig.getIndexFieldId(), crawlingInfoHelper.generateId(dataMap));
// parentId
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java
index 091ef5b23efcf7ed6fbfcbf8fe2a7c5f6d61b754..20db29ceee6c5844c4b848767f90ad68a8983f55 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java
@@ -86,6 +86,7 @@ public abstract class BsDataConfigBhv extends EsAbstractBehavior<DataConfig, Dat
result.setSortOrder(DfTypeUtil.toInteger(source.get("sortOrder")));
result.setUpdatedBy(DfTypeUtil.toString(source.get("updatedBy")));
result.setUpdatedTime(DfTypeUtil.toLong(source.get("updatedTime")));
+ result.setVirtualHosts(toStringArray(source.get("virtualHosts")));
return updateEntity(source, result);
} catch (InstantiationException | IllegalAccessException e) {
final String msg = "Cannot create a new instance: " + entityType.getName();
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java
index 82feb553af7a88d9f3930c78efde91d4a875235b..82ce3eb4651f16e54e96ce87d43cb315088079b5 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java
@@ -94,6 +94,7 @@ public abstract class BsFileConfigBhv extends EsAbstractBehavior<FileConfig, Fil
result.setSortOrder(DfTypeUtil.toInteger(source.get("sortOrder")));
result.setUpdatedBy(DfTypeUtil.toString(source.get("updatedBy")));
result.setUpdatedTime(DfTypeUtil.toLong(source.get("updatedTime")));
+ result.setVirtualHosts(toStringArray(source.get("virtualHosts")));
return updateEntity(source, result);
} catch (InstantiationException | IllegalAccessException e) {
final String msg = "Cannot create a new instance: " + entityType.getName();
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java
index eed6059c858ca8a77b40a1bb12b4d2ecd3ffaeaa..9e22075105fd697b8a521e4fc6c107d07fe4df1c 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java
@@ -95,6 +95,7 @@ public abstract class BsWebConfigBhv extends EsAbstractBehavior<WebConfig, WebCo
result.setUpdatedTime(DfTypeUtil.toLong(source.get("updatedTime")));
result.setUrls(DfTypeUtil.toString(source.get("urls")));
result.setUserAgent(DfTypeUtil.toString(source.get("userAgent")));
+ result.setVirtualHosts(toStringArray(source.get("virtualHosts")));
return updateEntity(source, result);
} catch (InstantiationException | IllegalAccessException e) {
final String msg = "Cannot create a new instance: " + entityType.getName();
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java
index bf28093cf17bc91a250b52bb18c4402b85a09550..bd207e2777d227c5ba78dd8c0a776a826ba75d92 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java
@@ -76,6 +76,9 @@ public class BsDataConfig extends EsAbstractEntity {
/** updatedTime */
protected Long updatedTime;
+ /** virtualHosts */
+ protected String[] virtualHosts;
+
// [Referrers] *comment only
// ===================================================================================
@@ -136,6 +139,9 @@ public class BsDataConfig extends EsAbstractEntity {
if (updatedTime != null) {
addFieldToSource(sourceMap, "updatedTime", updatedTime);
}
+ if (virtualHosts != null) {
+ addFieldToSource(sourceMap, "virtualHosts", virtualHosts);
+ }
return sourceMap;
}
@@ -162,6 +168,7 @@ public class BsDataConfig extends EsAbstractEntity {
sb.append(dm).append(sortOrder);
sb.append(dm).append(updatedBy);
sb.append(dm).append(updatedTime);
+ sb.append(dm).append(virtualHosts);
if (sb.length() > dm.length()) {
sb.delete(0, dm.length());
}
@@ -301,4 +308,14 @@ public class BsDataConfig extends EsAbstractEntity {
registerModifiedProperty("updatedTime");
this.updatedTime = value;
}
+
+ public String[] getVirtualHosts() {
+ checkSpecifiedProperty("virtualHosts");
+ return virtualHosts;
+ }
+
+ public void setVirtualHosts(String[] value) {
+ registerModifiedProperty("virtualHosts");
+ this.virtualHosts = value;
+ }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java
index 23b0fb2e54b27afc2483f2a664e56c05de9a4db0..5d3b1bbe19656e00d144e083c22e574cd1f4ab15 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java
@@ -100,6 +100,9 @@ public class BsFileConfig extends EsAbstractEntity {
/** updatedTime */
protected Long updatedTime;
+ /** virtualHosts */
+ protected String[] virtualHosts;
+
// [Referrers] *comment only
// ===================================================================================
@@ -184,6 +187,9 @@ public class BsFileConfig extends EsAbstractEntity {
if (updatedTime != null) {
addFieldToSource(sourceMap, "updatedTime", updatedTime);
}
+ if (virtualHosts != null) {
+ addFieldToSource(sourceMap, "virtualHosts", virtualHosts);
+ }
return sourceMap;
}
@@ -218,6 +224,7 @@ public class BsFileConfig extends EsAbstractEntity {
sb.append(dm).append(sortOrder);
sb.append(dm).append(updatedBy);
sb.append(dm).append(updatedTime);
+ sb.append(dm).append(virtualHosts);
if (sb.length() > dm.length()) {
sb.delete(0, dm.length());
}
@@ -437,4 +444,14 @@ public class BsFileConfig extends EsAbstractEntity {
registerModifiedProperty("updatedTime");
this.updatedTime = value;
}
+
+ public String[] getVirtualHosts() {
+ checkSpecifiedProperty("virtualHosts");
+ return virtualHosts;
+ }
+
+ public void setVirtualHosts(String[] value) {
+ registerModifiedProperty("virtualHosts");
+ this.virtualHosts = value;
+ }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java
index 4066c25f5fcd0807ef4076a71adb13849d29bdc5..e9ae9e539809ae9964c54bb50ed50e0c19069ac8 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java
@@ -103,6 +103,9 @@ public class BsWebConfig extends EsAbstractEntity {
/** userAgent */
protected String userAgent;
+ /** virtualHosts */
+ protected String[] virtualHosts;
+
// [Referrers] *comment only
// ===================================================================================
@@ -190,6 +193,9 @@ public class BsWebConfig extends EsAbstractEntity {
if (userAgent != null) {
addFieldToSource(sourceMap, "userAgent", userAgent);
}
+ if (virtualHosts != null) {
+ addFieldToSource(sourceMap, "virtualHosts", virtualHosts);
+ }
return sourceMap;
}
@@ -225,6 +231,7 @@ public class BsWebConfig extends EsAbstractEntity {
sb.append(dm).append(updatedTime);
sb.append(dm).append(urls);
sb.append(dm).append(userAgent);
+ sb.append(dm).append(virtualHosts);
if (sb.length() > dm.length()) {
sb.delete(0, dm.length());
}
@@ -454,4 +461,14 @@ public class BsWebConfig extends EsAbstractEntity {
registerModifiedProperty("userAgent");
this.userAgent = value;
}
+
+ public String[] getVirtualHosts() {
+ checkSpecifiedProperty("virtualHosts");
+ return virtualHosts;
+ }
+
+ public void setVirtualHosts(String[] value) {
+ registerModifiedProperty("virtualHosts");
+ this.virtualHosts = value;
+ }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java
index 7d0953f8f62787f5fb1c6063bfe49e40baf5bc1f..30de747ccb3fffff6e0a519ecabb9da9897da83a 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java
@@ -103,6 +103,8 @@ public class DataConfigDbm extends AbstractDBMeta {
"updatedBy");
setupEpg(_epgMap, et -> ((DataConfig) et).getUpdatedTime(), (et, vl) -> ((DataConfig) et).setUpdatedTime(DfTypeUtil.toLong(vl)),
"updatedTime");
+ setupEpg(_epgMap, et -> ((DataConfig) et).getVirtualHosts(), (et, vl) -> ((DataConfig) et).setVirtualHosts((String[]) vl),
+ "virtualHosts");
}
@Override
@@ -165,6 +167,8 @@ public class DataConfigDbm extends AbstractDBMeta {
false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnVirtualHosts = cci("virtualHosts", "virtualHosts", null, null, String[].class, "virtualHosts", null,
+ false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
public ColumnInfo columnAvailable() {
return _columnAvailable;
@@ -218,6 +222,10 @@ public class DataConfigDbm extends AbstractDBMeta {
return _columnUpdatedTime;
}
+ public ColumnInfo columnVirtualHosts() {
+ return _columnVirtualHosts;
+ }
+
protected List<ColumnInfo> ccil() {
List<ColumnInfo> ls = newArrayList();
ls.add(columnAvailable());
@@ -233,6 +241,7 @@ public class DataConfigDbm extends AbstractDBMeta {
ls.add(columnSortOrder());
ls.add(columnUpdatedBy());
ls.add(columnUpdatedTime());
+ ls.add(columnVirtualHosts());
return ls;
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java
index 90dbfa948143dd70a079334be916821ad9065f5a..56a6f1fe22dc79574ba855dd888c9ec66beb5591 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java
@@ -117,6 +117,8 @@ public class FileConfigDbm extends AbstractDBMeta {
"updatedBy");
setupEpg(_epgMap, et -> ((FileConfig) et).getUpdatedTime(), (et, vl) -> ((FileConfig) et).setUpdatedTime(DfTypeUtil.toLong(vl)),
"updatedTime");
+ setupEpg(_epgMap, et -> ((FileConfig) et).getVirtualHosts(), (et, vl) -> ((FileConfig) et).setVirtualHosts((String[]) vl),
+ "virtualHosts");
}
@Override
@@ -195,6 +197,8 @@ public class FileConfigDbm extends AbstractDBMeta {
false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnVirtualHosts = cci("virtualHosts", "virtualHosts", null, null, String[].class, "virtualHosts", null,
+ false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
public ColumnInfo columnAvailable() {
return _columnAvailable;
@@ -280,6 +284,10 @@ public class FileConfigDbm extends AbstractDBMeta {
return _columnUpdatedTime;
}
+ public ColumnInfo columnVirtualHosts() {
+ return _columnVirtualHosts;
+ }
+
protected List<ColumnInfo> ccil() {
List<ColumnInfo> ls = newArrayList();
ls.add(columnAvailable());
@@ -303,6 +311,7 @@ public class FileConfigDbm extends AbstractDBMeta {
ls.add(columnSortOrder());
ls.add(columnUpdatedBy());
ls.add(columnUpdatedTime());
+ ls.add(columnVirtualHosts());
return ls;
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java
index 984d102a3b4e7063b48aff441d9e7141c6919e30..210874f4914842d7a53baf61efcb4ea7f383382c 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java
@@ -119,6 +119,8 @@ public class WebConfigDbm extends AbstractDBMeta {
setupEpg(_epgMap, et -> ((WebConfig) et).getUrls(), (et, vl) -> ((WebConfig) et).setUrls(DfTypeUtil.toString(vl)), "urls");
setupEpg(_epgMap, et -> ((WebConfig) et).getUserAgent(), (et, vl) -> ((WebConfig) et).setUserAgent(DfTypeUtil.toString(vl)),
"userAgent");
+ setupEpg(_epgMap, et -> ((WebConfig) et).getVirtualHosts(), (et, vl) -> ((WebConfig) et).setVirtualHosts((String[]) vl),
+ "virtualHosts");
}
@Override
@@ -199,6 +201,8 @@ public class WebConfigDbm extends AbstractDBMeta {
0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnUserAgent = cci("userAgent", "userAgent", null, null, String.class, "userAgent", null, false, false,
false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnVirtualHosts = cci("virtualHosts", "virtualHosts", null, null, String[].class, "virtualHosts", null,
+ false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
public ColumnInfo columnAvailable() {
return _columnAvailable;
@@ -288,6 +292,10 @@ public class WebConfigDbm extends AbstractDBMeta {
return _columnUserAgent;
}
+ public ColumnInfo columnVirtualHosts() {
+ return _columnVirtualHosts;
+ }
+
protected List<ColumnInfo> ccil() {
List<ColumnInfo> ls = newArrayList();
ls.add(columnAvailable());
@@ -312,6 +320,7 @@ public class WebConfigDbm extends AbstractDBMeta {
ls.add(columnUpdatedTime());
ls.add(columnUrls());
ls.add(columnUserAgent());
+ ls.add(columnVirtualHosts());
return ls;
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java
index ab02f766054397b6c5d644fb36e603fb3fc4cb17..7e4b1e670305458bfb687fae75cac38bb9f0de4e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java
@@ -227,5 +227,9 @@ public class BsDataConfigCB extends EsAbstractConditionBean {
public void columnUpdatedTime() {
doColumn("updatedTime");
}
+
+ public void columnVirtualHosts() {
+ doColumn("virtualHosts");
+ }
}
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
index 6c81d364ad265b329fdf6562d39495e465589e69..d0caa67c3c6c9acf33b8e16463c0fa29d4509975 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
@@ -259,5 +259,9 @@ public class BsFileConfigCB extends EsAbstractConditionBean {
public void columnUpdatedTime() {
doColumn("updatedTime");
}
+
+ public void columnVirtualHosts() {
+ doColumn("virtualHosts");
+ }
}
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
index e4f7fbd9f183861e328d16d8e09553aa6c7c2d61..119d1fac891a83d0b78c6b8369069d901e3c39a3 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
@@ -263,5 +263,9 @@ public class BsWebConfigCB extends EsAbstractConditionBean {
public void columnUserAgent() {
doColumn("userAgent");
}
+
+ public void columnVirtualHosts() {
+ doColumn("virtualHosts");
+ }
}
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
index 976c2efa56e85a72212c187db96f0772cdf55c6c..78930a3e45fcb14cbe09b43738ca79585ef3e589 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
@@ -2201,4 +2201,135 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
}
}
+ public void setVirtualHosts_Terms() {
+ setVirtualHosts_Terms(null);
+ }
+
+ public void setVirtualHosts_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+ setVirtualHosts_Terms("virtualHosts", opLambda, null);
+ }
+
+ public void setVirtualHosts_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+ setVirtualHosts_Terms("virtualHosts", opLambda, aggsLambda);
+ }
+
+ public void setVirtualHosts_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsDataConfigCA> aggsLambda) {
+ TermsAggregationBuilder builder = regTermsA(name, "virtualHosts");
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ if (aggsLambda != null) {
+ DataConfigCA ca = new DataConfigCA();
+ aggsLambda.callback(ca);
+ ca.getAggregationBuilderList().forEach(builder::subAggregation);
+ }
+ }
+
+ public void setVirtualHosts_SignificantTerms() {
+ setVirtualHosts_SignificantTerms(null);
+ }
+
+ public void setVirtualHosts_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+ setVirtualHosts_SignificantTerms("virtualHosts", opLambda, null);
+ }
+
+ public void setVirtualHosts_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+ OperatorCall<BsDataConfigCA> aggsLambda) {
+ setVirtualHosts_SignificantTerms("virtualHosts", opLambda, aggsLambda);
+ }
+
+ public void setVirtualHosts_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+ OperatorCall<BsDataConfigCA> aggsLambda) {
+ SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "virtualHosts");
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ if (aggsLambda != null) {
+ DataConfigCA ca = new DataConfigCA();
+ aggsLambda.callback(ca);
+ ca.getAggregationBuilderList().forEach(builder::subAggregation);
+ }
+ }
+
+ public void setVirtualHosts_IpRange() {
+ setVirtualHosts_IpRange(null);
+ }
+
+ public void setVirtualHosts_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+ setVirtualHosts_IpRange("virtualHosts", opLambda, null);
+ }
+
+ public void setVirtualHosts_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+ setVirtualHosts_IpRange("virtualHosts", opLambda, aggsLambda);
+ }
+
+ public void setVirtualHosts_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsDataConfigCA> aggsLambda) {
+ IpRangeAggregationBuilder builder = regIpRangeA(name, "virtualHosts");
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ if (aggsLambda != null) {
+ DataConfigCA ca = new DataConfigCA();
+ aggsLambda.callback(ca);
+ ca.getAggregationBuilderList().forEach(builder::subAggregation);
+ }
+ }
+
+ public void setVirtualHosts_Count() {
+ setVirtualHosts_Count(null);
+ }
+
+ public void setVirtualHosts_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+ setVirtualHosts_Count("virtualHosts", opLambda);
+ }
+
+ public void setVirtualHosts_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+ ValueCountAggregationBuilder builder = regCountA(name, "virtualHosts");
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_Cardinality() {
+ setVirtualHosts_Cardinality(null);
+ }
+
+ public void setVirtualHosts_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+ setVirtualHosts_Cardinality("virtualHosts", opLambda);
+ }
+
+ public void setVirtualHosts_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+ CardinalityAggregationBuilder builder = regCardinalityA(name, "virtualHosts");
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_Missing() {
+ setVirtualHosts_Missing(null);
+ }
+
+ public void setVirtualHosts_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+ setVirtualHosts_Missing("virtualHosts", opLambda, null);
+ }
+
+ public void setVirtualHosts_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+ setVirtualHosts_Missing("virtualHosts", opLambda, aggsLambda);
+ }
+
+ public void setVirtualHosts_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsDataConfigCA> aggsLambda) {
+ MissingAggregationBuilder builder = regMissingA(name, "virtualHosts");
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ if (aggsLambda != null) {
+ DataConfigCA ca = new DataConfigCA();
+ aggsLambda.callback(ca);
+ ca.getAggregationBuilderList().forEach(builder::subAggregation);
+ }
+ }
+
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
index abf435b9a2322c6971b0c132bce5f49ce4e84ce5..d200bc13727c5a287ac2dee7b764fa3ab4a83784 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
@@ -3718,4 +3718,135 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
}
}
+ public void setVirtualHosts_Terms() {
+ setVirtualHosts_Terms(null);
+ }
+
+ public void setVirtualHosts_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+ setVirtualHosts_Terms("virtualHosts", opLambda, null);
+ }
+
+ public void setVirtualHosts_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+ setVirtualHosts_Terms("virtualHosts", opLambda, aggsLambda);
+ }
+
+ public void setVirtualHosts_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsFileConfigCA> aggsLambda) {
+ TermsAggregationBuilder builder = regTermsA(name, "virtualHosts");
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ if (aggsLambda != null) {
+ FileConfigCA ca = new FileConfigCA();
+ aggsLambda.callback(ca);
+ ca.getAggregationBuilderList().forEach(builder::subAggregation);
+ }
+ }
+
+ public void setVirtualHosts_SignificantTerms() {
+ setVirtualHosts_SignificantTerms(null);
+ }
+
+ public void setVirtualHosts_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+ setVirtualHosts_SignificantTerms("virtualHosts", opLambda, null);
+ }
+
+ public void setVirtualHosts_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+ OperatorCall<BsFileConfigCA> aggsLambda) {
+ setVirtualHosts_SignificantTerms("virtualHosts", opLambda, aggsLambda);
+ }
+
+ public void setVirtualHosts_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+ OperatorCall<BsFileConfigCA> aggsLambda) {
+ SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "virtualHosts");
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ if (aggsLambda != null) {
+ FileConfigCA ca = new FileConfigCA();
+ aggsLambda.callback(ca);
+ ca.getAggregationBuilderList().forEach(builder::subAggregation);
+ }
+ }
+
+ public void setVirtualHosts_IpRange() {
+ setVirtualHosts_IpRange(null);
+ }
+
+ public void setVirtualHosts_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+ setVirtualHosts_IpRange("virtualHosts", opLambda, null);
+ }
+
+ public void setVirtualHosts_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+ setVirtualHosts_IpRange("virtualHosts", opLambda, aggsLambda);
+ }
+
+ public void setVirtualHosts_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsFileConfigCA> aggsLambda) {
+ IpRangeAggregationBuilder builder = regIpRangeA(name, "virtualHosts");
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ if (aggsLambda != null) {
+ FileConfigCA ca = new FileConfigCA();
+ aggsLambda.callback(ca);
+ ca.getAggregationBuilderList().forEach(builder::subAggregation);
+ }
+ }
+
+ public void setVirtualHosts_Count() {
+ setVirtualHosts_Count(null);
+ }
+
+ public void setVirtualHosts_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+ setVirtualHosts_Count("virtualHosts", opLambda);
+ }
+
+ public void setVirtualHosts_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+ ValueCountAggregationBuilder builder = regCountA(name, "virtualHosts");
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_Cardinality() {
+ setVirtualHosts_Cardinality(null);
+ }
+
+ public void setVirtualHosts_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+ setVirtualHosts_Cardinality("virtualHosts", opLambda);
+ }
+
+ public void setVirtualHosts_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+ CardinalityAggregationBuilder builder = regCardinalityA(name, "virtualHosts");
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_Missing() {
+ setVirtualHosts_Missing(null);
+ }
+
+ public void setVirtualHosts_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+ setVirtualHosts_Missing("virtualHosts", opLambda, null);
+ }
+
+ public void setVirtualHosts_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+ setVirtualHosts_Missing("virtualHosts", opLambda, aggsLambda);
+ }
+
+ public void setVirtualHosts_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsFileConfigCA> aggsLambda) {
+ MissingAggregationBuilder builder = regMissingA(name, "virtualHosts");
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ if (aggsLambda != null) {
+ FileConfigCA ca = new FileConfigCA();
+ aggsLambda.callback(ca);
+ ca.getAggregationBuilderList().forEach(builder::subAggregation);
+ }
+ }
+
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
index 42014b01d6d3c02ca499a162b18f1f45ba566202..443809ae0674e582e0732c4278c9a1b8de84f79b 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
@@ -3845,4 +3845,135 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
}
}
+ public void setVirtualHosts_Terms() {
+ setVirtualHosts_Terms(null);
+ }
+
+ public void setVirtualHosts_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+ setVirtualHosts_Terms("virtualHosts", opLambda, null);
+ }
+
+ public void setVirtualHosts_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+ setVirtualHosts_Terms("virtualHosts", opLambda, aggsLambda);
+ }
+
+ public void setVirtualHosts_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsWebConfigCA> aggsLambda) {
+ TermsAggregationBuilder builder = regTermsA(name, "virtualHosts");
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ if (aggsLambda != null) {
+ WebConfigCA ca = new WebConfigCA();
+ aggsLambda.callback(ca);
+ ca.getAggregationBuilderList().forEach(builder::subAggregation);
+ }
+ }
+
+ public void setVirtualHosts_SignificantTerms() {
+ setVirtualHosts_SignificantTerms(null);
+ }
+
+ public void setVirtualHosts_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+ setVirtualHosts_SignificantTerms("virtualHosts", opLambda, null);
+ }
+
+ public void setVirtualHosts_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+ OperatorCall<BsWebConfigCA> aggsLambda) {
+ setVirtualHosts_SignificantTerms("virtualHosts", opLambda, aggsLambda);
+ }
+
+ public void setVirtualHosts_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+ OperatorCall<BsWebConfigCA> aggsLambda) {
+ SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "virtualHosts");
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ if (aggsLambda != null) {
+ WebConfigCA ca = new WebConfigCA();
+ aggsLambda.callback(ca);
+ ca.getAggregationBuilderList().forEach(builder::subAggregation);
+ }
+ }
+
+ public void setVirtualHosts_IpRange() {
+ setVirtualHosts_IpRange(null);
+ }
+
+ public void setVirtualHosts_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+ setVirtualHosts_IpRange("virtualHosts", opLambda, null);
+ }
+
+ public void setVirtualHosts_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+ setVirtualHosts_IpRange("virtualHosts", opLambda, aggsLambda);
+ }
+
+ public void setVirtualHosts_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsWebConfigCA> aggsLambda) {
+ IpRangeAggregationBuilder builder = regIpRangeA(name, "virtualHosts");
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ if (aggsLambda != null) {
+ WebConfigCA ca = new WebConfigCA();
+ aggsLambda.callback(ca);
+ ca.getAggregationBuilderList().forEach(builder::subAggregation);
+ }
+ }
+
+ public void setVirtualHosts_Count() {
+ setVirtualHosts_Count(null);
+ }
+
+ public void setVirtualHosts_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+ setVirtualHosts_Count("virtualHosts", opLambda);
+ }
+
+ public void setVirtualHosts_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+ ValueCountAggregationBuilder builder = regCountA(name, "virtualHosts");
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_Cardinality() {
+ setVirtualHosts_Cardinality(null);
+ }
+
+ public void setVirtualHosts_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+ setVirtualHosts_Cardinality("virtualHosts", opLambda);
+ }
+
+ public void setVirtualHosts_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+ CardinalityAggregationBuilder builder = regCardinalityA(name, "virtualHosts");
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_Missing() {
+ setVirtualHosts_Missing(null);
+ }
+
+ public void setVirtualHosts_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+ setVirtualHosts_Missing("virtualHosts", opLambda, null);
+ }
+
+ public void setVirtualHosts_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+ setVirtualHosts_Missing("virtualHosts", opLambda, aggsLambda);
+ }
+
+ public void setVirtualHosts_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsWebConfigCA> aggsLambda) {
+ MissingAggregationBuilder builder = regMissingA(name, "virtualHosts");
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ if (aggsLambda != null) {
+ WebConfigCA ca = new WebConfigCA();
+ aggsLambda.callback(ca);
+ ca.getAggregationBuilderList().forEach(builder::subAggregation);
+ }
+ }
+
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java
index ad4050d5d4d41eeea2c6cd951bab0f005288e8c9..eb7616cdac3bcef83386ea7cc09ac2bf51689263 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java
@@ -2842,4 +2842,226 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
return this;
}
+ public void setVirtualHosts_Equal(String virtualHosts) {
+ setVirtualHosts_Term(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_Equal(String virtualHosts, ConditionOptionCall<TermQueryBuilder> opLambda) {
+ setVirtualHosts_Term(virtualHosts, opLambda);
+ }
+
+ public void setVirtualHosts_Term(String virtualHosts) {
+ setVirtualHosts_Term(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_Term(String virtualHosts, ConditionOptionCall<TermQueryBuilder> opLambda) {
+ TermQueryBuilder builder = regTermQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_NotEqual(String virtualHosts) {
+ setVirtualHosts_NotTerm(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_NotTerm(String virtualHosts) {
+ setVirtualHosts_NotTerm(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_NotEqual(String virtualHosts, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+ setVirtualHosts_NotTerm(virtualHosts, opLambda);
+ }
+
+ public void setVirtualHosts_NotTerm(String virtualHosts, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+ not(not -> not.setVirtualHosts_Term(virtualHosts), opLambda);
+ }
+
+ public void setVirtualHosts_Terms(Collection<String> virtualHostsList) {
+ setVirtualHosts_Terms(virtualHostsList, null);
+ }
+
+ public void setVirtualHosts_Terms(Collection<String> virtualHostsList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+ TermsQueryBuilder builder = regTermsQ("virtualHosts", virtualHostsList);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_InScope(Collection<String> virtualHostsList) {
+ setVirtualHosts_Terms(virtualHostsList, null);
+ }
+
+ public void setVirtualHosts_InScope(Collection<String> virtualHostsList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+ setVirtualHosts_Terms(virtualHostsList, opLambda);
+ }
+
+ public void setVirtualHosts_Match(String virtualHosts) {
+ setVirtualHosts_Match(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_Match(String virtualHosts, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+ MatchQueryBuilder builder = regMatchQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_MatchPhrase(String virtualHosts) {
+ setVirtualHosts_MatchPhrase(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_MatchPhrase(String virtualHosts, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+ MatchPhraseQueryBuilder builder = regMatchPhraseQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_MatchPhrasePrefix(String virtualHosts) {
+ setVirtualHosts_MatchPhrasePrefix(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_MatchPhrasePrefix(String virtualHosts, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+ MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_Fuzzy(String virtualHosts) {
+ setVirtualHosts_Fuzzy(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_Fuzzy(String virtualHosts, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+ MatchQueryBuilder builder = regFuzzyQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_Prefix(String virtualHosts) {
+ setVirtualHosts_Prefix(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_Prefix(String virtualHosts, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+ PrefixQueryBuilder builder = regPrefixQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_Wildcard(String virtualHosts) {
+ setVirtualHosts_Wildcard(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_Wildcard(String virtualHosts, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+ WildcardQueryBuilder builder = regWildcardQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_Regexp(String virtualHosts) {
+ setVirtualHosts_Regexp(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_Regexp(String virtualHosts, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+ RegexpQueryBuilder builder = regRegexpQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_SpanTerm(String virtualHosts) {
+ setVirtualHosts_SpanTerm("virtualHosts", null);
+ }
+
+ public void setVirtualHosts_SpanTerm(String virtualHosts, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+ SpanTermQueryBuilder builder = regSpanTermQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_GreaterThan(String virtualHosts) {
+ setVirtualHosts_GreaterThan(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_GreaterThan(String virtualHosts, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+ final Object _value = virtualHosts;
+ RangeQueryBuilder builder = regRangeQ("virtualHosts", ConditionKey.CK_GREATER_THAN, _value);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_LessThan(String virtualHosts) {
+ setVirtualHosts_LessThan(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_LessThan(String virtualHosts, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+ final Object _value = virtualHosts;
+ RangeQueryBuilder builder = regRangeQ("virtualHosts", ConditionKey.CK_LESS_THAN, _value);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_GreaterEqual(String virtualHosts) {
+ setVirtualHosts_GreaterEqual(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_GreaterEqual(String virtualHosts, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+ final Object _value = virtualHosts;
+ RangeQueryBuilder builder = regRangeQ("virtualHosts", ConditionKey.CK_GREATER_EQUAL, _value);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_LessEqual(String virtualHosts) {
+ setVirtualHosts_LessEqual(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_LessEqual(String virtualHosts, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+ final Object _value = virtualHosts;
+ RangeQueryBuilder builder = regRangeQ("virtualHosts", ConditionKey.CK_LESS_EQUAL, _value);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_Exists() {
+ setVirtualHosts_Exists(null);
+ }
+
+ public void setVirtualHosts_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+ ExistsQueryBuilder builder = regExistsQ("virtualHosts");
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_CommonTerms(String virtualHosts) {
+ setVirtualHosts_CommonTerms(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_CommonTerms(String virtualHosts, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+ CommonTermsQueryBuilder builder = regCommonTermsQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public BsDataConfigCQ addOrderBy_VirtualHosts_Asc() {
+ regOBA("virtualHosts");
+ return this;
+ }
+
+ public BsDataConfigCQ addOrderBy_VirtualHosts_Desc() {
+ regOBD("virtualHosts");
+ return this;
+ }
+
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java
index 4c120c1fdccd00d9690c0d45561953dbd9bb30bc..2cad7a5f2ef51f2f3a2a8ccfb2707c44349c238a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java
@@ -4398,4 +4398,226 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
return this;
}
+ public void setVirtualHosts_Equal(String virtualHosts) {
+ setVirtualHosts_Term(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_Equal(String virtualHosts, ConditionOptionCall<TermQueryBuilder> opLambda) {
+ setVirtualHosts_Term(virtualHosts, opLambda);
+ }
+
+ public void setVirtualHosts_Term(String virtualHosts) {
+ setVirtualHosts_Term(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_Term(String virtualHosts, ConditionOptionCall<TermQueryBuilder> opLambda) {
+ TermQueryBuilder builder = regTermQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_NotEqual(String virtualHosts) {
+ setVirtualHosts_NotTerm(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_NotTerm(String virtualHosts) {
+ setVirtualHosts_NotTerm(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_NotEqual(String virtualHosts, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+ setVirtualHosts_NotTerm(virtualHosts, opLambda);
+ }
+
+ public void setVirtualHosts_NotTerm(String virtualHosts, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+ not(not -> not.setVirtualHosts_Term(virtualHosts), opLambda);
+ }
+
+ public void setVirtualHosts_Terms(Collection<String> virtualHostsList) {
+ setVirtualHosts_Terms(virtualHostsList, null);
+ }
+
+ public void setVirtualHosts_Terms(Collection<String> virtualHostsList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+ TermsQueryBuilder builder = regTermsQ("virtualHosts", virtualHostsList);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_InScope(Collection<String> virtualHostsList) {
+ setVirtualHosts_Terms(virtualHostsList, null);
+ }
+
+ public void setVirtualHosts_InScope(Collection<String> virtualHostsList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+ setVirtualHosts_Terms(virtualHostsList, opLambda);
+ }
+
+ public void setVirtualHosts_Match(String virtualHosts) {
+ setVirtualHosts_Match(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_Match(String virtualHosts, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+ MatchQueryBuilder builder = regMatchQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_MatchPhrase(String virtualHosts) {
+ setVirtualHosts_MatchPhrase(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_MatchPhrase(String virtualHosts, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+ MatchPhraseQueryBuilder builder = regMatchPhraseQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_MatchPhrasePrefix(String virtualHosts) {
+ setVirtualHosts_MatchPhrasePrefix(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_MatchPhrasePrefix(String virtualHosts, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+ MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_Fuzzy(String virtualHosts) {
+ setVirtualHosts_Fuzzy(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_Fuzzy(String virtualHosts, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+ MatchQueryBuilder builder = regFuzzyQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_Prefix(String virtualHosts) {
+ setVirtualHosts_Prefix(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_Prefix(String virtualHosts, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+ PrefixQueryBuilder builder = regPrefixQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_Wildcard(String virtualHosts) {
+ setVirtualHosts_Wildcard(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_Wildcard(String virtualHosts, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+ WildcardQueryBuilder builder = regWildcardQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_Regexp(String virtualHosts) {
+ setVirtualHosts_Regexp(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_Regexp(String virtualHosts, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+ RegexpQueryBuilder builder = regRegexpQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_SpanTerm(String virtualHosts) {
+ setVirtualHosts_SpanTerm("virtualHosts", null);
+ }
+
+ public void setVirtualHosts_SpanTerm(String virtualHosts, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+ SpanTermQueryBuilder builder = regSpanTermQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_GreaterThan(String virtualHosts) {
+ setVirtualHosts_GreaterThan(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_GreaterThan(String virtualHosts, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+ final Object _value = virtualHosts;
+ RangeQueryBuilder builder = regRangeQ("virtualHosts", ConditionKey.CK_GREATER_THAN, _value);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_LessThan(String virtualHosts) {
+ setVirtualHosts_LessThan(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_LessThan(String virtualHosts, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+ final Object _value = virtualHosts;
+ RangeQueryBuilder builder = regRangeQ("virtualHosts", ConditionKey.CK_LESS_THAN, _value);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_GreaterEqual(String virtualHosts) {
+ setVirtualHosts_GreaterEqual(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_GreaterEqual(String virtualHosts, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+ final Object _value = virtualHosts;
+ RangeQueryBuilder builder = regRangeQ("virtualHosts", ConditionKey.CK_GREATER_EQUAL, _value);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_LessEqual(String virtualHosts) {
+ setVirtualHosts_LessEqual(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_LessEqual(String virtualHosts, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+ final Object _value = virtualHosts;
+ RangeQueryBuilder builder = regRangeQ("virtualHosts", ConditionKey.CK_LESS_EQUAL, _value);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_Exists() {
+ setVirtualHosts_Exists(null);
+ }
+
+ public void setVirtualHosts_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+ ExistsQueryBuilder builder = regExistsQ("virtualHosts");
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_CommonTerms(String virtualHosts) {
+ setVirtualHosts_CommonTerms(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_CommonTerms(String virtualHosts, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+ CommonTermsQueryBuilder builder = regCommonTermsQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public BsFileConfigCQ addOrderBy_VirtualHosts_Asc() {
+ regOBA("virtualHosts");
+ return this;
+ }
+
+ public BsFileConfigCQ addOrderBy_VirtualHosts_Desc() {
+ regOBD("virtualHosts");
+ return this;
+ }
+
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java
index 32ca90a91765667fe91e045d3455d86e1b3f31f9..887dc4bd7f2662f3f4cb3031fe9dfb16a131d1a5 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java
@@ -4619,4 +4619,226 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
return this;
}
+ public void setVirtualHosts_Equal(String virtualHosts) {
+ setVirtualHosts_Term(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_Equal(String virtualHosts, ConditionOptionCall<TermQueryBuilder> opLambda) {
+ setVirtualHosts_Term(virtualHosts, opLambda);
+ }
+
+ public void setVirtualHosts_Term(String virtualHosts) {
+ setVirtualHosts_Term(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_Term(String virtualHosts, ConditionOptionCall<TermQueryBuilder> opLambda) {
+ TermQueryBuilder builder = regTermQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_NotEqual(String virtualHosts) {
+ setVirtualHosts_NotTerm(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_NotTerm(String virtualHosts) {
+ setVirtualHosts_NotTerm(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_NotEqual(String virtualHosts, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+ setVirtualHosts_NotTerm(virtualHosts, opLambda);
+ }
+
+ public void setVirtualHosts_NotTerm(String virtualHosts, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+ not(not -> not.setVirtualHosts_Term(virtualHosts), opLambda);
+ }
+
+ public void setVirtualHosts_Terms(Collection<String> virtualHostsList) {
+ setVirtualHosts_Terms(virtualHostsList, null);
+ }
+
+ public void setVirtualHosts_Terms(Collection<String> virtualHostsList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+ TermsQueryBuilder builder = regTermsQ("virtualHosts", virtualHostsList);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_InScope(Collection<String> virtualHostsList) {
+ setVirtualHosts_Terms(virtualHostsList, null);
+ }
+
+ public void setVirtualHosts_InScope(Collection<String> virtualHostsList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+ setVirtualHosts_Terms(virtualHostsList, opLambda);
+ }
+
+ public void setVirtualHosts_Match(String virtualHosts) {
+ setVirtualHosts_Match(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_Match(String virtualHosts, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+ MatchQueryBuilder builder = regMatchQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_MatchPhrase(String virtualHosts) {
+ setVirtualHosts_MatchPhrase(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_MatchPhrase(String virtualHosts, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+ MatchPhraseQueryBuilder builder = regMatchPhraseQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_MatchPhrasePrefix(String virtualHosts) {
+ setVirtualHosts_MatchPhrasePrefix(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_MatchPhrasePrefix(String virtualHosts, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+ MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_Fuzzy(String virtualHosts) {
+ setVirtualHosts_Fuzzy(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_Fuzzy(String virtualHosts, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+ MatchQueryBuilder builder = regFuzzyQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_Prefix(String virtualHosts) {
+ setVirtualHosts_Prefix(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_Prefix(String virtualHosts, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+ PrefixQueryBuilder builder = regPrefixQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_Wildcard(String virtualHosts) {
+ setVirtualHosts_Wildcard(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_Wildcard(String virtualHosts, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+ WildcardQueryBuilder builder = regWildcardQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_Regexp(String virtualHosts) {
+ setVirtualHosts_Regexp(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_Regexp(String virtualHosts, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+ RegexpQueryBuilder builder = regRegexpQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_SpanTerm(String virtualHosts) {
+ setVirtualHosts_SpanTerm("virtualHosts", null);
+ }
+
+ public void setVirtualHosts_SpanTerm(String virtualHosts, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+ SpanTermQueryBuilder builder = regSpanTermQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_GreaterThan(String virtualHosts) {
+ setVirtualHosts_GreaterThan(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_GreaterThan(String virtualHosts, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+ final Object _value = virtualHosts;
+ RangeQueryBuilder builder = regRangeQ("virtualHosts", ConditionKey.CK_GREATER_THAN, _value);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_LessThan(String virtualHosts) {
+ setVirtualHosts_LessThan(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_LessThan(String virtualHosts, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+ final Object _value = virtualHosts;
+ RangeQueryBuilder builder = regRangeQ("virtualHosts", ConditionKey.CK_LESS_THAN, _value);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_GreaterEqual(String virtualHosts) {
+ setVirtualHosts_GreaterEqual(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_GreaterEqual(String virtualHosts, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+ final Object _value = virtualHosts;
+ RangeQueryBuilder builder = regRangeQ("virtualHosts", ConditionKey.CK_GREATER_EQUAL, _value);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_LessEqual(String virtualHosts) {
+ setVirtualHosts_LessEqual(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_LessEqual(String virtualHosts, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+ final Object _value = virtualHosts;
+ RangeQueryBuilder builder = regRangeQ("virtualHosts", ConditionKey.CK_LESS_EQUAL, _value);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_Exists() {
+ setVirtualHosts_Exists(null);
+ }
+
+ public void setVirtualHosts_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+ ExistsQueryBuilder builder = regExistsQ("virtualHosts");
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public void setVirtualHosts_CommonTerms(String virtualHosts) {
+ setVirtualHosts_CommonTerms(virtualHosts, null);
+ }
+
+ public void setVirtualHosts_CommonTerms(String virtualHosts, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+ CommonTermsQueryBuilder builder = regCommonTermsQ("virtualHosts", virtualHosts);
+ if (opLambda != null) {
+ opLambda.callback(builder);
+ }
+ }
+
+ public BsWebConfigCQ addOrderBy_VirtualHosts_Asc() {
+ regOBA("virtualHosts");
+ return this;
+ }
+
+ public BsWebConfigCQ addOrderBy_VirtualHosts_Desc() {
+ regOBD("virtualHosts");
+ return this;
+ }
+
}
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfig.java b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfig.java
index 02f64f6a2f17fc9e206e7e912ebf191d6e6a3ff8..4bffafb895b0435fdf82675e466f28e1d4a074cd 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfig.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfig.java
@@ -27,6 +27,8 @@ public interface CrawlingConfig {
String[] getPermissions();
+ String[] getVirtualHosts();
+
String[] getLabelTypeValues();
String getDocumentBoost();
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfigWrapper.java b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfigWrapper.java
index bd0b8f45f349c1fe8b6b9af67e024b317d017632..a4ca2a5a7a0f61613041219599facafd9dc3cda3 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfigWrapper.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfigWrapper.java
@@ -42,6 +42,11 @@ public class CrawlingConfigWrapper implements CrawlingConfig {
return crawlingConfig.getPermissions();
}
+ @Override
+ public String[] getVirtualHosts() {
+ return crawlingConfig.getVirtualHosts();
+ }
+
@Override
public String[] getLabelTypeValues() {
return crawlingConfig.getLabelTypeValues();
diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
index 4e377bc952fa1d8b6b0abaceacb2b3bc1189f2f6..1bd4ec1af34b4a3cb0ecde1100010509ad483c94 100644
--- a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
+++ b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
@@ -1052,6 +1052,9 @@ public class FessLabels extends UserMessages {
/** The key of the message: Permissions */
public static final String LABELS_PERMISSIONS = "{labels.permissions}";
+ /** The key of the message: Virtual Hosts */
+ public static final String LABELS_virtual_hosts = "{labels.virtual_hosts}";
+
/** The key of the message: Label */
public static final String LABELS_label_type = "{labels.label_type}";
diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
index 77c6c8567dce1ae1d95058b55364ada5cdece7ce..cd3f0cc1a12840c7f60665bf641970fa6a3e489c 100644
--- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
+++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
@@ -393,6 +393,9 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/** The key of the configuration. e.g. thumbnail */
String INDEX_FIELD_THUMBNAIL = "index.field.thumbnail";
+ /** The key of the configuration. e.g. virtual_host */
+ String INDEX_FIELD_virtual_host = "index.field.virtual_host";
+
/** The key of the configuration. e.g. content_title */
String RESPONSE_FIELD_content_title = "response.field.content_title";
@@ -2414,6 +2417,13 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
*/
String getIndexFieldThumbnail();
+ /**
+ * Get the value for the key 'index.field.virtual_host'. <br>
+ * The value is, e.g. virtual_host <br>
+ * @return The value of found property. (NotNull: if not found, exception but basically no way)
+ */
+ String getIndexFieldVirtualHost();
+
/**
* Get the value for the key 'response.field.content_title'. <br>
* The value is, e.g. content_title <br>
@@ -5855,6 +5865,10 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
return get(FessConfig.INDEX_FIELD_THUMBNAIL);
}
+ public String getIndexFieldVirtualHost() {
+ return get(FessConfig.INDEX_FIELD_virtual_host);
+ }
+
public String getResponseFieldContentTitle() {
return get(FessConfig.RESPONSE_FIELD_content_title);
}
@@ -7481,6 +7495,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
defaultMap.put(FessConfig.INDEX_FIELD_FILETYPE, "filetype");
defaultMap.put(FessConfig.INDEX_FIELD_FILENAME, "filename");
defaultMap.put(FessConfig.INDEX_FIELD_THUMBNAIL, "thumbnail");
+ defaultMap.put(FessConfig.INDEX_FIELD_virtual_host, "virtual_host");
defaultMap.put(FessConfig.RESPONSE_FIELD_content_title, "content_title");
defaultMap.put(FessConfig.RESPONSE_FIELD_content_description, "content_description");
defaultMap.put(FessConfig.RESPONSE_FIELD_url_link, "url_link");
diff --git a/src/main/resources/fess_config.properties b/src/main/resources/fess_config.properties
index abfeeb080a899c334bc1052d9262568f6449a74e..32175597f617e32f0a5155bb0f8f250a89bfab94 100644
--- a/src/main/resources/fess_config.properties
+++ b/src/main/resources/fess_config.properties
@@ -186,6 +186,7 @@ index.field.content_length=content_length
index.field.filetype=filetype
index.field.filename=filename
index.field.thumbnail=thumbnail
+index.field.virtual_host=virtual_host
response.field.content_title=content_title
response.field.content_description=content_description
response.field.url_link=url_link
diff --git a/src/main/resources/fess_indices/.fess_config/data_config.json b/src/main/resources/fess_indices/.fess_config/data_config.json
index 710b5999ca9f5c3120dd146facc40b04f5fc869a..cd3dff57435ddaee4d8cdfeb4f651de3062a17cd 100644
--- a/src/main/resources/fess_indices/.fess_config/data_config.json
+++ b/src/main/resources/fess_indices/.fess_config/data_config.json
@@ -28,6 +28,9 @@
"permissions": {
"type": "keyword"
},
+ "virtualHosts": {
+ "type": "keyword"
+ },
"sortOrder": {
"type": "integer"
},
diff --git a/src/main/resources/fess_indices/.fess_config/file_config.json b/src/main/resources/fess_indices/.fess_config/file_config.json
index 43e56fbcf82f14eb0d755a8ce2f818b644405f22..e7fd8eeed00566a60f682af92a8e0f88075d1329 100644
--- a/src/main/resources/fess_indices/.fess_config/file_config.json
+++ b/src/main/resources/fess_indices/.fess_config/file_config.json
@@ -52,6 +52,9 @@
"permissions": {
"type": "keyword"
},
+ "virtualHosts": {
+ "type": "keyword"
+ },
"sortOrder": {
"type": "integer"
},
diff --git a/src/main/resources/fess_indices/.fess_config/web_config.json b/src/main/resources/fess_indices/.fess_config/web_config.json
index fc3e6d581ebc9493156fec3edd9e428d0549c89d..26f2a692ed172f8cdf24a6edede3c2e127ebf740 100644
--- a/src/main/resources/fess_indices/.fess_config/web_config.json
+++ b/src/main/resources/fess_indices/.fess_config/web_config.json
@@ -55,6 +55,9 @@
"permissions": {
"type": "keyword"
},
+ "virtualHosts": {
+ "type": "keyword"
+ },
"sortOrder": {
"type": "integer"
},
diff --git a/src/main/resources/fess_indices/fess/doc.json b/src/main/resources/fess_indices/fess/doc.json
index 365283dcd76d2178adcf66d59db9cb6a94369be8..a55a1e3238addee6966dcc7b3b697da5f195428b 100644
--- a/src/main/resources/fess_indices/fess/doc.json
+++ b/src/main/resources/fess_indices/fess/doc.json
@@ -574,6 +574,9 @@
"label": {
"type": "keyword"
},
+ "virtual_host": {
+ "type": "keyword"
+ },
"segment": {
"type": "keyword"
},
diff --git a/src/main/resources/fess_label.properties b/src/main/resources/fess_label.properties
index ae55aa1104e334f260f0087541d0a3dbf8d7927f..1f6fb113701665a746cfcd22d092065e5f44b01c 100644
--- a/src/main/resources/fess_label.properties
+++ b/src/main/resources/fess_label.properties
@@ -341,6 +341,7 @@ labels.number_of_thread=The number of Tread
labels.interval_time=Interval time
labels.millisec=ms
labels.permissions=Permissions
+labels.virtual_hosts=Virtual Hosts
labels.label_type=Label
labels.file_crawling_button_create=Create
labels.file_crawling_button_create_job=Create new job
diff --git a/src/main/resources/fess_label_en.properties b/src/main/resources/fess_label_en.properties
index a0c1bfedbfb0516d0555399e29461e35fcc6f54d..d93b24ecb708b418f14a96cf361df609df4075f6 100644
--- a/src/main/resources/fess_label_en.properties
+++ b/src/main/resources/fess_label_en.properties
@@ -341,6 +341,7 @@ labels.number_of_thread=The number of Tread
labels.interval_time=Interval time
labels.millisec=ms
labels.permissions=Permissions
+labels.virtual_hosts=Virtual Hosts
labels.label_type=Label
labels.file_crawling_button_create=Create
labels.file_crawling_button_create_job=Create new job
diff --git a/src/main/resources/fess_label_ja.properties b/src/main/resources/fess_label_ja.properties
index db37136244ee911c5a4208e610282d60b21d0f44..9c62d55816b2b77193de777dbef84482acfc4631 100644
--- a/src/main/resources/fess_label_ja.properties
+++ b/src/main/resources/fess_label_ja.properties
@@ -334,6 +334,7 @@ labels.number_of_thread=\u30b9\u30ec\u30c3\u30c9\u6570
labels.interval_time=\u9593\u9694
labels.millisec=\u30df\u30ea\u79d2
labels.permissions=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3
+labels.virtual_hosts=\u4eee\u60f3\u30db\u30b9\u30c8
labels.label_type=\u30e9\u30d9\u30eb
labels.file_crawling_button_create=\u4f5c\u6210
labels.file_crawling_button_create_job=\u65b0\u3057\u3044\u30b8\u30e7\u30d6\u306e\u4f5c\u6210
diff --git a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_details.jsp b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_details.jsp
index 3f07e3ce3a77f43f6d3fbfe064b52b88248b89e5..7d1a2d4a1df3aca194bfbdc54cbd4a372633c991 100644
--- a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_details.jsp
@@ -87,6 +87,11 @@
<td>${f:br(f:h(permissions))}<la:hidden
property="permissions" /></td>
</tr>
+ <tr>
+ <th><la:message key="labels.virtual_hosts" /></th>
+ <td>${f:br(f:h(virtualHosts))}<la:hidden
+ property="virtualHosts" /></td>
+ </tr>
<tr>
<th><la:message key="labels.label_type" /></th>
<td><c:forEach var="l" varStatus="s"
diff --git a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_edit.jsp b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_edit.jsp
index af1f90ff2f1cd8474af36fa158ae6fd558fa2f6b..edde9b8232263a5ad31d5813e4915fef6b42a5b6 100644
--- a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_edit.jsp
@@ -102,6 +102,15 @@
rows="5" />
</div>
</div>
+ <div class="form-group">
+ <label for="virtualHosts" class="col-sm-3 control-label"><la:message
+ key="labels.virtual_hosts" /></label>
+ <div class="col-sm-9">
+ <la:errors property="virtualHosts" />
+ <la:textarea styleId="virtualHosts" property="virtualHosts" styleClass="form-control"
+ rows="5" />
+ </div>
+ </div>
<div class="form-group">
<label for="labelTypeIds" class="col-sm-3 control-label"><la:message
key="labels.label_type" /></label>
diff --git a/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_details.jsp b/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_details.jsp
index 3d7f2058c791379874305b7d5851737ac30ff9ca..b395f172265b7f3e8826bbf979b674d1129e536e 100644
--- a/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_details.jsp
@@ -117,6 +117,11 @@
<td>${f:br(f:h(permissions))}<la:hidden
property="permissions" /></td>
</tr>
+ <tr>
+ <th><la:message key="labels.virtual_hosts" /></th>
+ <td>${f:br(f:h(virtualHosts))}<la:hidden
+ property="virtualHosts" /></td>
+ </tr>
<tr>
<th><la:message key="labels.label_type" /></th>
<td><c:forEach var="l" varStatus="s"
diff --git a/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_edit.jsp b/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_edit.jsp
index 31c9de400506b65176340bef13ced08d805a179d..b5a54e5115ec2048d85cf656dc4a0dda10266153 100644
--- a/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_edit.jsp
@@ -165,6 +165,15 @@
rows="5" />
</div>
</div>
+ <div class="form-group">
+ <label for="virtualHosts" class="col-sm-3 control-label"><la:message
+ key="labels.virtual_hosts" /></label>
+ <div class="col-sm-9">
+ <la:errors property="virtualHosts" />
+ <la:textarea styleId="virtualHosts" property="virtualHosts" styleClass="form-control"
+ rows="5" />
+ </div>
+ </div>
<div class="form-group">
<label for="labelTypeIds" class="col-sm-3 control-label"><la:message
key="labels.label_type" /></label>
diff --git a/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_details.jsp b/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_details.jsp
index b8e3a79a0fea779be733b73377380be766eaa84e..c7956340ffa0630d8fe1953bd39d46c05761d4f8 100644
--- a/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_details.jsp
@@ -121,6 +121,11 @@
<td>${f:br(f:h(permissions))}<la:hidden
property="permissions" /></td>
</tr>
+ <tr>
+ <th><la:message key="labels.virtual_hosts" /></th>
+ <td>${f:br(f:h(virtualHosts))}<la:hidden
+ property="virtualHosts" /></td>
+ </tr>
<tr>
<th><la:message key="labels.label_type" /></th>
<td><c:forEach var="l" varStatus="s"
diff --git a/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_edit.jsp b/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_edit.jsp
index 39bb2567cfa9bae41d87f8c0472853042f498de6..8213e3d3db9554a20e7fb46375f91fa40ec45a58 100644
--- a/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_edit.jsp
@@ -173,6 +173,15 @@
rows="5" />
</div>
</div>
+ <div class="form-group">
+ <label for="virtualHosts" class="col-sm-3 control-label"><la:message
+ key="labels.virtual_hosts" /></label>
+ <div class="col-sm-9">
+ <la:errors property="virtualHosts" />
+ <la:textarea styleId="virtualHosts" property="virtualHosts" styleClass="form-control"
+ rows="5" />
+ </div>
+ </div>
<div class="form-group">
<label for="labelTypeIds" class="col-sm-3 control-label"><la:message
key="labels.label_type" /></label>