From 48d3a10a6027d1cc46243a021a073d979aee25fa Mon Sep 17 00:00:00 2001 From: jensp Date: Sat, 26 Jan 2019 12:27:44 +0000 Subject: [PATCH] CCM NG: Removal of JSF/Primefaces experiment for Admin UI and removal or Primefaces dependency git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5809 8810af33-2d31-482b-a856-94f89814c4df --- ccm-core/pom.xml | 4 +- .../org/libreccm/admin/ui/JpqlConsole.java | 2 - .../ui/usersgroupsroles/RolesController.java | 141 ------------ .../META-INF/resources/admin-jsf/admin.xhtml | 213 ------------------ .../META-INF/resources/admin-jsf/header.css | 33 --- .../META-INF/resources/admin-jsf/libreccm.png | Bin 22448 -> 0 bytes .../resources/META-INF/resources/test.xhtml | 16 -- .../src/main/resources/META-INF/test.xhtml | 16 -- pom.xml | 4 +- 9 files changed, 4 insertions(+), 425 deletions(-) delete mode 100644 ccm-core/src/main/java/org/libreccm/admin/ui/usersgroupsroles/RolesController.java delete mode 100644 ccm-core/src/main/resources/META-INF/resources/admin-jsf/admin.xhtml delete mode 100644 ccm-core/src/main/resources/META-INF/resources/admin-jsf/header.css delete mode 100644 ccm-core/src/main/resources/META-INF/resources/admin-jsf/libreccm.png delete mode 100644 ccm-core/src/main/resources/META-INF/resources/test.xhtml delete mode 100644 ccm-core/src/main/resources/META-INF/test.xhtml diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml index f221055a8..f72a0246c 100644 --- a/ccm-core/pom.xml +++ b/ccm-core/pom.xml @@ -227,10 +227,10 @@ Saxon-HE - + diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/JpqlConsole.java b/ccm-core/src/main/java/org/libreccm/admin/ui/JpqlConsole.java index 096b00358..889c6a06f 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/JpqlConsole.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/JpqlConsole.java @@ -59,8 +59,6 @@ import java.util.ResourceBundle; import java.util.Set; import java.util.stream.Collectors; -import static org.primefaces.component.schedule.Schedule.PropertyKeys.*; - /** * * @author Jens Pelzetter diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/usersgroupsroles/RolesController.java b/ccm-core/src/main/java/org/libreccm/admin/ui/usersgroupsroles/RolesController.java deleted file mode 100644 index 7a47bf114..000000000 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/usersgroupsroles/RolesController.java +++ /dev/null @@ -1,141 +0,0 @@ -/* - * Copyright (C) 2016 LibreCCM Foundation. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA - */ -package org.libreccm.admin.ui.usersgroupsroles; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.libreccm.security.Permission; -import org.libreccm.security.Role; -import org.libreccm.security.RoleMembership; -import org.libreccm.security.RoleRepository; -import org.primefaces.model.LazyDataModel; -import org.primefaces.model.SortOrder; - -import javax.faces.view.ViewScoped; -import javax.inject.Inject; -import javax.inject.Named; -import javax.transaction.Transactional; -import java.io.Serializable; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * - * @author Jens Pelzetter - */ -@Named -@ViewScoped -public class RolesController implements Serializable { - - private static final long serialVersionUID = 9092665507680111584L; - private static final Logger LOGGER = LogManager.getLogger( - RolesController.class); - - @Inject - private RoleRepository roleRepo; - - private final LazyDataModel tableModel; - - private Role selectedRole; - private String selectedRoleName; - - public RolesController() { - LOGGER.debug("Intializing RolesController and creating table model..."); - tableModel = new RolesTableModel(); - } - - public LazyDataModel getTableModel() { - LOGGER.debug("getTableModel invoked..."); - return tableModel; - } - - public List getRoles() { - LOGGER.debug("getRoles invoked..."); - return roleRepo.findAll(); - } - - public Role getSelectedRole() { - LOGGER.debug("getSelectedRole invoked..."); - return selectedRole; - } - - public void setSelectedRole(final Role selectedRole) { - LOGGER.debug("Setting selected role to \"{}\"...", selectedRole); - this.selectedRole = selectedRole; - selectedRoleName = selectedRole.getName(); - } - - public String getSelectedRoleName() { - return selectedRoleName; - } - - public void setSelectedRoleName(final String name) { - selectedRoleName = name; - } - - @Transactional(Transactional.TxType.REQUIRED) - public Set getSelectedRoleMemberships() { - final Role role = roleRepo.findById(selectedRole.getRoleId()).get(); - return role.getMemberships(); - } - - @Transactional(Transactional.TxType.REQUIRED) - public List getSelectedRolePermissions() { - final Role role = roleRepo.findById(selectedRole.getRoleId(), - Role.ENTITY_GRPAH_WITH_PERMISSIONS) - .get(); - return role.getPermissions(); - } - - public void renameSelectedRole() { - selectedRole.setName(selectedRoleName); - roleRepo.save(selectedRole); - } - - public void renameSelectedRoleCancel() { - selectedRoleName = selectedRole.getName(); - } - - private class RolesTableModel extends LazyDataModel { - - private static final long serialVersionUID = 8878060757439667086L; - - @Override - public List load(final int first, - final int pageSize, - final String sortField, - final SortOrder sortOrder, - final Map filters) { - final List roles; - if (filters.containsKey("name")) { - final String name = (String) filters.get("name"); - roles = roleRepo.searchByName(name, pageSize, first); - setRowCount((int) roleRepo.searchByNameCount(name)); - } else { - roles = roleRepo.findAllOrderedByRole(pageSize, first); - setRowCount((int) roleRepo.count()); - } - - return roles; - } - - } - -} diff --git a/ccm-core/src/main/resources/META-INF/resources/admin-jsf/admin.xhtml b/ccm-core/src/main/resources/META-INF/resources/admin-jsf/admin.xhtml deleted file mode 100644 index a0efa8d9d..000000000 --- a/ccm-core/src/main/resources/META-INF/resources/admin-jsf/admin.xhtml +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - - LibreCCM Admin - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- - - - - - - - - - - - - - - - - -
-
-
-
-
-
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - diff --git a/ccm-core/src/main/resources/META-INF/resources/admin-jsf/header.css b/ccm-core/src/main/resources/META-INF/resources/admin-jsf/header.css deleted file mode 100644 index bf7075fe4..000000000 --- a/ccm-core/src/main/resources/META-INF/resources/admin-jsf/header.css +++ /dev/null @@ -1,33 +0,0 @@ -body { - margin: 0; -} - -div#header { - background-color: #56a1bd; - - background-image: -moz-linear-gradient(top, #56a1bd 5%, #024C68 95%); - background-image: -webkit-linear-gradient(top, #56a1bd 5%, #024C68 95%); - background-image: linear-gradient(top, #56a1bd 5%, #024C68 95%); - - display: flex; - - height: 70px; - - padding: 0 10px; - - position: relative; -} - -#logo, #user-widget { - flex: 1; -} - -#user-widget { - position: absolute; - top: 15px; - right: 10px; -} - -.ui-widget, .ui-widget .ui-widget { - font-size: 90% !important; -} \ No newline at end of file diff --git a/ccm-core/src/main/resources/META-INF/resources/admin-jsf/libreccm.png b/ccm-core/src/main/resources/META-INF/resources/admin-jsf/libreccm.png deleted file mode 100644 index 93fd7a317e34e7d5e63b326c1c51321317c43781..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22448 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 diff --git a/ccm-core/src/main/resources/META-INF/resources/test.xhtml b/ccm-core/src/main/resources/META-INF/resources/test.xhtml deleted file mode 100644 index b64fcda97..000000000 --- a/ccm-core/src/main/resources/META-INF/resources/test.xhtml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - JSF Test - - - - - - - - - - diff --git a/ccm-core/src/main/resources/META-INF/test.xhtml b/ccm-core/src/main/resources/META-INF/test.xhtml deleted file mode 100644 index cdfa0c7ba..000000000 --- a/ccm-core/src/main/resources/META-INF/test.xhtml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - JSF Test - - - - - - - - - - diff --git a/pom.xml b/pom.xml index fa4fa1853..912be1888 100644 --- a/pom.xml +++ b/pom.xml @@ -483,11 +483,11 @@
- +