0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

elasticsearch 5.1.2 support

Browse source
This commit is contained in:
Shinsuke Sugaya 2017-01-15 16:05:23 +09:00
parent 9d256dc7b4
commit a048b03ca7
6 changed files with 81 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pom.xml
View file

@ -39,11 +39,11 @@
<maven.compiler.target>1.8</maven.compiler.target>
<!-- Main Framework -->
<dbflute.version>1.1.1</dbflute.version>
<lastaflute.version>0.8.6</lastaflute.version>
<dbflute.version>1.1.2</dbflute.version>
<lastaflute.version>0.8.8</lastaflute.version>
<lasta.taglib.version>0.7.1</lasta.taglib.version>
<lasta.job.version>0.2.5</lasta.job.version>
<mailflute.version>0.5.1</mailflute.version>
<mailflute.version>0.5.2</mailflute.version>
<!-- Partner Library -->
<slf4j.version>1.7.21</slf4j.version>
@ -54,7 +54,7 @@
<!-- Testing -->
<junit.version>4.12</junit.version>
<utflute.version>0.6.3</utflute.version>
<utflute.version>0.6.6</utflute.version>
<!-- Crawler -->
<crawler.version>1.1.0-SNAPSHOT</crawler.version>
@ -63,12 +63,12 @@
<suggest.version>5.1.0-SNAPSHOT</suggest.version>
<!-- Elasticsearch -->
<elasticsearch.version>5.1.1</elasticsearch.version>
<cluster.runner.version>5.1.1.0</cluster.runner.version>
<elasticsearch.version>5.1.2</elasticsearch.version>
<cluster.runner.version>5.1.2.0</cluster.runner.version>
<!-- Tomcat -->
<tomcat.version>8.5.5</tomcat.version>
<tomcat.boot.version>0.5.0</tomcat.boot.version>
<tomcat.version>8.5.9</tomcat.version>
<tomcat.boot.version>0.5.1</tomcat.boot.version>
<!-- DEB & RPM build -->
<packaging.fess.home.dir>/usr/share/fess</packaging.fess.home.dir>

4
src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java
View file

@ -156,12 +156,12 @@ public abstract class FessBaseAction extends TypicalAction // has several interf
protected void saveInfo(final VaMessenger<FessMessages> validationMessagesLambda) {
final FessMessages messages = createMessages();
validationMessagesLambda.message(messages);
sessionManager.info().save(messages);
sessionManager.info().saveMessages(messages);
}
protected void saveError(final VaMessenger<FessMessages> validationMessagesLambda) {
final FessMessages messages = createMessages();
validationMessagesLambda.message(messages);
sessionManager.errors().save(messages);
sessionManager.errors().saveMessages(messages);
}
}

13
src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java
View file

@ -572,6 +572,19 @@ public abstract class EsAbstractConditionBean implements ConditionBean {
// do nothing
}
// no annotation for compatible with 1.1.1
public void enableSpecifyColumnRequired() {
// do nothing
}
public void disableSpecifyColumnRequired() {
// do nothing
}
public void xcheckSpecifyColumnRequiredIfNeeds() {
// do nothing
}
@Override
public boolean hasSpecifiedLocalColumn() {
return false;

13
src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java
View file

@ -572,6 +572,19 @@ public abstract class EsAbstractConditionBean implements ConditionBean {
// do nothing
}
// no annotation for compatible with 1.1.1
public void enableSpecifyColumnRequired() {
// do nothing
}
public void disableSpecifyColumnRequired() {
// do nothing
}
public void xcheckSpecifyColumnRequiredIfNeeds() {
// do nothing
}
@Override
public boolean hasSpecifiedLocalColumn() {
return false;

13
src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java
View file

@ -572,6 +572,19 @@ public abstract class EsAbstractConditionBean implements ConditionBean {
// do nothing
}
// no annotation for compatible with 1.1.1
public void enableSpecifyColumnRequired() {
// do nothing
}
public void disableSpecifyColumnRequired() {
// do nothing
}
public void xcheckSpecifyColumnRequiredIfNeeds() {
// do nothing
}
@Override
public boolean hasSpecifiedLocalColumn() {
return false;

38
src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
View file

@ -537,6 +537,9 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/** The key of the configuration. e.g. .fess_basic_config.bulk,.fess_config.bulk,.fess_user.bulk,system.properties */
String INDEX_BACKUP_TARGETS = "index.backup.targets";
/** The key of the configuration. e.g. 4000 */
String FORM_ADMIN_MAX_INPUT_SIZE = "form.admin.max.input.size";
/** The key of the configuration. e.g. admin */
String AUTHENTICATION_ADMIN_USERS = "authentication.admin.users";
@ -573,10 +576,10 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/** The key of the configuration. e.g. FES */
String COOKIE_REMEMBER_ME_HARBOR_KEY = "cookie.remember.me.harbor.key";
/** The key of the configuration. e.g. 4 */
/** The key of the configuration. e.g. 25 */
String PAGING_PAGE_SIZE = "paging.page.size";
/** The key of the configuration. e.g. 3 */
/** The key of the configuration. e.g. 5 */
String PAGING_PAGE_RANGE_SIZE = "paging.page.range.size";
/** The key of the configuration. e.g. true */
@ -2627,6 +2630,21 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
*/
String getIndexBackupTargets();
/**
* Get the value for the key 'form.admin.max.input.size'. <br>
* The value is, e.g. 4000 <br>
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
String getFormAdminMaxInputSize();
/**
* Get the value for the key 'form.admin.max.input.size' as {@link Integer}. <br>
* The value is, e.g. 4000 <br>
* @return The value of found property. (NotNull: if not found, exception but basically no way)
* @throws NumberFormatException When the property is not integer.
*/
Integer getFormAdminMaxInputSizeAsInteger();
/**
* Get the value for the key 'authentication.admin.users'. <br>
* The value is, e.g. admin <br>
@ -2760,7 +2778,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/**
* Get the value for the key 'paging.page.size'. <br>
* The value is, e.g. 4 <br>
* The value is, e.g. 25 <br>
* comment: The size of one page for paging
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
@ -2768,7 +2786,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/**
* Get the value for the key 'paging.page.size' as {@link Integer}. <br>
* The value is, e.g. 4 <br>
* The value is, e.g. 25 <br>
* comment: The size of one page for paging
* @return The value of found property. (NotNull: if not found, exception but basically no way)
* @throws NumberFormatException When the property is not integer.
@ -2777,7 +2795,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/**
* Get the value for the key 'paging.page.range.size'. <br>
* The value is, e.g. 3 <br>
* The value is, e.g. 5 <br>
* comment: The size of page range for paging
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
@ -2785,7 +2803,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/**
* Get the value for the key 'paging.page.range.size' as {@link Integer}. <br>
* The value is, e.g. 3 <br>
* The value is, e.g. 5 <br>
* comment: The size of page range for paging
* @return The value of found property. (NotNull: if not found, exception but basically no way)
* @throws NumberFormatException When the property is not integer.
@ -5210,6 +5228,14 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
return get(FessConfig.INDEX_BACKUP_TARGETS);
}
public String getFormAdminMaxInputSize() {
return get(FessConfig.FORM_ADMIN_MAX_INPUT_SIZE);
}
public Integer getFormAdminMaxInputSizeAsInteger() {
return getAsInteger(FessConfig.FORM_ADMIN_MAX_INPUT_SIZE);
}
public String getAuthenticationAdminUsers() {
return get(FessConfig.AUTHENTICATION_ADMIN_USERS);
}