Skip to content

Commit 11217a2

Browse files
committed
Remove JSF suffix from all URLs using the new AUTOMATIC_EXTENSIONLESS_MAPPING option.
1 parent deecf62 commit 11217a2

File tree

81 files changed

+148
-143
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+148
-143
lines changed

Kitodo/src/main/java/org/kitodo/production/forms/BaseForm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public class BaseForm implements Serializable {
6969
protected static final String EXPORT_FINISHED = "exportFinished";
7070

7171
protected static final String REDIRECT_PATH = TEMPLATE_ROOT + "{0}?" + REDIRECT_PARAMETER;
72-
protected static final String DEFAULT_LINK = "desktop.jsf";
72+
protected static final String DEFAULT_LINK = "desktop";
7373
private static final String LIST_PAGE = TEMPLATE_ROOT + "{0}?keepPagination=true&" + REDIRECT_PARAMETER;
7474
protected final String usersPage = MessageFormat.format(LIST_PAGE, "users");
7575
protected final String processesPage = "processes?" + REDIRECT_PARAMETER;

Kitodo/src/main/java/org/kitodo/production/forms/CalendarForm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public class CalendarForm implements Serializable {
8989
private static final String UPLOAD_ERROR = "calendar.upload.error";
9090
private static final String REDIRECT_PARAMETER = "faces-redirect=true";
9191
private static final String DEFAULT_REFERER = "processes?" + REDIRECT_PARAMETER;
92-
private static final String TASK_MANAGER_REFERER = "system.jsf?tabIndex=0&" + REDIRECT_PARAMETER;
92+
private static final String TASK_MANAGER_REFERER = "system?tabIndex=0&" + REDIRECT_PARAMETER;
9393
private static final Integer[] MONTHS = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
9494

9595
/**

Kitodo/src/main/java/org/kitodo/production/forms/LanguageForm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public List<Map<String, Object>> getSupportedLocales() {
120120
translation.put("displayLanguageTranslated",
121121
supportedLocale.getDisplayLanguage(currentDisplayLanguage));
122122
translation.put("selected", supportedLocale.equals(currentDisplayLanguage));
123-
translation.put("flag", "jakarta.faces.resource/images/" + supportedLocale + ".svg.jsf");
123+
translation.put("flag", "jakarta.faces.resource/images/" + supportedLocale + ".svg");
124124
supportedLocales.add(translation);
125125
}
126126
}

Kitodo/src/main/java/org/kitodo/production/forms/LoginForm.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
public class LoginForm implements Serializable {
3434
private User loggedUser;
3535
private boolean firstVisit = true;
36-
private static final String INDEXING_PAGE = "system.jsf?tabIndex=";
37-
private static final String DESKTOP_VIEW = "desktop.jsf";
36+
private static final String INDEXING_PAGE = "system?tabIndex=";
37+
private static final String DESKTOP_VIEW = "desktop";
3838
private final SecurityAccessService securityAccessService = ServiceManager.getSecurityAccessService();
3939

4040
/**

Kitodo/src/main/java/org/kitodo/production/forms/ProcessForm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public class ProcessForm extends TemplateBaseForm {
9999

100100
private List<SelectItem> customColumns;
101101

102-
private static final String CREATE_PROCESS_PATH = "/pages/processFromTemplate.jsf?faces-redirect=true";
102+
private static final String CREATE_PROCESS_PATH = "/pages/processFromTemplate?faces-redirect=true";
103103
private static final String PROCESS_TABLE_VIEW_ID = "/pages/processes.xhtml";
104104
private static final String PROCESS_TABLE_ID = "processesTabView:processesForm:processesTable";
105105
private final Map<Integer, Boolean> assignedProcesses = new HashMap<>();

Kitodo/src/main/java/org/kitodo/production/forms/createprocess/CreateProcessForm.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,9 +1064,9 @@ public String importRecordsInBackground() {
10641064
Client client = ServiceManager.getUserService().getSessionClientOfAuthenticatedUser();
10651065
TaskManager.addTask(new ImportEadProcessesThread(this, user, client));
10661066
if (ServiceManager.getSecurityAccessService().hasAuthorityToViewTaskManagerPage()) {
1067-
return "system.jsf?tabIndex=0&faces-redirect=true";
1067+
return "system?tabIndex=0&faces-redirect=true";
10681068
} else {
1069-
return "desktop.jsf?faces-redirect=true";
1069+
return "desktop?faces-redirect=true";
10701070
}
10711071
}
10721072

Kitodo/src/main/java/org/kitodo/production/forms/createprocess/SelectProjectDialogView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class SelectProjectDialogView implements Serializable {
4040
private int selectedProjectId = 0;
4141
private Template template;
4242
protected static final String ERROR_LOADING_ONE = "errorLoadingOne";
43-
private static final String CREATE_PROCESS_PATH = "/pages/processFromTemplate.jsf?faces-redirect=true";
43+
private static final String CREATE_PROCESS_PATH = "/pages/processFromTemplate?faces-redirect=true";
4444

4545
/**
4646
* Get template.

Kitodo/src/main/java/org/kitodo/production/forms/createprocess/SelectTemplateDialogView.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ public class SelectTemplateDialogView implements Serializable {
3333
private int selectedTemplateId = 0;
3434
private Project project;
3535
protected static final String ERROR_LOADING_ONE = "errorLoadingOne";
36-
private static final String CREATE_PROCESS_PATH = "/pages/processFromTemplate.jsf?faces-redirect=true";
37-
private static final String MASSIMPORT_PATH = "/pages/massImport.jsf?faces-redirect=true";
36+
private static final String CREATE_PROCESS_PATH = "/pages/processFromTemplate?faces-redirect=true";
37+
private static final String MASSIMPORT_PATH = "/pages/massImport?faces-redirect=true";
3838
private String redirectPath;
3939

4040
/**

Kitodo/src/main/java/org/kitodo/production/forms/dataeditor/DataEditorForm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ public class DataEditorForm implements MetadataTreeTableInterface, RulesetSetupI
200200

201201
private DataEditorSetting dataEditorSetting;
202202

203-
private static final String DESKTOP_LINK = "/pages/desktop.jsf";
203+
private static final String DESKTOP_LINK = "/pages/desktop";
204204

205205
private List<PhysicalDivision> unsavedDeletedMedia = new ArrayList<>();
206206

Kitodo/src/main/java/org/kitodo/production/security/CustomLoginSuccessHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
@Component
3030
public class CustomLoginSuccessHandler implements AuthenticationSuccessHandler {
3131

32-
private static final String DESKTOP_LANDING_PAGE = "/pages/desktop.jsf";
33-
private static final String EMPTY_LANDING_PAGE = "/pages/checks.jsf";
32+
private static final String DESKTOP_LANDING_PAGE = "/pages/desktop";
33+
private static final String EMPTY_LANDING_PAGE = "/pages/checks";
3434
private static final String SAVED_REQUEST = "SPRING_SECURITY_SAVED_REQUEST";
3535
private static final String OMNIFACES_EVENT = "omnifaces.event";
3636
private final RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();

0 commit comments

Comments
 (0)