Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public class BaseForm implements Serializable {
protected static final String EXPORT_FINISHED = "exportFinished";

protected static final String REDIRECT_PATH = TEMPLATE_ROOT + "{0}?" + REDIRECT_PARAMETER;
protected static final String DEFAULT_LINK = "desktop.jsf";
protected static final String DEFAULT_LINK = "desktop";
private static final String LIST_PAGE = TEMPLATE_ROOT + "{0}?keepPagination=true&" + REDIRECT_PARAMETER;
protected final String usersPage = MessageFormat.format(LIST_PAGE, "users");
protected final String processesPage = "processes?" + REDIRECT_PARAMETER;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public class CalendarForm implements Serializable {
private static final String UPLOAD_ERROR = "calendar.upload.error";
private static final String REDIRECT_PARAMETER = "faces-redirect=true";
private static final String DEFAULT_REFERER = "processes?" + REDIRECT_PARAMETER;
private static final String TASK_MANAGER_REFERER = "system.jsf?tabIndex=0&" + REDIRECT_PARAMETER;
private static final String TASK_MANAGER_REFERER = "system?tabIndex=0&" + REDIRECT_PARAMETER;
private static final Integer[] MONTHS = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public List<Map<String, Object>> getSupportedLocales() {
translation.put("displayLanguageTranslated",
supportedLocale.getDisplayLanguage(currentDisplayLanguage));
translation.put("selected", supportedLocale.equals(currentDisplayLanguage));
translation.put("flag", "jakarta.faces.resource/images/" + supportedLocale + ".svg.jsf");
translation.put("flag", "jakarta.faces.resource/images/" + supportedLocale + ".svg");
supportedLocales.add(translation);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
public class LoginForm implements Serializable {
private User loggedUser;
private boolean firstVisit = true;
private static final String INDEXING_PAGE = "system.jsf?tabIndex=";
private static final String DESKTOP_VIEW = "desktop.jsf";
private static final String INDEXING_PAGE = "system?tabIndex=";
private static final String DESKTOP_VIEW = "desktop";
private final SecurityAccessService securityAccessService = ServiceManager.getSecurityAccessService();

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public class ProcessForm extends TemplateBaseForm {

private List<SelectItem> customColumns;

private static final String CREATE_PROCESS_PATH = "/pages/processFromTemplate.jsf?faces-redirect=true";
private static final String CREATE_PROCESS_PATH = "/pages/processFromTemplate?faces-redirect=true";
private static final String PROCESS_TABLE_VIEW_ID = "/pages/processes.xhtml";
private static final String PROCESS_TABLE_ID = "processesTabView:processesForm:processesTable";
private final Map<Integer, Boolean> assignedProcesses = new HashMap<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1064,9 +1064,9 @@ public String importRecordsInBackground() {
Client client = ServiceManager.getUserService().getSessionClientOfAuthenticatedUser();
TaskManager.addTask(new ImportEadProcessesThread(this, user, client));
if (ServiceManager.getSecurityAccessService().hasAuthorityToViewTaskManagerPage()) {
return "system.jsf?tabIndex=0&faces-redirect=true";
return "system?tabIndex=0&faces-redirect=true";
} else {
return "desktop.jsf?faces-redirect=true";
return "desktop?faces-redirect=true";
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public class SelectProjectDialogView implements Serializable {
private int selectedProjectId = 0;
private Template template;
protected static final String ERROR_LOADING_ONE = "errorLoadingOne";
private static final String CREATE_PROCESS_PATH = "/pages/processFromTemplate.jsf?faces-redirect=true";
private static final String CREATE_PROCESS_PATH = "/pages/processFromTemplate?faces-redirect=true";

/**
* Get template.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ public class SelectTemplateDialogView implements Serializable {
private int selectedTemplateId = 0;
private Project project;
protected static final String ERROR_LOADING_ONE = "errorLoadingOne";
private static final String CREATE_PROCESS_PATH = "/pages/processFromTemplate.jsf?faces-redirect=true";
private static final String MASSIMPORT_PATH = "/pages/massImport.jsf?faces-redirect=true";
private static final String CREATE_PROCESS_PATH = "/pages/processFromTemplate?faces-redirect=true";
private static final String MASSIMPORT_PATH = "/pages/massImport?faces-redirect=true";
private String redirectPath;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ public class DataEditorForm implements MetadataTreeTableInterface, RulesetSetupI

private DataEditorSetting dataEditorSetting;

private static final String DESKTOP_LINK = "/pages/desktop.jsf";
private static final String DESKTOP_LINK = "/pages/desktop";

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
@Component
public class CustomLoginSuccessHandler implements AuthenticationSuccessHandler {

private static final String DESKTOP_LANDING_PAGE = "/pages/desktop.jsf";
private static final String EMPTY_LANDING_PAGE = "/pages/checks.jsf";
private static final String DESKTOP_LANDING_PAGE = "/pages/desktop";
private static final String EMPTY_LANDING_PAGE = "/pages/checks";
private static final String SAVED_REQUEST = "SPRING_SECURITY_SAVED_REQUEST";
private static final String OMNIFACES_EVENT = "omnifaces.event";
private final RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public class SecurityConfig {
private static final String VIEW_ROLE = "viewRole_";
private static final String VIEW_TEMPLATE = "viewTemplate_";
private static final String VIEW_WORKFLOW = "viewProcess_";
private static final String LOGIN_PAGE = "/pages/login.jsf";
private static final String LOGIN_PAGE = "/pages/login";

/**
* Constructor for SecurityConfig which also sets instance variable for
Expand Down Expand Up @@ -173,15 +173,15 @@ private void authorizeGeneralPages(HttpSecurity http) throws Exception {

private void authorizePageLdapGroupEdit(HttpSecurity http) throws Exception {
http.authorizeHttpRequests(requests -> requests
.requestMatchers("/pages/ldapgroupEdit.jsf*").hasAnyAuthority(
.requestMatchers("/pages/ldapgroupEdit*").hasAnyAuthority(
"editLdapGroup_" + GLOBAL,
"viewLdapGroup_" + GLOBAL)
);
}

private void authorizePageRoleEdit(HttpSecurity http) throws Exception {
http.authorizeHttpRequests(requests -> requests
.requestMatchers("/pages/roleEdit.jsf*").hasAnyAuthority(
.requestMatchers("/pages/roleEdit*").hasAnyAuthority(
EDIT_ROLE + GLOBAL,
EDIT_ROLE + CLIENT_ANY,
VIEW_ROLE + GLOBAL,
Expand All @@ -191,7 +191,7 @@ private void authorizePageRoleEdit(HttpSecurity http) throws Exception {

private void authorizePageUsers(HttpSecurity http) throws Exception {
http.authorizeHttpRequests(requests -> requests
.requestMatchers("/pages/users.jsf").hasAnyAuthority(
.requestMatchers("/pages/users").hasAnyAuthority(
VIEW_ALL_USERS + GLOBAL,
VIEW_ALL_USERS + CLIENT_ANY,
VIEW_ALL_ROLES + GLOBAL,
Expand All @@ -203,15 +203,15 @@ private void authorizePageUsers(HttpSecurity http) throws Exception {

private void authorizePageTasks(HttpSecurity http) throws Exception {
http.authorizeHttpRequests(requests -> requests
.requestMatchers("/pages/tasks.jsf").hasAnyAuthority(
.requestMatchers("/pages/tasks").hasAnyAuthority(
VIEW_ALL_TASKS + GLOBAL,
VIEW_ALL_TASKS + CLIENT_ANY)
);
}

private void authorizePageWorkflowEdit(HttpSecurity http) throws Exception {
http.authorizeHttpRequests(requests -> requests
.requestMatchers("/pages/workflowEdit.jsf*").hasAnyAuthority(
.requestMatchers("/pages/workflowEdit*").hasAnyAuthority(
EDIT_WORKFLOW + GLOBAL,
EDIT_WORKFLOW + CLIENT_ANY,
VIEW_WORKFLOW + GLOBAL,
Expand All @@ -221,7 +221,7 @@ private void authorizePageWorkflowEdit(HttpSecurity http) throws Exception {

private void authorizePageRulesetEdit(HttpSecurity http) throws Exception {
http.authorizeHttpRequests(requests -> requests
.requestMatchers("/pages/rulesetEdit.jsf*").hasAnyAuthority(
.requestMatchers("/pages/rulesetEdit*").hasAnyAuthority(
EDIT_RULESET + GLOBAL,
EDIT_RULESET + CLIENT_ANY,
VIEW_RULESET + GLOBAL,
Expand All @@ -231,7 +231,7 @@ private void authorizePageRulesetEdit(HttpSecurity http) throws Exception {

private void authorizePageDocketEdit(HttpSecurity http) throws Exception {
http.authorizeHttpRequests(requests -> requests
.requestMatchers("/pages/docketEdit.jsf*").hasAnyAuthority(
.requestMatchers("/pages/docketEdit*").hasAnyAuthority(
EDIT_DOCKET + GLOBAL,
EDIT_DOCKET + CLIENT_ANY,
VIEW_DOCKET + GLOBAL,
Expand All @@ -241,7 +241,7 @@ private void authorizePageDocketEdit(HttpSecurity http) throws Exception {

private void authorizePageTemplateEdit(HttpSecurity http) throws Exception {
http.authorizeHttpRequests(requests -> requests
.requestMatchers("/pages/templateEdit.jsf*").hasAnyAuthority(
.requestMatchers("/pages/templateEdit*").hasAnyAuthority(
EDIT_TEMPLATE + GLOBAL,
EDIT_TEMPLATE + CLIENT_ANY,
VIEW_TEMPLATE + GLOBAL,
Expand All @@ -251,7 +251,7 @@ private void authorizePageTemplateEdit(HttpSecurity http) throws Exception {

private void authorizePageProjectEdit(HttpSecurity http) throws Exception {
http.authorizeHttpRequests(requests -> requests
.requestMatchers("/pages/projectEdit.jsf*").hasAnyAuthority(
.requestMatchers("/pages/projectEdit*").hasAnyAuthority(
EDIT_PROJECT + GLOBAL,
EDIT_PROJECT + CLIENT_ANY,
VIEW_PROJECT + GLOBAL,
Expand All @@ -261,7 +261,7 @@ private void authorizePageProjectEdit(HttpSecurity http) throws Exception {

private void authorizePageProjects(HttpSecurity http) throws Exception {
http.authorizeHttpRequests(requests -> requests
.requestMatchers("/pages/projects.jsf").hasAnyAuthority(
.requestMatchers("/pages/projects").hasAnyAuthority(
VIEW_ALL_PROJECTS + GLOBAL,
VIEW_ALL_PROJECTS + CLIENT_ANY,
VIEW_ALL_TEMPLATES + GLOBAL,
Expand All @@ -276,7 +276,7 @@ private void authorizePageProjects(HttpSecurity http) throws Exception {

private void authorizePageProcessEdit(HttpSecurity http) throws Exception {
http.authorizeHttpRequests(requests -> requests
.requestMatchers("/pages/processEdit.jsf*").hasAnyAuthority(
.requestMatchers("/pages/processEdit*").hasAnyAuthority(
EDIT_PROCESS + GLOBAL,
EDIT_PROCESS + CLIENT_ANY,
VIEW_PROCESS + GLOBAL,
Expand All @@ -286,23 +286,23 @@ private void authorizePageProcessEdit(HttpSecurity http) throws Exception {

private void authorizePageProcesses(HttpSecurity http) throws Exception {
http.authorizeHttpRequests(requests -> requests
.requestMatchers("/pages/processes.jsf").hasAnyAuthority(
.requestMatchers("/pages/processes").hasAnyAuthority(
VIEW_ALL_PROCESSES + GLOBAL,
VIEW_ALL_PROCESSES + CLIENT_ANY)
);
}

private void authorizePageIndexing(HttpSecurity http) throws Exception {
http.authorizeHttpRequests(requests -> requests
.requestMatchers("/pages/indexingPage.jsf").hasAnyAuthority(
.requestMatchers("/pages/indexingPage").hasAnyAuthority(
"editIndex_" + GLOBAL,
"viewIndex_" + GLOBAL)
);
}

private void authorizePageClientEdit(HttpSecurity http) throws Exception {
http.authorizeHttpRequests(requests -> requests
.requestMatchers("/pages/clientEdit.jsf*").hasAnyAuthority(
.requestMatchers("/pages/clientEdit*").hasAnyAuthority(
EDIT_CLIENT + GLOBAL,
EDIT_CLIENT + CLIENT_ANY,
VIEW_CLIENT + GLOBAL,
Expand All @@ -314,7 +314,7 @@ private void handleFormLogin(HttpSecurity http) throws Exception {
http.formLogin(login -> login
.loginPage(LOGIN_PAGE)
.loginProcessingUrl("/login")
.defaultSuccessUrl("/pages/desktop.jsf")
.defaultSuccessUrl("/pages/desktop")
.successHandler(new CustomLoginSuccessHandler())
.permitAll())
.logout(logout -> logout
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* GPL3-License.txt file that was distributed with this source code.
*/

import WaveSurfer from './../libs/wavesurfer/wavesurfer.esm.js.jsf';
import WaveSurfer from './../libs/wavesurfer/wavesurfer.esm.js';

class AudioWaveform {
#audioElement;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
outcome="metadataEditor">
<h:outputText><i class="fa fa-list-alt"/> #{msgs.metadataEdit}</h:outputText>
<f:param name="id" value="#{task.process.id}"/>
<f:param name="referer" value="currentTasksEdit.jsf?id=#{task.id}"/>
<f:param name="referer" value="currentTasksEdit?id=#{task.id}"/>
<f:param name="templateTaskId" value="#{CurrentTaskForm.getCorrespondingTemplateTaskId(task)}"/>
</h:link>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
xmlns:p="http://primefaces.org/ui">

<section id="portal-logo">
<h:outputLink value="desktop.jsf">
<h:outputLink value="desktop">
<h:graphicImage name="images/kitodo-logo.svg" alt="Kitodo.Production" height="36" id="kitodo-logo"/>
</h:outputLink>
<h:outputLink value="desktop.jsf">
<h:outputLink value="desktop">
<h:graphicImage name="images/kitodo-icon.svg" alt="Kitodo.Production" width="40" id="kitodo-icon"/>
</h:outputLink>
</section>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<p:button id="goToProcesses"
value="#{msgs['processes']}"
styleClass="primary right"
outcome="/pages/processes.jsf?tabIndex=0&amp;faces-redirect=true"/>
outcome="/pages/processes?tabIndex=0&amp;faces-redirect=true"/>
<p:commandButton id="close"
value="#{msgs.close}"
styleClass="secondary right"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</h:panelGroup>
<h:panelGroup layout="block"
styleClass="dialogButtonWrapper">
<p:button outcome="/pages/desktop.jsf"
<p:button outcome="/pages/desktop"
value="#{msgs['ok']}"
styleClass="primary right"
icon="fa fa-close"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</h:panelGroup>
<h:panelGroup layout="block"
styleClass="dialogButtonWrapper">
<p:button outcome="/pages/desktop.jsf"
<p:button outcome="/pages/desktop"
value="#{msgs['ok']}"
id="okButton"
styleClass="primary right"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
<p:row>
<ui:fragment rendered="#{ProcessForm.process.template.workflow ne null and not empty ProcessForm.process.tasks}">
<h4><p:outputLabel value="#{msgs.workflow}: #{ProcessForm.process.template.workflow.title}"/></h4>
<h:link outcome="workflowEdit.jsf?id=#{ProcessForm.process.template.workflow.id}"
<h:link outcome="workflowEdit?id=#{ProcessForm.process.template.workflow.id}"
title="#{ProcessForm.process.template.workflow.title}">
<o:graphicImage value="#{ProcessForm.tasksDiagram}"
dataURI="true" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<p:row>
<ui:fragment rendered="#{TemplateForm.template.workflow ne null and not empty TemplateForm.template.tasks}">
<h3><p:outputLabel value="#{msgs.workflow}: #{TemplateForm.template.workflow.title}"/></h3>
<h:link outcome="workflowEdit.jsf?id=#{TemplateForm.template.workflow.id}"
<h:link outcome="workflowEdit?id=#{TemplateForm.template.workflow.id}"
title="#{TemplateForm.template.workflow.title}">
<o:graphicImage value="#{TemplateForm.tasksDiagram}"
dataURI="true" />
Expand Down
17 changes: 11 additions & 6 deletions Kitodo/src/main/webapp/WEB-INF/web.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@
<param-value>5242880</param-value>
</context-param>

<context-param>
<param-name>jakarta.faces.AUTOMATIC_EXTENSIONLESS_MAPPING</param-name>
<param-value>true</param-value>
</context-param>

<!-- Jakarta EE -->
<resource-env-ref>
<resource-env-ref-name>BeanManager</resource-env-ref-name>
Expand All @@ -102,7 +107,7 @@
<!-- extension mapping -->
<servlet-mapping>
<servlet-name>Faces Servlet</servlet-name>
<url-pattern>*.jsf</url-pattern>
<url-pattern>/*</url-pattern>
</servlet-mapping>

<session-config>
Expand All @@ -124,25 +129,25 @@
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
<welcome-file>index.jsf</welcome-file>
<welcome-file>index</welcome-file>
</welcome-file-list>

<!-- Error pages -->
<error-page>
<error-code>500</error-code>
<location>/pages/error.jsf</location>
<location>/pages/error</location>
</error-page>
<error-page>
<error-code>403</error-code>
<location>/pages/desktop.jsf</location>
<location>/pages/desktop</location>
</error-page>
<error-page>
<error-code>404</error-code>
<location>/pages/pageNotFound.jsf</location>
<location>/pages/pageNotFound</location>
</error-page>
<error-page>
<exception-type>java.lang.Throwable</exception-type>
<location>/pages/error.jsf</location>
<location>/pages/error</location>
</error-page>

<!-- log4j2 for servlet 3.0 based web applications -->
Expand Down
2 changes: 1 addition & 1 deletion Kitodo/src/main/webapp/index.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
>

<h:head>
<meta http-equiv="refresh" content="0; URL=pages/desktop.jsf"/>
<meta http-equiv="refresh" content="0; URL=pages/desktop"/>
<title>Kitodo</title>
</h:head>
<h:body>
Expand Down
4 changes: 2 additions & 2 deletions Kitodo/src/main/webapp/pages/authorityEdit.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@
</ui:define>

<ui:define name="breadcrumbs">
<p:menuitem value="#{msgs.desktop}" url="desktop.jsf" icon="fa fa-home"/>
<p:menuitem value="#{msgs.users}" url="users.jsf" icon="fa fa-user"/>
<p:menuitem value="#{msgs.desktop}" url="desktop" icon="fa fa-home"/>
<p:menuitem value="#{msgs.users}" url="users" icon="fa fa-user"/>
<p:menuitem value="#{msgs.editAuthority}" rendered="#{isEditMode}" icon="fa fa-cube"/>
<p:menuitem value="#{msgs.authorityNew}" rendered="#{isCreateMode}" icon="fa fa-cube"/>
<p:menuitem value="#{msgs.viewAuthority}" rendered="#{isViewMode}" icon="fa fa-cube"/>
Expand Down
Loading