|
@@ -19,7 +19,6 @@ import javax.annotation.Resource;
|
|
|
|
|
|
import org.apache.logging.log4j.LogManager;
|
|
|
import org.apache.logging.log4j.Logger;
|
|
|
-import org.codelibs.fesen.client.IndicesAdminClient;
|
|
|
import org.codelibs.fess.annotation.Secured;
|
|
|
import org.codelibs.fess.app.service.ScheduledJobService;
|
|
|
import org.codelibs.fess.app.web.base.FessAdminAction;
|
|
@@ -31,7 +30,6 @@ import org.codelibs.fess.es.config.exbhv.LabelTypeBhv;
|
|
|
import org.codelibs.fess.es.config.exbhv.RoleTypeBhv;
|
|
|
import org.codelibs.fess.es.config.exbhv.WebConfigBhv;
|
|
|
import org.codelibs.fess.es.user.exbhv.RoleBhv;
|
|
|
-import org.codelibs.fess.util.ComponentUtil;
|
|
|
import org.codelibs.fess.util.UpgradeUtil;
|
|
|
import org.lastaflute.web.Execute;
|
|
|
import org.lastaflute.web.response.HtmlResponse;
|
|
@@ -46,22 +44,6 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
|
//
|
|
|
private static final Logger logger = LogManager.getLogger(AdminUpgradeAction.class);
|
|
|
|
|
|
- private static final String VERSION_12_0 = "12.0";
|
|
|
-
|
|
|
- private static final String VERSION_12_1 = "12.1";
|
|
|
-
|
|
|
- private static final String VERSION_12_2 = "12.2";
|
|
|
-
|
|
|
- private static final String VERSION_12_3 = "12.3";
|
|
|
-
|
|
|
- private static final String VERSION_12_4 = "12.4";
|
|
|
-
|
|
|
- private static final String VERSION_12_5 = "12.5";
|
|
|
-
|
|
|
- private static final String VERSION_12_6 = "12.6";
|
|
|
-
|
|
|
- private static final String VERSION_12_7 = "12.7";
|
|
|
-
|
|
|
private static final String VERSION_13_0 = "13.0";
|
|
|
|
|
|
private static final String VERSION_13_1 = "13.1";
|
|
@@ -157,217 +139,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
|
validate(form, messages -> {}, this::asIndexHtml);
|
|
|
verifyToken(this::asIndexHtml);
|
|
|
|
|
|
- if (VERSION_12_0.equals(form.targetVersion)) {
|
|
|
- try {
|
|
|
- upgradeFrom12_0();
|
|
|
- upgradeFrom12_1();
|
|
|
- upgradeFrom12_2();
|
|
|
- upgradeFrom12_3();
|
|
|
- upgradeFrom12_4();
|
|
|
- upgradeFrom12_5();
|
|
|
- upgradeFrom12_6();
|
|
|
- upgradeFrom13_0();
|
|
|
- upgradeFrom13_1();
|
|
|
- upgradeFrom13_2();
|
|
|
- upgradeFrom13_3();
|
|
|
- upgradeFrom13_4();
|
|
|
- upgradeFrom13_5();
|
|
|
- upgradeFrom13_6();
|
|
|
- upgradeFrom13_7();
|
|
|
- upgradeFrom13_8();
|
|
|
- upgradeFrom13_9();
|
|
|
- upgradeFrom13_10();
|
|
|
- upgradeFrom13_11();
|
|
|
- upgradeFrom13_12();
|
|
|
- upgradeFrom13_13();
|
|
|
- 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_12_0, e.getLocalizedMessage()));
|
|
|
- }
|
|
|
- } else if (VERSION_12_1.equals(form.targetVersion)) {
|
|
|
- try {
|
|
|
- upgradeFrom12_1();
|
|
|
- upgradeFrom12_2();
|
|
|
- upgradeFrom12_3();
|
|
|
- upgradeFrom12_4();
|
|
|
- upgradeFrom12_5();
|
|
|
- upgradeFrom12_6();
|
|
|
- upgradeFrom13_0();
|
|
|
- upgradeFrom13_1();
|
|
|
- upgradeFrom13_2();
|
|
|
- upgradeFrom13_3();
|
|
|
- upgradeFrom13_4();
|
|
|
- upgradeFrom13_5();
|
|
|
- upgradeFrom13_6();
|
|
|
- upgradeFrom13_7();
|
|
|
- upgradeFrom13_8();
|
|
|
- upgradeFrom13_9();
|
|
|
- upgradeFrom13_10();
|
|
|
- upgradeFrom13_11();
|
|
|
- upgradeFrom13_12();
|
|
|
- upgradeFrom13_13();
|
|
|
- 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_12_1, e.getLocalizedMessage()));
|
|
|
- }
|
|
|
- } else if (VERSION_12_2.equals(form.targetVersion)) {
|
|
|
- try {
|
|
|
- upgradeFrom12_2();
|
|
|
- upgradeFrom12_3();
|
|
|
- upgradeFrom12_4();
|
|
|
- upgradeFrom12_5();
|
|
|
- upgradeFrom12_6();
|
|
|
- upgradeFrom13_0();
|
|
|
- upgradeFrom13_1();
|
|
|
- upgradeFrom13_2();
|
|
|
- upgradeFrom13_3();
|
|
|
- upgradeFrom13_4();
|
|
|
- upgradeFrom13_5();
|
|
|
- upgradeFrom13_6();
|
|
|
- upgradeFrom13_7();
|
|
|
- upgradeFrom13_8();
|
|
|
- upgradeFrom13_9();
|
|
|
- upgradeFrom13_10();
|
|
|
- upgradeFrom13_11();
|
|
|
- upgradeFrom13_12();
|
|
|
- upgradeFrom13_13();
|
|
|
- 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_12_2, e.getLocalizedMessage()));
|
|
|
- }
|
|
|
- } else if (VERSION_12_3.equals(form.targetVersion)) {
|
|
|
- try {
|
|
|
- upgradeFrom12_3();
|
|
|
- upgradeFrom12_4();
|
|
|
- upgradeFrom12_5();
|
|
|
- upgradeFrom12_6();
|
|
|
- upgradeFrom13_0();
|
|
|
- upgradeFrom13_1();
|
|
|
- upgradeFrom13_2();
|
|
|
- upgradeFrom13_3();
|
|
|
- upgradeFrom13_4();
|
|
|
- upgradeFrom13_5();
|
|
|
- upgradeFrom13_6();
|
|
|
- upgradeFrom13_7();
|
|
|
- upgradeFrom13_8();
|
|
|
- upgradeFrom13_9();
|
|
|
- upgradeFrom13_10();
|
|
|
- upgradeFrom13_11();
|
|
|
- upgradeFrom13_12();
|
|
|
- upgradeFrom13_13();
|
|
|
- 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_12_3, e.getLocalizedMessage()));
|
|
|
- }
|
|
|
- } else if (VERSION_12_4.equals(form.targetVersion)) {
|
|
|
- try {
|
|
|
- upgradeFrom12_4();
|
|
|
- upgradeFrom12_5();
|
|
|
- upgradeFrom12_6();
|
|
|
- upgradeFrom13_0();
|
|
|
- upgradeFrom13_1();
|
|
|
- upgradeFrom13_2();
|
|
|
- upgradeFrom13_3();
|
|
|
- upgradeFrom13_4();
|
|
|
- upgradeFrom13_5();
|
|
|
- upgradeFrom13_6();
|
|
|
- upgradeFrom13_7();
|
|
|
- upgradeFrom13_8();
|
|
|
- upgradeFrom13_9();
|
|
|
- upgradeFrom13_10();
|
|
|
- upgradeFrom13_11();
|
|
|
- upgradeFrom13_12();
|
|
|
- upgradeFrom13_13();
|
|
|
- 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_12_4, e.getLocalizedMessage()));
|
|
|
- }
|
|
|
- } else if (VERSION_12_5.equals(form.targetVersion)) {
|
|
|
- try {
|
|
|
- upgradeFrom12_5();
|
|
|
- upgradeFrom12_6();
|
|
|
- upgradeFrom13_0();
|
|
|
- upgradeFrom13_1();
|
|
|
- upgradeFrom13_2();
|
|
|
- upgradeFrom13_3();
|
|
|
- upgradeFrom13_4();
|
|
|
- upgradeFrom13_5();
|
|
|
- upgradeFrom13_6();
|
|
|
- upgradeFrom13_7();
|
|
|
- upgradeFrom13_8();
|
|
|
- upgradeFrom13_9();
|
|
|
- upgradeFrom13_10();
|
|
|
- upgradeFrom13_11();
|
|
|
- upgradeFrom13_12();
|
|
|
- upgradeFrom13_13();
|
|
|
- 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_12_5, e.getLocalizedMessage()));
|
|
|
- }
|
|
|
- } else if (VERSION_12_6.equals(form.targetVersion) || VERSION_12_7.equals(form.targetVersion)) {
|
|
|
- try {
|
|
|
- upgradeFrom12_6();
|
|
|
- upgradeFrom13_0();
|
|
|
- upgradeFrom13_1();
|
|
|
- upgradeFrom13_2();
|
|
|
- upgradeFrom13_3();
|
|
|
- upgradeFrom13_4();
|
|
|
- upgradeFrom13_5();
|
|
|
- upgradeFrom13_6();
|
|
|
- upgradeFrom13_7();
|
|
|
- upgradeFrom13_8();
|
|
|
- upgradeFrom13_9();
|
|
|
- upgradeFrom13_10();
|
|
|
- upgradeFrom13_11();
|
|
|
- upgradeFrom13_12();
|
|
|
- upgradeFrom13_13();
|
|
|
- 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_12_6, e.getLocalizedMessage()));
|
|
|
- }
|
|
|
- } else if (VERSION_13_0.equals(form.targetVersion)) {
|
|
|
+ if (VERSION_13_0.equals(form.targetVersion)) {
|
|
|
try {
|
|
|
upgradeFrom13_0();
|
|
|
upgradeFrom13_1();
|
|
@@ -657,46 +429,6 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|
|
return redirect(getClass());
|
|
|
}
|
|
|
|
|
|
- private void upgradeFrom12_0() {
|
|
|
- // nothing
|
|
|
- }
|
|
|
-
|
|
|
- private void upgradeFrom12_1() {
|
|
|
- final IndicesAdminClient indicesClient = searchEngineClient.admin().indices();
|
|
|
-
|
|
|
- UpgradeUtil.putMapping(indicesClient, "fess_log.search_log", "search_log",
|
|
|
- "{\"dynamic_templates\": [" + "{\"documents\": {\"path_match\": \"documents.*\",\"mapping\": {\"type\": \"keyword\"}}}"//
|
|
|
- + "]}");
|
|
|
- UpgradeUtil.addFieldMapping(indicesClient, "fess_log.click_log", "click_log", "urlId",
|
|
|
- "{\"properties\":{\"urlId\":{\"type\":\"keyword\"}}}");
|
|
|
- }
|
|
|
-
|
|
|
- private void upgradeFrom12_2() {
|
|
|
- // nothing
|
|
|
- }
|
|
|
-
|
|
|
- private void upgradeFrom12_3() {
|
|
|
- ComponentUtil.getThumbnailManager().migrate();
|
|
|
- }
|
|
|
-
|
|
|
- private void upgradeFrom12_4() {
|
|
|
- // nothing
|
|
|
- }
|
|
|
-
|
|
|
- private void upgradeFrom12_5() {
|
|
|
- // nothing
|
|
|
- }
|
|
|
-
|
|
|
- private void upgradeFrom12_6() {
|
|
|
- final IndicesAdminClient indicesClient = searchEngineClient.admin().indices();
|
|
|
- UpgradeUtil.deleteIndex(indicesClient, ".fess_config.web_config_to_role", res -> {});
|
|
|
- UpgradeUtil.deleteIndex(indicesClient, ".fess_config.file_config_to_role", res -> {});
|
|
|
- UpgradeUtil.deleteIndex(indicesClient, ".fess_config.data_config_to_role", res -> {});
|
|
|
-
|
|
|
- UpgradeUtil.addFieldMapping(indicesClient, "fess_log.search_log", "search_log", "hitCountRelation",
|
|
|
- "{\"properties\":{\"hitCountRelation\":{\"type\":\"keyword\"}}}");
|
|
|
- }
|
|
|
-
|
|
|
private void upgradeFrom13_0() {
|
|
|
UpgradeUtil.addData(searchEngineClient, ".fess_config.scheduled_job", "label_updater",
|
|
|
"{\"name\":\"Label Updater\",\"target\":\"all\",\"cronExpression\":\"\",\"scriptType\":\"groovy\",\"scriptData\":\"return container.getComponent(\\\"updateLabelJob\\\").execute();\",\"jobLogging\":false,\"crawler\":false,\"available\":true,\"sortOrder\":11,\"createdBy\":\"system\",\"createdTime\":0,\"updatedBy\":\"system\",\"updatedTime\":0}");
|