Shinsuke Sugaya 3 rokov pred
rodič
commit
2a2ee01d47

+ 39 - 0
src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java

@@ -90,6 +90,8 @@ public class AdminUpgradeAction extends FessAdminAction {
 
     private static final String VERSION_13_13 = "13.13";
 
+    private static final String VERSION_13_14 = "13.14";
+
     // ===================================================================================
     //                                                                           Attribute
     //
@@ -178,6 +180,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_11();
                 upgradeFrom13_12();
                 upgradeFrom13_13();
+                upgradeFrom13_14();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -209,6 +212,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_11();
                 upgradeFrom13_12();
                 upgradeFrom13_13();
+                upgradeFrom13_14();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -239,6 +243,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_11();
                 upgradeFrom13_12();
                 upgradeFrom13_13();
+                upgradeFrom13_14();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -268,6 +273,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_11();
                 upgradeFrom13_12();
                 upgradeFrom13_13();
+                upgradeFrom13_14();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -296,6 +302,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_11();
                 upgradeFrom13_12();
                 upgradeFrom13_13();
+                upgradeFrom13_14();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -323,6 +330,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_11();
                 upgradeFrom13_12();
                 upgradeFrom13_13();
+                upgradeFrom13_14();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -349,6 +357,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_11();
                 upgradeFrom13_12();
                 upgradeFrom13_13();
+                upgradeFrom13_14();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -373,6 +382,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_11();
                 upgradeFrom13_12();
                 upgradeFrom13_13();
+                upgradeFrom13_14();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -397,6 +407,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_11();
                 upgradeFrom13_12();
                 upgradeFrom13_13();
+                upgradeFrom13_14();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -420,6 +431,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_11();
                 upgradeFrom13_12();
                 upgradeFrom13_13();
+                upgradeFrom13_14();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -442,6 +454,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_11();
                 upgradeFrom13_12();
                 upgradeFrom13_13();
+                upgradeFrom13_14();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -463,6 +476,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_11();
                 upgradeFrom13_12();
                 upgradeFrom13_13();
+                upgradeFrom13_14();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -483,6 +497,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_11();
                 upgradeFrom13_12();
                 upgradeFrom13_13();
+                upgradeFrom13_14();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -502,6 +517,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_11();
                 upgradeFrom13_12();
                 upgradeFrom13_13();
+                upgradeFrom13_14();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -520,6 +536,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_11();
                 upgradeFrom13_12();
                 upgradeFrom13_13();
+                upgradeFrom13_14();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -537,6 +554,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_11();
                 upgradeFrom13_12();
                 upgradeFrom13_13();
+                upgradeFrom13_14();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -553,6 +571,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_11();
                 upgradeFrom13_12();
                 upgradeFrom13_13();
+                upgradeFrom13_14();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -568,6 +587,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_11();
                 upgradeFrom13_12();
                 upgradeFrom13_13();
+                upgradeFrom13_14();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -582,6 +602,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_11();
                 upgradeFrom13_12();
                 upgradeFrom13_13();
+                upgradeFrom13_14();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -595,6 +616,7 @@ public class AdminUpgradeAction extends FessAdminAction {
             try {
                 upgradeFrom13_12();
                 upgradeFrom13_13();
+                upgradeFrom13_14();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -607,6 +629,7 @@ public class AdminUpgradeAction extends FessAdminAction {
         } else if (VERSION_13_13.equals(form.targetVersion)) {
             try {
                 upgradeFrom13_13();
+                upgradeFrom13_14();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -616,6 +639,18 @@ public class AdminUpgradeAction extends FessAdminAction {
                 logger.warn("Failed to upgrade data.", e);
                 saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_13, e.getLocalizedMessage()));
             }
+        } else if (VERSION_13_14.equals(form.targetVersion)) {
+            try {
+                upgradeFrom13_14();
+                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_14, e.getLocalizedMessage()));
+            }
         } else {
             saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
         }
@@ -719,6 +754,10 @@ public class AdminUpgradeAction extends FessAdminAction {
         // nothing
     }
 
+    private void upgradeFrom13_14() {
+        // nothing
+    }
+
     private void upgradeFromAll() {
         // nothing
     }

+ 1 - 0
src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp

@@ -72,6 +72,7 @@
 											<la:option value="13.11">13.11</la:option>
 											<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:select>
 									</div>
 								</div>