瀏覽代碼

fix #2570 add 13.12

Shinsuke Sugaya 4 年之前
父節點
當前提交
447f2814fc

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

@@ -86,6 +86,8 @@ public class AdminUpgradeAction extends FessAdminAction {
 
 
     private static final String VERSION_13_11 = "13.11";
     private static final String VERSION_13_11 = "13.11";
 
 
+    private static final String VERSION_13_12 = "13.12";
+
     // ===================================================================================
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           Attribute
     //
     //
@@ -172,6 +174,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_9();
                 upgradeFrom13_9();
                 upgradeFrom13_10();
                 upgradeFrom13_10();
                 upgradeFrom13_11();
                 upgradeFrom13_11();
+                upgradeFrom13_12();
                 upgradeFromAll();
                 upgradeFromAll();
 
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -201,6 +204,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_9();
                 upgradeFrom13_9();
                 upgradeFrom13_10();
                 upgradeFrom13_10();
                 upgradeFrom13_11();
                 upgradeFrom13_11();
+                upgradeFrom13_12();
                 upgradeFromAll();
                 upgradeFromAll();
 
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -229,6 +233,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_9();
                 upgradeFrom13_9();
                 upgradeFrom13_10();
                 upgradeFrom13_10();
                 upgradeFrom13_11();
                 upgradeFrom13_11();
+                upgradeFrom13_12();
                 upgradeFromAll();
                 upgradeFromAll();
 
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -256,6 +261,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_9();
                 upgradeFrom13_9();
                 upgradeFrom13_10();
                 upgradeFrom13_10();
                 upgradeFrom13_11();
                 upgradeFrom13_11();
+                upgradeFrom13_12();
                 upgradeFromAll();
                 upgradeFromAll();
 
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -282,6 +288,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_9();
                 upgradeFrom13_9();
                 upgradeFrom13_10();
                 upgradeFrom13_10();
                 upgradeFrom13_11();
                 upgradeFrom13_11();
+                upgradeFrom13_12();
                 upgradeFromAll();
                 upgradeFromAll();
 
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -307,6 +314,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_9();
                 upgradeFrom13_9();
                 upgradeFrom13_10();
                 upgradeFrom13_10();
                 upgradeFrom13_11();
                 upgradeFrom13_11();
+                upgradeFrom13_12();
                 upgradeFromAll();
                 upgradeFromAll();
 
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -331,6 +339,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_9();
                 upgradeFrom13_9();
                 upgradeFrom13_10();
                 upgradeFrom13_10();
                 upgradeFrom13_11();
                 upgradeFrom13_11();
+                upgradeFrom13_12();
                 upgradeFromAll();
                 upgradeFromAll();
 
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -353,6 +362,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_8();
                 upgradeFrom13_8();
                 upgradeFrom13_10();
                 upgradeFrom13_10();
                 upgradeFrom13_11();
                 upgradeFrom13_11();
+                upgradeFrom13_12();
                 upgradeFromAll();
                 upgradeFromAll();
 
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -375,6 +385,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_9();
                 upgradeFrom13_9();
                 upgradeFrom13_10();
                 upgradeFrom13_10();
                 upgradeFrom13_11();
                 upgradeFrom13_11();
+                upgradeFrom13_12();
                 upgradeFromAll();
                 upgradeFromAll();
 
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -396,6 +407,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_9();
                 upgradeFrom13_9();
                 upgradeFrom13_10();
                 upgradeFrom13_10();
                 upgradeFrom13_11();
                 upgradeFrom13_11();
+                upgradeFrom13_12();
                 upgradeFromAll();
                 upgradeFromAll();
 
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -416,6 +428,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_9();
                 upgradeFrom13_9();
                 upgradeFrom13_10();
                 upgradeFrom13_10();
                 upgradeFrom13_11();
                 upgradeFrom13_11();
+                upgradeFrom13_12();
                 upgradeFromAll();
                 upgradeFromAll();
 
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -435,6 +448,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_9();
                 upgradeFrom13_9();
                 upgradeFrom13_10();
                 upgradeFrom13_10();
                 upgradeFrom13_11();
                 upgradeFrom13_11();
+                upgradeFrom13_12();
                 upgradeFromAll();
                 upgradeFromAll();
 
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -453,6 +467,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_9();
                 upgradeFrom13_9();
                 upgradeFrom13_10();
                 upgradeFrom13_10();
                 upgradeFrom13_11();
                 upgradeFrom13_11();
+                upgradeFrom13_12();
                 upgradeFromAll();
                 upgradeFromAll();
 
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -470,6 +485,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_9();
                 upgradeFrom13_9();
                 upgradeFrom13_10();
                 upgradeFrom13_10();
                 upgradeFrom13_11();
                 upgradeFrom13_11();
+                upgradeFrom13_12();
                 upgradeFromAll();
                 upgradeFromAll();
 
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -486,6 +502,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_9();
                 upgradeFrom13_9();
                 upgradeFrom13_10();
                 upgradeFrom13_10();
                 upgradeFrom13_11();
                 upgradeFrom13_11();
+                upgradeFrom13_12();
                 upgradeFromAll();
                 upgradeFromAll();
 
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -501,6 +518,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_9();
                 upgradeFrom13_9();
                 upgradeFrom13_10();
                 upgradeFrom13_10();
                 upgradeFrom13_11();
                 upgradeFrom13_11();
+                upgradeFrom13_12();
                 upgradeFromAll();
                 upgradeFromAll();
 
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -515,6 +533,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_9();
                 upgradeFrom13_9();
                 upgradeFrom13_10();
                 upgradeFrom13_10();
                 upgradeFrom13_11();
                 upgradeFrom13_11();
+                upgradeFrom13_12();
                 upgradeFromAll();
                 upgradeFromAll();
 
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -528,6 +547,7 @@ public class AdminUpgradeAction extends FessAdminAction {
             try {
             try {
                 upgradeFrom13_10();
                 upgradeFrom13_10();
                 upgradeFrom13_11();
                 upgradeFrom13_11();
+                upgradeFrom13_12();
                 upgradeFromAll();
                 upgradeFromAll();
 
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -540,6 +560,19 @@ public class AdminUpgradeAction extends FessAdminAction {
         } else if (VERSION_13_11.equals(form.targetVersion)) {
         } else if (VERSION_13_11.equals(form.targetVersion)) {
             try {
             try {
                 upgradeFrom13_11();
                 upgradeFrom13_11();
+                upgradeFrom13_12();
+                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_11, e.getLocalizedMessage()));
+            }
+        } else if (VERSION_13_12.equals(form.targetVersion)) {
+            try {
+                upgradeFrom13_12();
                 upgradeFromAll();
                 upgradeFromAll();
 
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -644,6 +677,10 @@ public class AdminUpgradeAction extends FessAdminAction {
         // nothing
         // nothing
     }
     }
 
 
+    private void upgradeFrom13_12() {
+        // nothing
+    }
+
     private void upgradeFromAll() {
     private void upgradeFromAll() {
         // nothing
         // nothing
     }
     }

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

@@ -70,6 +70,7 @@
 											<la:option value="13.9">13.9</la:option>
 											<la:option value="13.9">13.9</la:option>
 											<la:option value="13.10">13.10</la:option>
 											<la:option value="13.10">13.10</la:option>
 											<la:option value="13.11">13.11</la:option>
 											<la:option value="13.11">13.11</la:option>
+											<la:option value="13.12">13.12</la:option>
 										</la:select>
 										</la:select>
 									</div>
 									</div>
 								</div>
 								</div>