diff --git a/src/main/java/org/codelibs/fess/es/exentity/FileAuthentication.java b/src/main/java/org/codelibs/fess/es/exentity/FileAuthentication.java index c339197dca3553a7497590238b9737fe7bcd4a27..7729deab084202567b8fae4f491c8e0e16ac0ce3 100644 --- a/src/main/java/org/codelibs/fess/es/exentity/FileAuthentication.java +++ b/src/main/java/org/codelibs/fess/es/exentity/FileAuthentication.java @@ -1,6 +1,8 @@ package org.codelibs.fess.es.exentity; import org.codelibs.fess.es.bsentity.BsFileAuthentication; +import org.codelibs.fess.service.FileConfigService; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen @@ -8,6 +10,7 @@ import org.codelibs.fess.es.bsentity.BsFileAuthentication; public class FileAuthentication extends BsFileAuthentication { private static final long serialVersionUID = 1L; + private FileConfig fileConfig; @Override public String getId() { @@ -26,4 +29,12 @@ public class FileAuthentication extends BsFileAuthentication { public void setVersionNo(Long version) { asDocMeta().version(version); } + + public FileConfig getFileConfig() { + if (fileConfig == null) { + final FileConfigService fileConfigService = ComponentUtil.getComponent(FileConfigService.class); + fileConfig = fileConfigService.getFileConfig(getFileConfigId()); + } + return fileConfig; + } } diff --git a/src/main/java/org/codelibs/fess/es/exentity/RequestHeader.java b/src/main/java/org/codelibs/fess/es/exentity/RequestHeader.java index 00c33bd5b241750dd3654953c4c94b3d04c9381d..d6dd504927c666ef7c9bcc8b5ee65ee4bea967d1 100644 --- a/src/main/java/org/codelibs/fess/es/exentity/RequestHeader.java +++ b/src/main/java/org/codelibs/fess/es/exentity/RequestHeader.java @@ -1,6 +1,8 @@ package org.codelibs.fess.es.exentity; import org.codelibs.fess.es.bsentity.BsRequestHeader; +import org.codelibs.fess.service.WebConfigService; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen @@ -8,6 +10,7 @@ import org.codelibs.fess.es.bsentity.BsRequestHeader; public class RequestHeader extends BsRequestHeader { private static final long serialVersionUID = 1L; + private WebConfig webConfig; @Override public String getId() { @@ -30,4 +33,12 @@ public class RequestHeader extends BsRequestHeader { public org.codelibs.robot.client.http.RequestHeader getS2RobotRequestHeader() { return new org.codelibs.robot.client.http.RequestHeader(getName(), getValue()); } + + public WebConfig getWebConfig() { + if (webConfig == null) { + final WebConfigService webConfigService = ComponentUtil.getComponent(WebConfigService.class); + webConfig = webConfigService.getWebConfig(getWebConfigId()); + } + return webConfig; + } } diff --git a/src/main/java/org/codelibs/fess/web/admin/FileAuthenticationForm.java b/src/main/java/org/codelibs/fess/web/admin/FileAuthenticationForm.java index f2730d4e279369796322b9361d4e64ef1ff59389..99b46fe43a71c6229ddba46bbd56b17f61467e9f 100644 --- a/src/main/java/org/codelibs/fess/web/admin/FileAuthenticationForm.java +++ b/src/main/java/org/codelibs/fess/web/admin/FileAuthenticationForm.java @@ -67,7 +67,7 @@ public class FileAuthenticationForm implements Serializable { public String parameters; @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") - @LongType + @Maxbytelength(maxbytelength = 1000) public String fileConfigId; @Required(target = "confirmfromupdate,update,delete") diff --git a/src/main/webapp/WEB-INF/view/admin/fileAuthentication/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/fileAuthentication/confirm.jsp index 10eee1f0a6e3afff31d5a347cf8130894720723c..b99b269a34db0bc6d4dcfdce3aff1a024aaafa51 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileAuthentication/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileAuthentication/confirm.jsp @@ -1,134 +1,172 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.file_authentication_configuration" /> + + + +
+ + + + + -

- -

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

    + +

    +
-
+ + - <%-- Confirm Form: BEGIN --%> - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
${f:h(hostname)}
${f:h(port)}
- ${f:h(item.label)} -
${f:h(username)}
******
${f:br(f:h(parameters))}
- ${f:h(item.label)} -
- " /> - " /> - - " /> - " /> - - " /> - " /> - - " /> - " /> - " /> -
-
-
- <%-- Confirm Form: BEGIN --%> +
+ + <%-- Form --%> + + + + + + + + +
+
+
+ <%-- Box Header --%> +
+

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

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

- -

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

    + +

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

+ + + + + + +

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

+ +

+ +
- - +
+ +
+

Error

+

+ +

+

+ + + +

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

- -

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

    + +

    +
-
- - - - - -
- -

- -

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

+ +

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

+ +

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

- -

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

    + +

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

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

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

- -

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

    + +

    + +
    + +
    + + <%-- Form --%> + + + + + -
-
+ + - <%-- Edit Form: BEGIN --%> - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - ${f:h(item.label)} - -
- " /> - " /> - - " /> - " /> -
-
-
- <%-- Edit Form: BEGIN --%> +
+
+
+ <%-- Box Header --%> +
+

+ + + + + + +

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

+ +

+ +
- - +
+ +
+

Error

+

+ +

+

+ + + +

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

- -

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

    + +

    +
-
- - - - - -
- -

- -

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

+ +

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

+ +

+
+ + + + + + + + + + + + + + + + +
${f:h(data.name)}${f:h(data.webConfig.name)}
+
+ +
+ <%-- Box Footer --%> + +
+
- <%-- Page Navigation: END --%> - + +
- <%-- List: END --%> - - + +
+ + + diff --git a/src/main/webapp/WEB-INF/view/admin/webAuthentication/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/webAuthentication/confirm.jsp index 11e5823dc8cda7a8f5a1a1b3c3e2d355c0887211..f31401fb6f29a1f5c42af855e69359d3746475dd 100644 --- a/src/main/webapp/WEB-INF/view/admin/webAuthentication/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webAuthentication/confirm.jsp @@ -1,136 +1,176 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - - - - - - - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + +Fess | <bean:message key="labels.web_authentication_configuration" /> + + + +
+ + + + + -

- -

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

    + +

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

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

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

- -

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

    + +

    + +
    + +
    + + <%-- Form --%> + + + + + -
-
+ + - <%-- Edit Form: BEGIN --%> - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - ${f:h(item.label)} - -
- - ${f:h(item.label)} - -
- " /> - " /> - - " /> - " /> -
-
-
- <%-- Edit Form: BEGIN --%> +
+
+
+ <%-- Box Header --%> +
+

+ + + + + + +

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

+ +

+ +
- - +
+ +
+

Error

+

+ +

+

+ + + +

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

- -

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

    + +

    +
-
- - - - - -
- -

- -

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

+ +

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

+ +

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