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

fix #2613 add 13.15

Browse source
This commit is contained in:
Shinsuke Sugaya 2021-12-18 11:07:28 +09:00
parent 7fc31be080
commit 9a9bf591a9
2 changed files with 34 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
View file

@ -74,6 +74,8 @@ public class AdminUpgradeAction extends FessAdminAction {
private static final String VERSION_13_14 = "13.14";
private static final String VERSION_13_15 = "13.15";
// ===================================================================================
// Attribute
//
@ -155,6 +157,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_12();
upgradeFrom13_13();
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -180,6 +183,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_12();
upgradeFrom13_13();
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -204,6 +208,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_12();
upgradeFrom13_13();
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -227,6 +232,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_12();
upgradeFrom13_13();
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -249,6 +255,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_12();
upgradeFrom13_13();
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -270,6 +277,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_12();
upgradeFrom13_13();
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -290,6 +298,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_12();
upgradeFrom13_13();
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -309,6 +318,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_12();
upgradeFrom13_13();
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -327,6 +337,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_12();
upgradeFrom13_13();
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -344,6 +355,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_12();
upgradeFrom13_13();
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -360,6 +372,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_12();
upgradeFrom13_13();
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -375,6 +388,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_12();
upgradeFrom13_13();
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -389,6 +403,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_12();
upgradeFrom13_13();
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -402,6 +417,7 @@ public class AdminUpgradeAction extends FessAdminAction {
try {
upgradeFrom13_13();
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -414,6 +430,7 @@ public class AdminUpgradeAction extends FessAdminAction {
} else if (VERSION_13_14.equals(form.targetVersion)) {
try {
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -423,6 +440,18 @@ public class AdminUpgradeAction extends FessAdminAction {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_14, e.getLocalizedMessage()));
}
} else if (VERSION_13_15.equals(form.targetVersion)) {
try {
upgradeFrom13_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
systemHelper.reloadConfiguration();
} catch (final Exception e) {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_15, e.getLocalizedMessage()));
}
} else {
saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
}
@ -490,6 +519,10 @@ public class AdminUpgradeAction extends FessAdminAction {
// nothing
}
private void upgradeFrom13_15() {
// nothing
}
private void upgradeFromAll() {
// nothing
}

1
src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp
View file

@ -65,6 +65,7 @@
<la:option value="13.12">13.12</la:option>
<la:option value="13.13">13.13</la:option>
<la:option value="13.14">13.14</la:option>
<la:option value="13.14">13.15</la:option>
</la:select>
</div>
</div>