|
@@ -87,6 +87,8 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
|
|
|
|
private static final String VERSION_14_2 = "14.2";
|
|
private static final String VERSION_14_2 = "14.2";
|
|
|
|
|
|
|
|
+ private static final String VERSION_14_3 = "14.4";
|
|
|
|
+
|
|
// ===================================================================================
|
|
// ===================================================================================
|
|
// Attribute
|
|
// Attribute
|
|
//
|
|
//
|
|
@@ -174,6 +176,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_2();
|
|
upgradeFrom14_2();
|
|
|
|
+ upgradeFrom14_3();
|
|
upgradeFromAll();
|
|
upgradeFromAll();
|
|
|
|
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
@@ -205,6 +208,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_2();
|
|
upgradeFrom14_2();
|
|
|
|
+ upgradeFrom14_3();
|
|
upgradeFromAll();
|
|
upgradeFromAll();
|
|
|
|
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
@@ -235,6 +239,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_2();
|
|
upgradeFrom14_2();
|
|
|
|
+ upgradeFrom14_3();
|
|
upgradeFromAll();
|
|
upgradeFromAll();
|
|
|
|
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
@@ -264,6 +269,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_2();
|
|
upgradeFrom14_2();
|
|
|
|
+ upgradeFrom14_3();
|
|
upgradeFromAll();
|
|
upgradeFromAll();
|
|
|
|
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
@@ -292,6 +298,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_2();
|
|
upgradeFrom14_2();
|
|
|
|
+ upgradeFrom14_3();
|
|
upgradeFromAll();
|
|
upgradeFromAll();
|
|
|
|
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
@@ -319,6 +326,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_2();
|
|
upgradeFrom14_2();
|
|
|
|
+ upgradeFrom14_3();
|
|
upgradeFromAll();
|
|
upgradeFromAll();
|
|
|
|
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
@@ -345,6 +353,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_2();
|
|
upgradeFrom14_2();
|
|
|
|
+ upgradeFrom14_3();
|
|
upgradeFromAll();
|
|
upgradeFromAll();
|
|
|
|
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
@@ -370,6 +379,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_2();
|
|
upgradeFrom14_2();
|
|
|
|
+ upgradeFrom14_3();
|
|
upgradeFromAll();
|
|
upgradeFromAll();
|
|
|
|
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
@@ -394,6 +404,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_2();
|
|
upgradeFrom14_2();
|
|
|
|
+ upgradeFrom14_3();
|
|
upgradeFromAll();
|
|
upgradeFromAll();
|
|
|
|
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
@@ -417,6 +428,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_2();
|
|
upgradeFrom14_2();
|
|
|
|
+ upgradeFrom14_3();
|
|
upgradeFromAll();
|
|
upgradeFromAll();
|
|
|
|
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
@@ -439,6 +451,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_2();
|
|
upgradeFrom14_2();
|
|
|
|
+ upgradeFrom14_3();
|
|
upgradeFromAll();
|
|
upgradeFromAll();
|
|
|
|
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
@@ -459,6 +472,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
upgradeFrom13_17();
|
|
upgradeFrom13_17();
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_2();
|
|
upgradeFrom14_2();
|
|
|
|
+ upgradeFrom14_3();
|
|
upgradeFromAll();
|
|
upgradeFromAll();
|
|
|
|
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
@@ -478,6 +492,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
upgradeFrom13_17();
|
|
upgradeFrom13_17();
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_2();
|
|
upgradeFrom14_2();
|
|
|
|
+ upgradeFrom14_3();
|
|
upgradeFromAll();
|
|
upgradeFromAll();
|
|
|
|
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
@@ -496,6 +511,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
upgradeFrom13_17();
|
|
upgradeFrom13_17();
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_2();
|
|
upgradeFrom14_2();
|
|
|
|
+ upgradeFrom14_3();
|
|
upgradeFromAll();
|
|
upgradeFromAll();
|
|
|
|
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
@@ -513,6 +529,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
upgradeFrom13_17();
|
|
upgradeFrom13_17();
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_2();
|
|
upgradeFrom14_2();
|
|
|
|
+ upgradeFrom14_3();
|
|
upgradeFromAll();
|
|
upgradeFromAll();
|
|
|
|
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
@@ -530,6 +547,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_2();
|
|
upgradeFrom14_2();
|
|
|
|
+ upgradeFrom14_3();
|
|
upgradeFromAll();
|
|
upgradeFromAll();
|
|
|
|
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
@@ -546,6 +564,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_2();
|
|
upgradeFrom14_2();
|
|
|
|
+ upgradeFrom14_3();
|
|
upgradeFromAll();
|
|
upgradeFromAll();
|
|
|
|
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
@@ -561,6 +580,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_2();
|
|
upgradeFrom14_2();
|
|
|
|
+ upgradeFrom14_3();
|
|
upgradeFromAll();
|
|
upgradeFromAll();
|
|
|
|
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
@@ -575,6 +595,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_0();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_2();
|
|
upgradeFrom14_2();
|
|
|
|
+ upgradeFrom14_3();
|
|
upgradeFromAll();
|
|
upgradeFromAll();
|
|
|
|
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
@@ -588,6 +609,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
try {
|
|
try {
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_1();
|
|
upgradeFrom14_2();
|
|
upgradeFrom14_2();
|
|
|
|
+ upgradeFrom14_3();
|
|
upgradeFromAll();
|
|
upgradeFromAll();
|
|
|
|
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
@@ -600,6 +622,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
} else if (VERSION_14_2.equals(form.targetVersion)) {
|
|
} else if (VERSION_14_2.equals(form.targetVersion)) {
|
|
try {
|
|
try {
|
|
upgradeFrom14_2();
|
|
upgradeFrom14_2();
|
|
|
|
+ upgradeFrom14_3();
|
|
upgradeFromAll();
|
|
upgradeFromAll();
|
|
|
|
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
|
@@ -609,6 +632,18 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
logger.warn("Failed to upgrade data.", e);
|
|
logger.warn("Failed to upgrade data.", e);
|
|
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_2, e.getLocalizedMessage()));
|
|
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_2, e.getLocalizedMessage()));
|
|
}
|
|
}
|
|
|
|
+ } else if (VERSION_14_3.equals(form.targetVersion)) {
|
|
|
|
+ try {
|
|
|
|
+ upgradeFrom14_3();
|
|
|
|
+ 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_14_3, e.getLocalizedMessage()));
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
|
|
saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
|
|
}
|
|
}
|
|
@@ -761,6 +796,10 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
// nothing
|
|
// nothing
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ private void upgradeFrom14_3() {
|
|
|
|
+ // nothing
|
|
|
|
+ }
|
|
|
|
+
|
|
private void upgradeFromAll() {
|
|
private void upgradeFromAll() {
|
|
// nothing
|
|
// nothing
|
|
}
|
|
}
|